ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.12 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.30 by pcg, Thu Feb 12 01:53:25 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.12 2003/12/16 23:04:13 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
42 41
43#ifdef HAVE_TERMIOS_H 42#ifdef HAVE_TERMIOS_H
44# include <termios.h> 43# include <termios.h>
45#endif 44#endif
46 45
46#include <cstring>
47
48static char curlocale[128];
49
50void
51rxvt_set_locale (const char *locale)
52{
53 if (locale && STRNCMP (locale, curlocale, 128))
54 {
55 STRNCPY (curlocale, locale, 128);
56 setlocale (LC_CTYPE, curlocale);
57 }
58}
59
47void * 60void *
48rxvt_term::operator new (size_t s) 61rxvt_term::operator new (size_t s)
49{ 62{
50 void *p = malloc (s); 63 void *p = malloc (s);
51 64
58{ 71{
59 free (p); 72 free (p);
60} 73}
61 74
62rxvt_term::rxvt_term () 75rxvt_term::rxvt_term ()
76 :
77 rootwin_ev (this, &rxvt_term::rootwin_cb),
78 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 79 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif
83#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme
85#endif
64#ifdef CURSOR_BLINK 86#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif
89#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 90 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 91#endif
67#ifdef POINTER_BLANK 92#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 93 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 94#endif
70 x_ev (this, &rxvt_term::x_cb), 95 check_ev (this, &rxvt_term::check_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb), 96 destroy_ev (this, &rxvt_term::destroy_cb),
72 check_ev (this, &rxvt_term::check_cb), 97 pty_ev (this, &rxvt_term::pty_cb),
73 incr_ev (this, &rxvt_term::incr_cb) 98 incr_ev (this, &rxvt_term::incr_cb),
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
74{ 102{
75 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
76} 104}
77 105
78rxvt_term::~rxvt_term () 106rxvt_term::~rxvt_term ()
79{ 107{
80 rxvt_scr_release (this);
81
82#ifndef NO_SETOWNER_TTYDEV
83 rxvt_privileged_ttydev (this, RESTORE);
84#endif
85#ifdef UTMP_SUPPORT
86 rxvt_privileged_utmp (this, RESTORE);
87#endif
88#ifdef USE_XIM
89 if (Input_Context != NULL)
90 {
91 XDestroyIC (Input_Context);
92 Input_Context = NULL;
93 }
94#endif
95
96 if (cmd_fd >= 0) 108 if (cmd_fd >= 0)
97 close (cmd_fd); 109 close (cmd_fd);
98 110
99 if (Xfd >= 0) 111 scr_release ();
100 XCloseDisplay (Xdisplay); 112
113 free (locale);
114 free (codeset);
115
116#ifndef NO_SETOWNER_TTYDEV
117 privileged_ttydev (RESTORE);
118#endif
119#ifdef UTMP_SUPPORT
120 privileged_utmp (RESTORE);
121#endif
122
123 // TODO: free pixcolours, colours should become part of rxvt_display
101 124
102 delete PixColors; 125 delete PixColors;
126
127 displays.put (display);
103} 128}
104 129
105void 130void
106rxvt_term::destroy () 131rxvt_term::destroy ()
107{ 132{
133 if (display)
134 {
135 if (TermWin.parent[0])
136 XDestroyWindow (display->display, TermWin.parent[0]);
137
138 termwin_ev.stop (display);
139 vt_ev.stop (display);
140
141#ifdef USE_XIM
142 im_destroy ();
143 im_ev.stop (display);
144#endif
145#ifdef HAVE_SCROLLBARS
146 scrollbar_ev.stop (display);
147#endif
148#ifdef MENUBAR
149 menubar_ev.stop (display);
150#endif
151 }
152
108 check_ev.stop (); 153 check_ev.stop ();
109 pty_ev.stop (); 154 pty_ev.stop ();
110 x_ev.stop ();
111#ifdef CURSOR_BLINK 155#ifdef CURSOR_BLINK
156 cursor_blink_ev.stop ();
157#endif
158#ifdef TEXT_BLINK
112 blink_ev.stop (); 159 text_blink_ev.stop ();
113#endif 160#endif
114#ifdef POINTER_BLANK 161#ifdef POINTER_BLANK
115 pointer_ev.stop (); 162 pointer_ev.stop ();
116#endif 163#endif
117 164
131/* LIBPROTO */ 178/* LIBPROTO */
132rxvt_t 179rxvt_t
133rxvt_init (int argc, const char *const *argv) 180rxvt_init (int argc, const char *const *argv)
134{ 181{
135 SET_R (new rxvt_term); 182 SET_R (new rxvt_term);
136 dR;
137 183
138 if (!R->init_vars () || !R->init (argc, argv)) 184 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
139 { 185 {
140 delete R; 186 delete GET_R;
141 return NULL; 187 SET_R (0);
142 } 188 }
143 189
144 return R; 190 return GET_R;
145} 191}
146 192
147/* EXTPROTO */ 193static int (*old_xerror_handler)(Display *dpy, XErrorEvent *event);
194
148void 195void
149rxvt_init_signals () 196rxvt_init_signals ()
150{ 197{
151/* install exit handler for cleanup */ 198 /* install exit handler for cleanup */
152#if 0 199#if 0
153#ifdef HAVE_ATEXIT 200#ifdef HAVE_ATEXIT
154 atexit(rxvt_clean_exit); 201 atexit(rxvt_clean_exit);
155#else 202#else
156#endif 203#endif
165 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 212 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
166 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 213 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
167 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 214 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
168 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 215 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
169 216
170/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 217 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
171/* signal (SIGURG, SIG_DFL); */ 218 /* signal (SIGURG, SIG_DFL); */
172 219
173 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 220 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
174 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 221 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
175} 222}
176 223
177bool 224bool
178rxvt_term::init (int argc, const char *const *argv) 225rxvt_term::init (int argc, const char *const *argv)
179{ 226{
180 dR;//TODO (scrollbar, setidle)
181
182 /* 227 /*
183 * Save and then give up any super-user privileges 228 * Save and then give up any super-user privileges
184 * If we need privileges in any area then we must specifically request it. 229 * If we need privileges in any area then we must specifically request it.
185 * We should only need to be root in these cases: 230 * We should only need to be root in these cases:
186 * 1. write utmp entries on some systems 231 * 1. write utmp entries on some systems
187 * 2. chown tty on some systems 232 * 2. chown tty on some systems
188 */ 233 */
189 rxvt_privileges (this, SAVE); 234 privileges (SAVE);
190 rxvt_privileges (this, IGNORE); 235 privileges (IGNORE);
191 236
192 rxvt_init_secondary (this); 237 init_secondary ();
193 238
194 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 239 const char **cmd_argv = init_resources (argc, argv);
240
241 set_locale ("");
195 242
196#if (MENUBAR_MAX) 243#if (MENUBAR_MAX)
197 rxvt_menubar_read (this, rs[Rs_menu]); 244 menubar_read (rs[Rs_menu]);
198#endif 245#endif
199#ifdef HAVE_SCROLLBARS 246#ifdef HAVE_SCROLLBARS
200 if (Options & Opt_scrollBar) 247 if (Options & Opt_scrollBar)
201 scrollbar_setIdle (); /* set existence for size calculations */ 248 scrollBar.setIdle (); /* set existence for size calculations */
202#endif 249#endif
203 250
204 rxvt_Create_Windows (this, argc, argv); 251 create_windows (argc, argv);
205 252
206 rxvt_init_xlocale (this); 253 init_xlocale ();
207 254
208 rxvt_scr_reset (this); /* initialize screen */ 255 scr_reset (); /* initialize screen */
209#ifdef RXVT_GRAPHICS 256#ifdef RXVT_GRAPHICS
210 rxvt_Gr_reset (this); /* reset graphics */ 257 Gr_reset (); /* reset graphics */
211#endif 258#endif
212 259
213#if 0 260#if 0
214#ifdef DEBUG_X 261#ifdef DEBUG_X
215 XSynchronize(Xdisplay, True); 262 XSynchronize(display->display, True);
216#endif 263#endif
217#endif 264#endif
218 265
219#ifdef HAVE_SCROLLBARS 266#ifdef HAVE_SCROLLBARS
220 if (Options & Opt_scrollBar) 267 if (Options & Opt_scrollBar)
221 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 268 resize_scrollbar (); /* create and map scrollbar */
222#endif 269#endif
223#if (MENUBAR_MAX) 270#if (MENUBAR_MAX)
224 if (menubar_visible(r)) 271 if (menubar_visible(r))
225 XMapWindow (Xdisplay, menuBar.win); 272 XMapWindow (display->display, menuBar.win);
226#endif 273#endif
227#ifdef TRANSPARENT 274#ifdef TRANSPARENT
228 if (Options & Opt_transparent) 275 if (Options & Opt_transparent)
229 { 276 {
230 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 277 XSelectInput (display->display, display->root, PropertyChangeMask);
231 rxvt_check_our_parents (this); 278 check_our_parents ();
232 } 279 }
233#endif 280#endif
281
282 rootwin_ev.start (display, display->root);
283
234 XMapWindow (Xdisplay, TermWin.vt); 284 XMapWindow (display->display, TermWin.vt);
235 XMapWindow (Xdisplay, TermWin.parent[0]); 285 XMapWindow (display->display, TermWin.parent[0]);
236 286
237 rxvt_init_env (this); 287 init_env ();
238 rxvt_init_command (this, cmd_argv); 288 init_command (cmd_argv);
239 289
240 x_ev.start (Xfd, EVENT_READ);
241 pty_ev.start (cmd_fd, EVENT_READ); 290 pty_ev.start (cmd_fd, EVENT_READ);
242 291
243 check_ev.start (); 292 check_ev.start ();
244
245 process_x_events ();
246 293
247 return true; 294 return true;
248} 295}
249 296
250/* ------------------------------------------------------------------------- * 297/* ------------------------------------------------------------------------- *
256/* ARGSUSED */ 303/* ARGSUSED */
257/* EXTPROTO */ 304/* EXTPROTO */
258RETSIGTYPE 305RETSIGTYPE
259rxvt_Child_signal(int sig __attribute__ ((unused))) 306rxvt_Child_signal(int sig __attribute__ ((unused)))
260{ 307{
261 int pid, save_errno = errno; 308 int pid, save_errno = errno;
262 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 309 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
263 ; 310 ;
264 errno = save_errno; 311 errno = save_errno;
265 312
266#if 0 313#if 0
267 if (pid == R->cmd_pid) 314 if (pid == cmd_pid)
268 exit (EXIT_SUCCESS); 315 exit (EXIT_SUCCESS);
269#endif 316#endif
270} 317}
271 318
272/* 319/*
273 * Catch a fatal signal and tidy up before quitting 320 * Catch a fatal signal and tidy up before quitting
274 */ 321 */
275/* EXTPROTO */ 322/* EXTPROTO */
276RETSIGTYPE 323RETSIGTYPE
277rxvt_Exit_signal(int sig) 324rxvt_Exit_signal(int sig)
278{ 325{
279 signal(sig, SIG_DFL); 326 signal (sig, SIG_DFL);
280#ifdef DEBUG_CMD 327#ifdef DEBUG_CMD
281 rxvt_print_error("signal %d", sig); 328 rxvt_print_error ("signal %d", sig);
282#endif 329#endif
283 rxvt_clean_exit(); 330 rxvt_clean_exit();
284 kill(getpid(), sig); 331 kill (getpid (), sig);
285} 332}
286 333
287/* ARGSUSED */
288/* INTPROTO */ 334/* INTPROTO */
289int 335int
290rxvt_xerror_handler(const Display * display 336rxvt_xerror_handler (Display *display, XErrorEvent *event)
291 __attribute__ ((unused)), const XErrorEvent * event)
292{ 337{
293 dR;
294
295 if (R->allowedxerror == -1) 338 if (GET_R->allowedxerror == -1)
296 R->allowedxerror = event->error_code; 339 GET_R->allowedxerror = event->error_code;
297 else 340 else
298 { 341 {
299 rxvt_print_error("XError: Request: %d . %d, Error: %d", 342 old_xerror_handler (display, event);
300 event->request_code, event->minor_code,
301 event->error_code);
302
303 R->destroy (); 343 GET_R->destroy ();
304 } 344 }
305 345
306 return 0; 346 return 0;
307} 347}
308 348
313 */ 353 */
314/* EXTPROTO */ 354/* EXTPROTO */
315void 355void
316rxvt_clean_exit () 356rxvt_clean_exit ()
317{ 357{
318 dR; 358 // TODO: rxvtd should clean up all ressources
319 359 if (GET_R)
320 R->destroy (); 360 GET_R->destroy ();
321} 361}
322 362
323/* ------------------------------------------------------------------------- * 363/* ------------------------------------------------------------------------- *
324 * MEMORY ALLOCATION WRAPPERS * 364 * MEMORY ALLOCATION WRAPPERS *
325 * ------------------------------------------------------------------------- */ 365 * ------------------------------------------------------------------------- */
326/* EXTPROTO */ 366/* EXTPROTO */
327void * 367void *
328rxvt_malloc(size_t size) 368rxvt_malloc(size_t size)
329{ 369{
330 void *p; 370 void *p;
331 371
332 p = malloc(size); 372 p = malloc(size);
333 if (p) 373 if (p)
334 return p; 374 return p;
335 375
336 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 376 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
337 rxvt_clean_exit(); 377 rxvt_clean_exit();
338 exit(EXIT_FAILURE); 378 exit(EXIT_FAILURE);
339/* NOTREACHED */ 379 /* NOTREACHED */
340} 380}
341 381
342/* EXTPROTO */ 382/* EXTPROTO */
343void * 383void *
344rxvt_calloc(size_t number, size_t size) 384rxvt_calloc(size_t number, size_t size)
345{ 385{
346 void *p; 386 void *p;
347 387
348 p = calloc(number, size); 388 p = calloc(number, size);
349 if (p) 389 if (p)
350 return p; 390 return p;
351 391
352 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 392 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
353 rxvt_clean_exit(); 393 rxvt_clean_exit();
354 exit(EXIT_FAILURE); 394 exit(EXIT_FAILURE);
355/* NOTREACHED */ 395 /* NOTREACHED */
356} 396}
357 397
358/* EXTPROTO */ 398/* EXTPROTO */
359void * 399void *
360rxvt_realloc(void *ptr, size_t size) 400rxvt_realloc(void *ptr, size_t size)
361{ 401{
362 void *p; 402 void *p;
363 403
364 if (ptr) 404 if (ptr)
365 p = realloc(ptr, size); 405 p = realloc(ptr, size);
366 else 406 else
367 p = malloc(size); 407 p = malloc(size);
368 if (p) 408 if (p)
369 return p; 409 return p;
370 410
371 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 411 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
372 rxvt_clean_exit(); 412 rxvt_clean_exit();
373 exit(EXIT_FAILURE); 413 exit(EXIT_FAILURE);
374/* NOTREACHED */ 414 /* NOTREACHED */
375} 415}
376 416
377/* ------------------------------------------------------------------------- * 417/* ------------------------------------------------------------------------- *
378 * PRIVILEGED OPERATIONS * 418 * PRIVILEGED OPERATIONS *
379 * ------------------------------------------------------------------------- */ 419 * ------------------------------------------------------------------------- */
380/* take care of suid/sgid super-user (root) privileges */ 420/* take care of suid/sgid super-user (root) privileges */
381/* INTPROTO */
382void 421void
383rxvt_privileges(pR_ int mode) 422rxvt_term::privileges (int mode)
384{ 423{
385#if ! defined(__CYGWIN32__) 424#if ! defined(__CYGWIN32__)
386# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 425# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
387/* setreuid() is the poor man's setuid(), seteuid() */ 426 /* setreuid() is the poor man's setuid(), seteuid() */
388# define seteuid(a) setreuid(-1, (a)) 427# define seteuid(a) setreuid(-1, (a))
389# define setegid(a) setregid(-1, (a)) 428# define setegid(a) setregid(-1, (a))
390# define HAVE_SETEUID 429# define HAVE_SETEUID
391# endif 430# endif
392# ifdef HAVE_SETEUID 431# ifdef HAVE_SETEUID
393 switch (mode) { 432 switch (mode)
433 {
394 case IGNORE: 434 case IGNORE:
395 /* 435 /*
396 * change effective uid/gid - not real uid/gid - so we can switch 436 * change effective uid/gid - not real uid/gid - so we can switch
397 * back to root later, as required 437 * back to root later, as required
398 */ 438 */
399 seteuid(getuid()); 439 seteuid(getuid());
400 setegid(getgid()); 440 setegid(getgid());
401 break; 441 break;
402 case SAVE: 442 case SAVE:
403 R->euid = geteuid(); 443 euid = geteuid();
404 R->egid = getegid(); 444 egid = getegid();
405 break; 445 break;
406 case RESTORE: 446 case RESTORE:
407 seteuid(R->euid); 447 seteuid(euid);
408 setegid(R->egid); 448 setegid(egid);
409 break; 449 break;
410 } 450 }
411# else 451# else
412 switch (mode) { 452 switch (mode)
453 {
413 case IGNORE: 454 case IGNORE:
414 setuid(getuid()); 455 setuid(getuid());
415 setgid(getgid()); 456 setgid(getgid());
416 /* FALLTHROUGH */ 457 /* FALLTHROUGH */
417 case SAVE: 458 case SAVE:
418 /* FALLTHROUGH */ 459 /* FALLTHROUGH */
419 case RESTORE: 460 case RESTORE:
420 break; 461 break;
421 } 462 }
422# endif 463# endif
423#endif 464#endif
424} 465}
425 466
426#ifdef UTMP_SUPPORT 467#ifdef UTMP_SUPPORT
427/* EXTPROTO */
428void 468void
429rxvt_privileged_utmp(pR_ char action) 469rxvt_term::privileged_utmp (char action)
430{ 470{
431 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 471 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)",
432 action, R->next_utmp_action, getpid())); 472 action, next_utmp_action, getpid()));
433 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 473 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
434 || (R->Options & Opt_utmpInhibit) 474 || (Options & Opt_utmpInhibit)
435 || R->ttydev == NULL || *R->ttydev == '\0') 475 || ttydev == NULL || *ttydev == '\0')
436 return; 476 return;
437 477
438 rxvt_privileges(aR_ RESTORE); 478 privileges (RESTORE);
439 if (action == SAVE) { 479 if (action == SAVE)
480 {
440 R->next_utmp_action = RESTORE; 481 next_utmp_action = RESTORE;
441 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 482 makeutent (ttydev, rs[Rs_display_name]);
483 }
484 else
442 } else { /* action == RESTORE */ 485 { /* action == RESTORE */
443 R->next_utmp_action = IGNORE; 486 next_utmp_action = IGNORE;
444 rxvt_cleanutent(aR); 487 cleanutent ();
445 } 488 }
446 rxvt_privileges(aR_ IGNORE); 489 privileges (IGNORE);
447} 490}
448#endif 491#endif
449 492
450#ifndef NO_SETOWNER_TTYDEV 493#ifndef NO_SETOWNER_TTYDEV
451/* EXTPROTO */
452void 494void
453rxvt_privileged_ttydev(pR_ char action) 495rxvt_term::privileged_ttydev (char action)
454{ 496{
455 D_MAIN((stderr, 497 D_MAIN((stderr,
456 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 498 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
457 action, R->next_tty_action, getpid())); 499 action, next_tty_action, getpid()));
458 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 500 if (next_tty_action != action || (action != SAVE && action != RESTORE)
459 || R->ttydev == NULL || *R->ttydev == '\0') 501 || ttydev == NULL || *ttydev == '\0')
460 return; 502 return;
461 503
462 rxvt_privileges(aR_ RESTORE); 504 privileges (RESTORE);
463 505
464 if (action == SAVE) { 506 if (action == SAVE)
507 {
465 R->next_tty_action = RESTORE; 508 next_tty_action = RESTORE;
466# ifndef RESET_TTY_TO_COMMON_DEFAULTS 509# ifndef RESET_TTY_TO_COMMON_DEFAULTS
467/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 510 /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */
468 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 511 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */
469 R->next_tty_action = IGNORE; 512 next_tty_action = IGNORE;
470 else 513 else
471# endif 514# endif
515
472 { 516 {
473 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 517 chown(ttydev, getuid(), ttygid); /* fail silently */
474 chmod(R->ttydev, R->ttymode); 518 chmod(ttydev, ttymode);
475# ifdef HAVE_REVOKE 519# ifdef HAVE_REVOKE
476 revoke(R->ttydev); 520 revoke(ttydev);
477# endif 521# endif
522
478 } 523 }
524 }
525 else
479 } else { /* action == RESTORE */ 526 { /* action == RESTORE */
480 R->next_tty_action = IGNORE; 527 next_tty_action = IGNORE;
481# ifndef RESET_TTY_TO_COMMON_DEFAULTS 528# ifndef RESET_TTY_TO_COMMON_DEFAULTS
482 chmod(R->ttydev, R->ttyfd_stat.st_mode); 529 chmod(ttydev, ttyfd_stat.st_mode);
483 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 530 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
484# else 531# else
485 chmod(R->ttydev, 532 chmod(ttydev,
486 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 533 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
487 chown(R->ttydev, 0, 0); 534 chown(ttydev, 0, 0);
488# endif 535# endif
489 }
490 536
537 }
538
491 rxvt_privileges(aR_ IGNORE); 539 privileges (IGNORE);
492 540
493# ifndef RESET_TTY_TO_COMMON_DEFAULTS 541# ifndef RESET_TTY_TO_COMMON_DEFAULTS
494 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 542 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
495 action == RESTORE ? "Restoring" : (action == 543 action == RESTORE ? "Restoring" : (action ==
496 SAVE ? "Saving" : 544 SAVE ? "Saving" :
497 "UNKNOWN ERROR for"), R->ttydev, 545 "UNKNOWN ERROR for"), ttydev,
498 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 546 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
499 R->ttyfd_stat.st_gid)); 547 ttyfd_stat.st_gid));
500# endif 548# endif
501} 549}
502#endif 550#endif
503 551
504/*----------------------------------------------------------------------*/ 552/*----------------------------------------------------------------------*/
505/* 553/*
506 * window size/position calculcations for XSizeHint and other storage. 554 * window size/position calculcations for XSizeHint and other storage.
507 * if width/height are non-zero then override calculated width/height 555 * if width/height are non-zero then override calculated width/height
508 */ 556 */
509/* EXTPROTO */
510void 557void
511rxvt_window_calc(pR_ unsigned int width, unsigned int height) 558rxvt_term::window_calc (unsigned int width, unsigned int height)
512{ 559{
513 short recalc_x, recalc_y; 560 short recalc_x, recalc_y;
514 int x, y, sb_w, mb_h, flags; 561 int x, y, sb_w, mb_h, flags;
515 unsigned int w, h; 562 unsigned int w, h;
516 unsigned int max_width, max_height; 563 unsigned int max_width, max_height;
517 564
518 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 565 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
519 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 566 TermWin.ncol, TermWin.nrow, szHint.width,
520 R->szHint.height)); 567 szHint.height));
521 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 568 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
522 R->szHint.win_gravity = NorthWestGravity; 569 szHint.win_gravity = NorthWestGravity;
523/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 570 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
524 571
525 recalc_x = recalc_y = 0; 572 recalc_x = recalc_y = 0;
526 flags = 0; 573 flags = 0;
527 if (!R->parsed_geometry) { 574 if (!parsed_geometry)
575 {
528 R->parsed_geometry = 1; 576 parsed_geometry = 1;
529 if (R->rs[Rs_geometry]) 577 if (rs[Rs_geometry])
530 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 578 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
531 if (flags & WidthValue) { 579 if (flags & WidthValue)
580 {
532 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 581 TermWin.ncol = BOUND_POSITIVE_INT16(w);
533 R->szHint.flags |= USSize; 582 szHint.flags |= USSize;
534 } 583 }
535 if (flags & HeightValue) { 584 if (flags & HeightValue)
585 {
536 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 586 TermWin.nrow = BOUND_POSITIVE_INT16(h);
537 R->szHint.flags |= USSize; 587 szHint.flags |= USSize;
538 } 588 }
539 if (flags & XValue) { 589 if (flags & XValue)
590 {
540 R->szHint.x = x; 591 szHint.x = x;
541 R->szHint.flags |= USPosition; 592 szHint.flags |= USPosition;
542 if (flags & XNegative) { 593 if (flags & XNegative)
594 {
543 recalc_x = 1; 595 recalc_x = 1;
544 R->szHint.win_gravity = NorthEastGravity; 596 szHint.win_gravity = NorthEastGravity;
545 } 597 }
546 } 598 }
547 if (flags & YValue) { 599 if (flags & YValue)
600 {
548 R->szHint.y = y; 601 szHint.y = y;
549 R->szHint.flags |= USPosition; 602 szHint.flags |= USPosition;
550 if (flags & YNegative) { 603 if (flags & YNegative)
604 {
551 recalc_y = 1; 605 recalc_y = 1;
552 if (R->szHint.win_gravity == NorthEastGravity) 606 if (szHint.win_gravity == NorthEastGravity)
553 R->szHint.win_gravity = SouthEastGravity; 607 szHint.win_gravity = SouthEastGravity;
554 else 608 else
555 R->szHint.win_gravity = SouthWestGravity; 609 szHint.win_gravity = SouthWestGravity;
556 } 610 }
557 } 611 }
558 } 612 }
559/* TODO: BOUNDS */ 613 /* TODO: BOUNDS */
560 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 614 TermWin.width = TermWin.ncol * TermWin.fwidth;
561 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 615 TermWin.height = TermWin.nrow * TermWin.fheight;
562 max_width = MAX_COLS * R->TermWin.fwidth; 616 max_width = MAX_COLS * TermWin.fwidth;
563 max_height = MAX_ROWS * R->TermWin.fheight; 617 max_height = MAX_ROWS * TermWin.fheight;
564 618
565 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 619 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
566 620
567 sb_w = mb_h = 0; 621 sb_w = mb_h = 0;
568 R->window_vt_x = R->window_vt_y = 0; 622 window_vt_x = window_vt_y = 0;
569 if (scrollbar_visible(R)) { 623 if (scrollbar_visible ())
624 {
570 sb_w = scrollbar_TotalWidth(); 625 sb_w = scrollbar_TotalWidth();
571 R->szHint.base_width += sb_w; 626 szHint.base_width += sb_w;
572 if (!(R->Options & Opt_scrollBar_right)) 627 if (!(Options & Opt_scrollBar_right))
573 R->window_vt_x = sb_w; 628 window_vt_x = sb_w;
574 } 629 }
575 if (menubar_visible(R)) { 630 if (menubar_visible ())
631 {
576 mb_h = menuBar_TotalHeight(); 632 mb_h = menuBar_TotalHeight();
577 R->szHint.base_height += mb_h; 633 szHint.base_height += mb_h;
578 R->window_vt_y = mb_h; 634 window_vt_y = mb_h;
579 } 635 }
580 R->szHint.width_inc = R->TermWin.fwidth; 636 szHint.width_inc = TermWin.fwidth;
581 R->szHint.height_inc = R->TermWin.fheight; 637 szHint.height_inc = TermWin.fheight;
582 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 638 szHint.min_width = szHint.base_width + szHint.width_inc;
583 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 639 szHint.min_height = szHint.base_height + szHint.height_inc;
584 640
585 if (width && width - R->szHint.base_width < max_width) { 641 if (width && width - szHint.base_width < max_width)
642 {
586 R->szHint.width = width; 643 szHint.width = width;
587 R->TermWin.width = width - R->szHint.base_width; 644 TermWin.width = width - szHint.base_width;
588 } else { 645 }
646 else
647 {
589 MIN_IT(R->TermWin.width, max_width); 648 MIN_IT(TermWin.width, max_width);
590 R->szHint.width = R->szHint.base_width + R->TermWin.width; 649 szHint.width = szHint.base_width + TermWin.width;
591 } 650 }
592 if (height && height - R->szHint.base_height < max_height) { 651 if (height && height - szHint.base_height < max_height)
652 {
593 R->szHint.height = height; 653 szHint.height = height;
594 R->TermWin.height = height - R->szHint.base_height; 654 TermWin.height = height - szHint.base_height;
595 } else { 655 }
656 else
657 {
596 MIN_IT(R->TermWin.height, max_height); 658 MIN_IT(TermWin.height, max_height);
597 R->szHint.height = R->szHint.base_height + R->TermWin.height; 659 szHint.height = szHint.base_height + TermWin.height;
598 } 660 }
599 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 661 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
600 R->window_sb_x = R->szHint.width - sb_w; 662 window_sb_x = szHint.width - sb_w;
601 663
602 if (recalc_x) 664 if (recalc_x)
603 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 665 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
604 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 666 - szHint.width - 2 * TermWin.ext_bwidth);
605 if (recalc_y) 667 if (recalc_y)
606 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 668 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
607 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 669 - szHint.height - 2 * TermWin.ext_bwidth);
608 670
609 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 671 TermWin.ncol = TermWin.width / TermWin.fwidth;
610 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 672 TermWin.nrow = TermWin.height / TermWin.fheight;
611 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 673 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
612 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 674 TermWin.ncol, TermWin.nrow, szHint.width,
613 R->szHint.height)); 675 szHint.height));
614 return; 676 return;
615} 677}
616 678
617/*----------------------------------------------------------------------*/ 679/*----------------------------------------------------------------------*/
618/* 680/*
619 * Tell the teletype handler what size the window is. 681 * Tell the teletype handler what size the window is.
620 * Called after a window size change. 682 * Called after a window size change.
621 */ 683 */
622void 684void
623rxvt_term::tt_winch () 685rxvt_term::tt_winch ()
624{ 686{
625 struct winsize ws; 687 struct winsize ws;
626 688
627 if (cmd_fd < 0) 689 if (cmd_fd < 0)
628 return; 690 return;
629 691
630 ws.ws_col = TermWin.ncol; 692 ws.ws_col = TermWin.ncol;
648 * init = 1 - initialize 710 * init = 1 - initialize
649 * 711 *
650 * fontname == FONT_UP - switch to bigger font 712 * fontname == FONT_UP - switch to bigger font
651 * fontname == FONT_DN - switch to smaller font 713 * fontname == FONT_DN - switch to smaller font
652 */ 714 */
653/* EXTPROTO */
654void 715void
655rxvt_change_font(pR_ int init, const char *fontname) 716rxvt_term::change_font (int init, const char *fontname)
656{ 717{}
657}
658 718
659/* INTPROTO */
660void 719void
661rxvt_font_up_down(pR_ int n, int direction) 720rxvt_term::font_up_down (int n, int direction)
662{ 721{}
663}
664 722
665/*----------------------------------------------------------------------*/ 723/*----------------------------------------------------------------------*/
666/*----------------------------------------------------------------------*/ 724/*----------------------------------------------------------------------*/
667/* xterm sequences - title, iconName, color (exptl) */ 725/* xterm sequences - title, iconName, color (exptl) */
668/* EXTPROTO */
669void 726void
670rxvt_set_title(pR_ const char *str) 727rxvt_term::set_title (const char *str)
671{ 728{
672#ifndef SMART_WINDOW_TITLE 729#ifndef SMART_WINDOW_TITLE
673 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 730 XStoreName(display->display, TermWin.parent[0], str);
674#else 731#else
675 char *name; 732 char *name;
676 733
677 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 734 if (XFetchName(display->display, TermWin.parent[0], &name) == 0)
678 name = NULL; 735 name = NULL;
679 if (name == NULL || STRCMP(name, str)) 736 if (name == NULL || STRCMP(name, str))
680 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 737 XStoreName(display->display, TermWin.parent[0], str);
681 if (name) 738 if (name)
682 XFree(name); 739 XFree(name);
683#endif 740#endif
684} 741}
685 742
686/* EXTPROTO */
687void 743void
688rxvt_set_iconName(pR_ const char *str) 744rxvt_term::set_iconName (const char *str)
689{ 745{
690#ifndef SMART_WINDOW_TITLE 746#ifndef SMART_WINDOW_TITLE
691 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 747 XSetIconName(display->display, TermWin.parent[0], str);
692#else 748#else
693 char *name; 749 char *name;
694 750
695 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 751 if (XGetIconName(display->display, TermWin.parent[0], &name))
696 name = NULL; 752 name = NULL;
697 if (name == NULL || STRCMP(name, str)) 753 if (name == NULL || STRCMP(name, str))
698 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 754 XSetIconName(display->display, TermWin.parent[0], str);
699 if (name) 755 if (name)
700 XFree(name); 756 XFree(name);
701#endif 757#endif
702} 758}
703 759
704#ifdef XTERM_COLOR_CHANGE 760#ifdef XTERM_COLOR_CHANGE
705/* EXTPROTO */
706void 761void
707rxvt_set_window_color(pR_ int idx, const char *color) 762rxvt_term::set_window_color (int idx, const char *color)
708{ 763{
709 rxvt_color xcol; 764 rxvt_color xcol;
710 int i; 765 int i;
711 766
712 if (color == NULL || *color == '\0') 767 if (color == NULL || *color == '\0')
713 return; 768 return;
714 769
715/* handle color aliases */ 770 /* handle color aliases */
716 if (isdigit(*color)) { 771 if (isdigit(*color))
772 {
717 i = atoi(color); 773 i = atoi(color);
774 if (i >= 8 && i <= 15)
718 if (i >= 8 && i <= 15) { /* bright colors */ 775 { /* bright colors */
719 i -= 8; 776 i -= 8;
720# ifndef NO_BRIGHTCOLOR 777# ifndef NO_BRIGHTCOLOR
721 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 778 PixColors[idx] = PixColors[minBrightCOLOR + i];
722 SET_PIXCOLOR(R, idx); 779 SET_PIXCOLOR(idx);
723 goto Done; 780 goto Done;
724# endif 781# endif
782
725 } 783 }
726 if (i >= 0 && i <= 7) { /* normal colors */ 784 if (i >= 0 && i <= 7)
785 { /* normal colors */
727 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 786 PixColors[idx] = PixColors[minCOLOR + i];
728 SET_PIXCOLOR(R, idx); 787 SET_PIXCOLOR(idx);
729 goto Done; 788 goto Done;
730 } 789 }
731 } 790 }
732 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 791 if (!rXParseAllocColor (& xcol, color))
733 return; 792 return;
734/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 793 /* XStoreColor (display->display, XCMAP, XColor*); */
735 794
736/* 795 /*
737 * FIXME: should free colors here, but no idea how to do it so instead, 796 * FIXME: should free colors here, but no idea how to do it so instead,
738 * so just keep gobbling up the colormap 797 * so just keep gobbling up the colormap
739 */ 798 */
740# if 0 799# if 0
741 for (i = Color_Black; i <= Color_White; i++) 800 for (i = Color_Black; i <= Color_White; i++)
742 if (R->PixColors[idx] == R->PixColors[i]) 801 if (PixColors[idx] == PixColors[i])
743 break; 802 break;
744 if (i > Color_White) { 803 if (i > Color_White)
804 {
745 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 805 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
746 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 806 XFreeColors(display->display, XCMAP, (PixColors + idx), 1,
747 DisplayPlanes(R->Xdisplay, Xscreen)); 807 DisplayPlanes(display->display, display->screen));
748 } 808 }
749# endif 809# endif
750 810
751 R->PixColors[idx] = xcol; 811 PixColors[idx] = xcol;
752 SET_PIXCOLOR(R, idx); 812 SET_PIXCOLOR(idx);
753 813
754/* XSetWindowAttributes attr; */ 814 /* XSetWindowAttributes attr; */
755/* Cursor cursor; */ 815 /* Cursor cursor; */
756 Done: 816Done:
757 if (idx == Color_bg && !(R->Options & Opt_transparent)) 817 if (idx == Color_bg && !(Options & Opt_transparent))
758 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 818 XSetWindowBackground(display->display, TermWin.vt,
759 R->PixColors[Color_bg]); 819 PixColors[Color_bg]);
760 820
761/* handle Color_BD, scrollbar background, etc. */ 821 /* handle Color_BD, scrollbar background, etc. */
762 822
763 rxvt_set_colorfgbg(aR); 823 set_colorfgbg ();
764 rxvt_recolour_cursor(aR); 824 recolour_cursor ();
765/* the only reasonable way to enforce a clean update */ 825 /* the only reasonable way to enforce a clean update */
766 rxvt_scr_poweron(aR); 826 scr_poweron ();
767} 827}
768 828
769#else 829#else
770# define rxvt_set_window_color(aR_ idx,color) ((void)0) 830# define set_window_color (idx,color) ((void)0)
771#endif /* XTERM_COLOR_CHANGE */ 831#endif /* XTERM_COLOR_CHANGE */
772 832
773/* EXTPROTO */
774void 833void
775rxvt_recolour_cursor(pR) 834rxvt_term::recolour_cursor ()
776{ 835{
777 rxvt_color xcol[2];
778
779#if TODO 836#if TODO
837 rxvt_color xcol[2];
838
780 xcol[0] = R->PixColors[Color_pointer]; 839 xcol[0] = PixColors[Color_pointer];
781 xcol[1] = R->PixColors[Color_bg]; 840 xcol[1] = PixColors[Color_bg];
782 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 841 XQueryColors (display->display, XCMAP, xcol, 2);
783 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 842 XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1]));
784#endif 843#endif
785} 844}
786 845
787/*----------------------------------------------------------------------*/ 846/*----------------------------------------------------------------------*/
788/* 847/*
789 * find if fg/bg matches any of the normal (low-intensity) colors 848 * find if fg/bg matches any of the normal (low-intensity) colors
790 */ 849 */
791/* INTPROTO */
792void 850void
793rxvt_set_colorfgbg(pR) 851rxvt_term::set_colorfgbg ()
794{ 852{
795 unsigned int i; 853 unsigned int i;
796 const char *xpmb = "\0"; 854 const char *xpmb = "\0";
797 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 855 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1];
798 856
799 R->env_colorfgbg = 857 env_colorfgbg =
800 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 858 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1);
801 STRCPY(fstr, "default"); 859 STRCPY(fstr, "default");
802 STRCPY(bstr, "default"); 860 STRCPY(bstr, "default");
803 for (i = Color_Black; i <= Color_White; i++) 861 for (i = Color_Black; i <= Color_White; i++)
804 if (R->PixColors[Color_fg] == R->PixColors[i]) { 862 if (PixColors[Color_fg] == PixColors[i])
863 {
805 sprintf(fstr, "%d", (i - Color_Black)); 864 sprintf(fstr, "%d", (i - Color_Black));
806 break; 865 break;
807 } 866 }
808 for (i = Color_Black; i <= Color_White; i++) 867 for (i = Color_Black; i <= Color_White; i++)
809 if (R->PixColors[Color_bg] == R->PixColors[i]) { 868 if (PixColors[Color_bg] == PixColors[i])
869 {
810 sprintf(bstr, "%d", (i - Color_Black)); 870 sprintf(bstr, "%d", (i - Color_Black));
811#ifdef XPM_BACKGROUND 871#ifdef XPM_BACKGROUND
812 xpmb = "default;"; 872 xpmb = "default;";
813#endif 873#endif
814 break; 874 break;
815 } 875 }
816 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 876 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
817 putenv(R->env_colorfgbg); 877 putenv(env_colorfgbg);
818 878
819#ifndef NO_BRIGHTCOLOR 879#ifndef NO_BRIGHTCOLOR
820 R->colorfgbg = DEFAULT_RSTYLE; 880 colorfgbg = DEFAULT_RSTYLE;
821 for (i = minCOLOR; i <= maxCOLOR; i++) { 881 for (i = minCOLOR; i <= maxCOLOR; i++)
882 {
822 if (R->PixColors[Color_fg] == R->PixColors[i]) 883 if (PixColors[Color_fg] == PixColors[i])
823 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 884 colorfgbg = SET_FGCOLOR(colorfgbg, i);
824 if (R->PixColors[Color_bg] == R->PixColors[i]) 885 if (PixColors[Color_bg] == PixColors[i])
825 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 886 colorfgbg = SET_BGCOLOR(colorfgbg, i);
826 } 887 }
827#endif 888#endif
828} 889}
829 890
830/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
831/* 892/*
832 * Colour determination for low colour displays, routine from 893 * Colour determination for low colour displays, routine from
833 * Hans de Goede <hans@highrise.nl> 894 * Hans de Goede <hans@highrise.nl>
834 */ 895 */
835 896
836/* EXTPROTO */
837int 897int
838rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 898rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
839{ 899{
840 screen_in_out->set(aR_ colour);
841
842 if (!screen_in_out->set(aR_ colour)) { 900 if (!screen_in_out->set (display, colour))
901 {
843 rxvt_print_error("can't allocate colour: %s", colour); 902 rxvt_print_error("can't allocate colour: %s", colour);
844 return false; 903 return false;
845 } 904 }
846 905
847 return true; 906 return true;
848} 907}
849 908
850/* -------------------------------------------------------------------- * 909/* -------------------------------------------------------------------- *
851 * - WINDOW RESIZING - * 910 * - WINDOW RESIZING - *
852 * -------------------------------------------------------------------- */ 911 * -------------------------------------------------------------------- */
853/* EXTPROTO */
854void 912void
855rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 913rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
856 int ignoreparent)
857{ 914{
858 int fix_screen; 915 int fix_screen;
859 916
860#ifdef SMART_RESIZE 917#ifdef SMART_RESIZE
861 int old_width = R->szHint.width, old_height = R->szHint.height; 918 int old_width = szHint.width, old_height = szHint.height;
862#endif 919#endif
863 920
864 rxvt_window_calc(aR_ width, height); 921 window_calc (width, height);
865 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 922 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
866 if (!ignoreparent) { 923 if (!ignoreparent)
924 {
867#ifdef SMART_RESIZE 925#ifdef SMART_RESIZE
868/* 926 /*
869 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 927 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
870 * reposition window on resize depending on placement on screen 928 * reposition window on resize depending on placement on screen
871 */ 929 */
872 int x, y, x1, y1; 930 int x, y, x1, y1;
873 int dx, dy; 931 int dx, dy;
874 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 932 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
875 Window unused_cr; 933 Window unused_cr;
876 934
877 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 935 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
878 0, 0, &x, &y, &unused_cr); 936 0, 0, &x, &y, &unused_cr);
879 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 937 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
880 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 938 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
881 /* 939 /*
882 * if Xroot isn't the parent window, a WM will probably have offset 940 * if display->root isn't the parent window, a WM will probably have offset
883 * our position for handles and decorations. Counter it 941 * our position for handles and decorations. Counter it
884 */ 942 */
885 if (x1 != x || y1 != y) { 943 if (x1 != x || y1 != y)
944 {
886 x -= x1; 945 x -= x1;
887 y -= y1; 946 y -= y1;
888 } 947 }
889 948
890 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 949 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
891 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 950 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
892 dx = old_width - R->szHint.width; 951 dx = old_width - szHint.width;
893 dy = old_height - R->szHint.height; 952 dy = old_height - szHint.height;
894 953
895 /* Check position of the center of the window */ 954 /* Check position of the center of the window */
896 if (x < x1) /* left half */ 955 if (x < x1) /* left half */
897 dx = 0; 956 dx = 0;
898 else if (x == x1) /* exact center */ 957 else if (x == x1) /* exact center */
899 dx /= 2; 958 dx /= 2;
900 if (y < y1) /* top half */ 959 if (y < y1) /* top half */
901 dy = 0; 960 dy = 0;
902 else if (y == y1) /* exact center */ 961 else if (y == y1) /* exact center */
903 dy /= 2; 962 dy /= 2;
904 963
905 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 964 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
906 R->szHint.width, R->szHint.height); 965 szHint.width, szHint.height);
907#else 966#else
908 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 967 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
909 R->szHint.height); 968 szHint.height);
910#endif 969#endif
911 }
912 970
971 }
972
913 fix_screen = (R->TermWin.ncol != R->prev_ncol 973 fix_screen = (TermWin.ncol != prev_ncol
914 || R->TermWin.nrow != R->prev_nrow); 974 || TermWin.nrow != prev_nrow);
975
915 if (fix_screen || width != R->old_width || height != R->old_height) { 976 if (fix_screen || width != old_width || height != old_height)
977 {
916 if (scrollbar_visible(R)) { 978 if (scrollbar_visible ())
979 {
917 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 980 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
918 0, scrollbar_TotalWidth(), R->szHint.height); 981 0, scrollbar_TotalWidth (), szHint.height);
919 rxvt_Resize_scrollBar(aR); 982 resize_scrollbar ();
920 } 983 }
984
921 if (menubar_visible(R)) 985 if (menubar_visible ())
922 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 986 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
923 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 987 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
988
924 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 989 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
925 R->window_vt_y, TermWin_TotalWidth(), 990 window_vt_y, TermWin_TotalWidth (),
926 TermWin_TotalHeight()); 991 TermWin_TotalHeight ());
927#ifdef RXVT_GRAPHICS 992#ifdef RXVT_GRAPHICS
928 if (R->old_height) 993 if (old_height)
929 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width, 994 Gr_Resize (old_width - szHint.base_width,
930 R->old_height - R->szHint.base_height); 995 old_height - szHint.base_height);
931#endif 996#endif
932 rxvt_scr_clear(aR); 997 scr_clear ();
933#ifdef XPM_BACKGROUND 998#ifdef XPM_BACKGROUND
934 rxvt_resize_pixmap(aR); 999 resize_pixmap ();
935#endif 1000#endif
936 }
937 1001
1002 }
1003
938 if (fix_screen || R->old_height == 0) { 1004 if (fix_screen || old_height == 0)
1005 {
939 int curr_screen = -1; 1006 int curr_screen = -1;
940 uint16_t old_ncol = R->prev_ncol; 1007 int old_ncol = prev_ncol;
941 1008
942 /* scr_reset only works on the primary screen */ 1009 /* scr_reset only works on the primary screen */
943 if (R->old_height) /* this is not the first time through */ 1010 if (old_height) /* this is not the first time through */
1011 {
1012 unsigned int ncol = TermWin.ncol;
1013 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
944 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1014 curr_screen = scr_change_screen (PRIMARY);
945 rxvt_scr_reset(aR); 1015 TermWin.ncol = ncol;
946 if (curr_screen >= 0) { /* this is not the first time through */
947 rxvt_scr_change_screen(aR_ curr_screen);
948 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
949 } 1016 }
950 }
951 1017
1018 scr_reset();
1019
1020 if (curr_screen >= 0) /* this is not the first time through */
1021 {
1022 scr_change_screen (curr_screen);
1023 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1024 }
1025 }
1026
952 R->old_width = R->szHint.width; 1027 old_width = szHint.width;
953 R->old_height = R->szHint.height; 1028 old_height = szHint.height;
954 1029
955#ifdef USE_XIM 1030#ifdef USE_XIM
956 rxvt_IMSetStatusPosition(aR); 1031 IMSetStatusPosition ();
957#endif 1032#endif
958} 1033}
959 1034
960/* 1035/*
961 * Set the width/height of the vt window in characters. Units are pixels. 1036 * Set the width/height of the vt window in characters. Units are pixels.
962 * good for toggling 80/132 columns 1037 * good for toggling 80/132 columns
963 */ 1038 */
964/* EXTPROTO */
965void 1039void
966rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1040rxvt_term::set_widthheight (unsigned int width, unsigned int height)
967{ 1041{
968 XWindowAttributes wattr; 1042 XWindowAttributes wattr;
969 1043
970 if (width == 0 || height == 0) { 1044 if (width == 0 || height == 0)
1045 {
971 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1046 XGetWindowAttributes(display->display, display->root, &wattr);
972 if (width == 0) 1047 if (width == 0)
973 width = wattr.width - R->szHint.base_width; 1048 width = wattr.width - szHint.base_width;
974 if (height == 0) 1049 if (height == 0)
975 height = wattr.height - R->szHint.base_height; 1050 height = wattr.height - szHint.base_height;
976 } 1051 }
977 if (width != R->TermWin.width || height != R->TermWin.height) { 1052 if (width != TermWin.width || height != TermWin.height)
1053 {
978 width += R->szHint.base_width; 1054 width += szHint.base_width;
979 height += R->szHint.base_height; 1055 height += szHint.base_height;
980 rxvt_resize_all_windows(aR_ width, height, 0); 1056 resize_all_windows (width, height, 0);
981 } 1057 }
982} 1058}
983 1059
984/* -------------------------------------------------------------------- * 1060/* -------------------------------------------------------------------- *
985 * - X INPUT METHOD ROUTINES - * 1061 * - X INPUT METHOD ROUTINES - *
986 * -------------------------------------------------------------------- */ 1062 * -------------------------------------------------------------------- */
987#ifdef USE_XIM 1063#ifdef USE_XIM
988/* INTPROTO */ 1064
989void 1065void
990rxvt_setSize(pR_ XRectangle * size) 1066rxvt_term::im_set_size (XRectangle *size)
991{ 1067{
992 size->x = R->TermWin.int_bwidth; 1068 size->x = TermWin.int_bwidth;
993 size->y = R->TermWin.int_bwidth; 1069 size->y = TermWin.int_bwidth;
994 size->width = Width2Pixel(R->TermWin.ncol); 1070 size->width = Width2Pixel(TermWin.ncol);
995 size->height = Height2Pixel(R->TermWin.nrow); 1071 size->height = Height2Pixel(TermWin.nrow);
996} 1072}
997 1073
998/* INTPROTO */
999void 1074void
1000rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1075rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1001{ 1076{
1002 *fg = R->PixColors[Color_fg]; 1077 *fg = PixColors[Color_fg];
1003 *bg = R->PixColors[Color_bg]; 1078 *bg = PixColors[Color_bg];
1004} 1079}
1005 1080
1006/* Checking whether input method is running. */ 1081/* Checking whether input method is running. */
1007/* INTPROTO */
1008Bool 1082bool
1009rxvt_IMisRunning(pR) 1083rxvt_term::IMisRunning ()
1010{ 1084{
1011 char *p; 1085 char *p;
1012 Atom atom; 1086 Atom atom;
1013 Window win; 1087 Window win;
1014 char server[IMBUFSIZ]; 1088 char server[IMBUFSIZ];
1015 1089
1016/* get current locale modifier */ 1090 /* get current locale modifier */
1017 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1091 if ((p = XSetLocaleModifiers(NULL)) != NULL)
1092 {
1018 STRCPY(server, "@server="); 1093 STRCPY(server, "@server=");
1019 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1094 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1020 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1095 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */
1021 *p = '\0'; 1096 *p = '\0';
1022 1097
1023 atom = XInternAtom(R->Xdisplay, server, False); 1098 atom = XInternAtom(display->display, server, False);
1024 win = XGetSelectionOwner(R->Xdisplay, atom); 1099 win = XGetSelectionOwner(display->display, atom);
1025 if (win != None) 1100 if (win != None)
1026 return True; 1101 return True;
1027 } 1102 }
1028 return False; 1103 return False;
1029} 1104}
1030 1105
1031/* EXTPROTO */
1032void 1106void
1033rxvt_IMSendSpot(pR) 1107rxvt_term::IMSendSpot ()
1034{ 1108{
1035 XPoint spot; 1109 XPoint spot;
1036 XVaNestedList preedit_attr; 1110 XVaNestedList preedit_attr;
1037 1111
1038 if (R->Input_Context == NULL 1112 if (Input_Context == NULL
1039 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1113 || !TermWin.focus || !(input_style & XIMPreeditPosition)
1040 || !(R->event_type == KeyPress 1114 || !(event_type == KeyPress
1041 || R->event_type == Expose 1115 || event_type == Expose
1042 || R->event_type == NoExpose 1116 || event_type == NoExpose
1043 || R->event_type == SelectionNotify 1117 || event_type == SelectionNotify
1044 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1118 || event_type == ButtonRelease || event_type == FocusIn)
1045 || !rxvt_IMisRunning(aR)) 1119 || !IMisRunning ())
1046 return; 1120 return;
1047 1121
1048 rxvt_setPosition(aR_ & spot); 1122 im_set_position (&spot);
1049 1123
1050 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1124 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1051 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1125 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1052 XFree(preedit_attr); 1126 XFree(preedit_attr);
1053} 1127}
1054 1128
1055/* EXTPROTO */
1056void 1129void
1057rxvt_setTermFontSet(pR_ int idx)
1058{
1059 char *string;
1060 long length;
1061 int success = 0;
1062
1063 if (idx < 0 || idx >= MAX_NFONTS)
1064 return;
1065}
1066
1067/* INTPROTO */
1068void
1069rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1130rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1070 XRectangle * needed_rect) 1131 XRectangle * needed_rect)
1071{ 1132{
1072 int mbh, vtx = 0; 1133 int mbh, vtx = 0;
1073 1134
1074 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1135 if (scrollbar_visible () && !(Options & Opt_scrollBar_right))
1075 vtx = scrollbar_TotalWidth(); 1136 vtx = scrollbar_TotalWidth();
1137
1076 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1138 mbh = menubar_visible () ? menuBar_TotalHeight() : 0;
1077 mbh -= R->TermWin.lineSpace; 1139 mbh -= TermWin.lineSpace;
1078 1140
1079 preedit_rect->x = needed_rect->width + vtx; 1141 preedit_rect->x = needed_rect->width + vtx;
1080 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1142 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1081 1143
1082 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1144 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1083 + vtx;
1084 preedit_rect->height = Height2Pixel(1); 1145 preedit_rect->height = Height2Pixel(1);
1085 1146
1086 status_rect->x = vtx; 1147 status_rect->x = vtx;
1087 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1148 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1088 1149
1089 status_rect->width = needed_rect->width ? needed_rect->width 1150 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1090 : Width2Pixel(R->TermWin.ncol + 1);
1091 status_rect->height = Height2Pixel(1); 1151 status_rect->height = Height2Pixel(1);
1092} 1152}
1093 1153
1094/* ARGSUSED */
1095/* INTPROTO */
1096void 1154void
1097rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1155rxvt_term::im_destroy ()
1098 __attribute__ ((unused)), XPointer call_data
1099 __attribute__ ((unused)))
1100{ 1156{
1101 dR; 1157 if (Input_Context)
1102 1158 {
1159 XDestroyIC (Input_Context);
1103 R->Input_Context = NULL; 1160 Input_Context = NULL;
1104/* To avoid Segmentation Fault in C locale: Solaris only? */ 1161 }
1105 if (STRCMP(R->locale, "C")) 1162
1106 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1163 if (input_method)
1107 rxvt_IMInstantiateCallback, NULL); 1164 {
1165 display->put_xim (input_method);
1166 input_method = 0;
1167 }
1108} 1168}
1109 1169
1110/* 1170/*
1111 * X manual pages and include files don't match on some systems: 1171 * Try to open a XIM with the current modifiers, then see if we can
1112 * some think this is an XIDProc and others an XIMProc so we can't 1172 * open a suitable preedit type
1113 * use the first argument - need to update this to be nice for
1114 * both types via some sort of configure detection
1115 */ 1173 */
1116/* ARGSUSED */ 1174bool
1117/* EXTPROTO */ 1175rxvt_term::IM_get_IC (const char *modifiers)
1118void
1119rxvt_IMInstantiateCallback(Display * unused
1120 __attribute__ ((unused)), XPointer client_data
1121 __attribute__ ((unused)), XPointer call_data
1122 __attribute__ ((unused)))
1123{ 1176{
1124 dR; 1177 int i, j, found;
1178 XIM xim;
1179 XPoint spot;
1180 XRectangle rect, status_rect, needed_rect;
1181 unsigned long fg, bg;
1182 const char *p;
1183 char **s;
1184 XIMStyles *xim_styles;
1185 XVaNestedList preedit_attr, status_attr;
1186
1187 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1188 return false;
1189
1190 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1191 input_method = display->get_xim (locale, modifiers);
1192 if (input_method == NULL)
1193 return false;
1194
1195 xim = input_method->xim;
1196
1197 xim_styles = NULL;
1198 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1199 || !xim_styles || !xim_styles->count_styles)
1200 {
1201 display->put_xim (input_method);
1202 return false;
1203 }
1204
1205 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1206 s = rxvt_splitcommastring(p);
1207 for (i = found = 0; !found && s[i]; i++)
1208 {
1209 if (!STRCMP(s[i], "OverTheSpot"))
1210 input_style = (XIMPreeditPosition | XIMStatusNothing);
1211 else if (!STRCMP(s[i], "OffTheSpot"))
1212 input_style = (XIMPreeditArea | XIMStatusArea);
1213 else if (!STRCMP(s[i], "Root"))
1214 input_style = (XIMPreeditNothing | XIMStatusNothing);
1215
1216 for (j = 0; j < xim_styles->count_styles; j++)
1217 if (input_style == xim_styles->supported_styles[j])
1218 {
1219 found = 1;
1220 break;
1221 }
1222 }
1223
1224 for (i = 0; s[i]; i++)
1225 free (s[i]);
1226
1227 free (s);
1228 XFree (xim_styles);
1229
1230 if (!found)
1231 {
1232 display->put_xim (input_method);
1233 return false;
1234 }
1235
1236 preedit_attr = status_attr = NULL;
1237
1238 if (input_style & XIMPreeditPosition)
1239 {
1240 im_set_size (&rect);
1241 im_set_position (&spot);
1242 im_set_color (&fg, &bg);
1243
1244 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1245 XNSpotLocation, &spot,
1246 XNForeground, fg, XNBackground, bg,
1247 //XNFontSet, TermWin.fontset,
1248 NULL);
1249 }
1250 else if (input_style & XIMPreeditArea)
1251 {
1252 im_set_color (&fg, &bg);
1253
1254 /*
1255 * The necessary width of preedit area is unknown
1256 * until create input context.
1257 */
1258 needed_rect.width = 0;
1259
1260 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1261
1262 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1263 XNForeground, fg, XNBackground, bg,
1264 //XNFontSet, TermWin.fontset,
1265 NULL);
1266 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1267 XNForeground, fg, XNBackground, bg,
1268 //XNFontSet, TermWin.fontset,
1269 NULL);
1270 }
1271
1272 Input_Context = XCreateIC(xim, XNInputStyle, input_style,
1273 XNClientWindow, TermWin.parent[0],
1274 XNFocusWindow, TermWin.parent[0],
1275 preedit_attr ? XNPreeditAttributes : NULL,
1276 preedit_attr,
1277 status_attr ? XNStatusAttributes : NULL,
1278 status_attr, NULL);
1279 if (preedit_attr) XFree(preedit_attr);
1280 if (status_attr) XFree(status_attr);
1281
1282 if (Input_Context == NULL)
1283 {
1284 rxvt_print_error("failed to create input context");
1285 display->put_xim (input_method);
1286 return false;
1287 }
1288
1289 if (input_style & XIMPreeditArea)
1290 IMSetStatusPosition ();
1291
1292 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1293 return true;
1294}
1295
1296void
1297rxvt_term::im_cb ()
1298{
1125 int i, found, had_im; 1299 int i, found, had_im;
1126 const char *p; 1300 const char *p;
1127 char **s; 1301 char **s;
1128 char buf[IMBUFSIZ]; 1302 char buf[IMBUFSIZ];
1129 1303
1304 im_destroy ();
1305
1130 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1306 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1131 if (R->Input_Context) 1307 if (Input_Context)
1132 return; 1308 return;
1133 1309
1310#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1311 if (rs[Rs_imLocale])
1312 setlocale (LC_CTYPE, rs[Rs_imLocale]);
1313#endif
1314
1134 p = R->rs[Rs_inputMethod]; 1315 p = rs[Rs_inputMethod];
1135 if (p && *p) 1316 if (p && *p)
1136 { 1317 {
1137 bool found = false; 1318 bool found = false;
1138 1319
1139 s = rxvt_splitcommastring (p); 1320 s = rxvt_splitcommastring (p);
1141 { 1322 {
1142 if (*s[i]) 1323 if (*s[i])
1143 { 1324 {
1144 STRCPY (buf, "@im="); 1325 STRCPY (buf, "@im=");
1145 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1326 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1146 if ((p = XSetLocaleModifiers (buf)) && *p 1327 if (IM_get_IC (buf))
1147 && rxvt_IM_get_IC (aR))
1148 { 1328 {
1149 found = true; 1329 found = true;
1150 break; 1330 break;
1151 } 1331 }
1152 } 1332 }
1153 } 1333 }
1154 for (i = 0; s[i]; i++) 1334 for (i = 0; s[i]; i++)
1155 free(s[i]); 1335 free(s[i]);
1156 free(s); 1336 free(s);
1157 1337
1158 if (found) 1338 if (found)
1159 return; 1339 goto done;
1160 } 1340 }
1161 1341
1162/* try with XMODIFIERS env. var. */ 1342 /* try with XMODIFIERS env. var. */
1163 if ((p = XSetLocaleModifiers ("")) && *p 1343 if (IM_get_IC (""))
1164 && rxvt_IM_get_IC (aR)) 1344 goto done;
1345
1346 /* try with no modifiers base IF the user didn't specify an IM */
1347 if (IM_get_IC ("@im=none"))
1348 goto done;
1349
1350done:
1351#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1352 if (rs[Rs_imLocale])
1353 setlocale (LC_CTYPE, locale);
1354#endif
1355}
1356
1357void
1358rxvt_term::IMSetStatusPosition ()
1359{
1360 XRectangle preedit_rect, status_rect, *needed_rect;
1361 XVaNestedList preedit_attr, status_attr;
1362
1363 if (Input_Context == NULL
1364 || !TermWin.focus || !(input_style & XIMPreeditArea)
1365 || !IMisRunning ())
1165 return; 1366 return;
1166 1367
1167/* try with no modifiers base IF the user didn't specify an IM */
1168 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1169 && rxvt_IM_get_IC (aR) == True)
1170 return;
1171}
1172
1173/*
1174 * Try to open a XIM with the current modifiers, then see if we can
1175 * open a suitable preedit type
1176 */
1177/* INTPROTO */
1178Bool
1179rxvt_IM_get_IC(pR)
1180{
1181 int i, j, found;
1182 XIM xim;
1183 XPoint spot;
1184 XRectangle rect, status_rect, needed_rect;
1185 unsigned long fg, bg;
1186 const char *p;
1187 char **s;
1188 XIMStyles *xim_styles;
1189 XVaNestedList preedit_attr, status_attr;
1190 XIMCallback ximcallback;
1191
1192 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1193 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL);
1194 if (xim == NULL)
1195 return False;
1196
1197 xim_styles = NULL;
1198 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
1199 || !xim_styles || !xim_styles->count_styles) {
1200 XCloseIM(xim);
1201 return False;
1202 }
1203
1204 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1205 : "OverTheSpot,OffTheSpot,Root";
1206 s = rxvt_splitcommastring(p);
1207 for (i = found = 0; !found && s[i]; i++) {
1208 if (!STRCMP(s[i], "OverTheSpot"))
1209 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1210 else if (!STRCMP(s[i], "OffTheSpot"))
1211 R->input_style = (XIMPreeditArea | XIMStatusArea);
1212 else if (!STRCMP(s[i], "Root"))
1213 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1214
1215 for (j = 0; j < xim_styles->count_styles; j++)
1216 if (R->input_style == xim_styles->supported_styles[j]) {
1217 found = 1;
1218 break;
1219 }
1220 }
1221 for (i = 0; s[i]; i++)
1222 free(s[i]);
1223 free(s);
1224 XFree(xim_styles);
1225
1226 if (!found) {
1227 XCloseIM(xim);
1228 return False;
1229 }
1230
1231 ximcallback.callback = rxvt_IMDestroyCallback;
1232
1233/* XXX: not sure why we need this (as well as IC one below) */
1234 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1235
1236 preedit_attr = status_attr = NULL;
1237
1238 if (R->input_style & XIMPreeditPosition) {
1239 rxvt_setSize(aR_ & rect);
1240 rxvt_setPosition(aR_ & spot);
1241 rxvt_setColor(aR_ & fg, &bg);
1242
1243 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1244 XNSpotLocation, &spot,
1245 XNForeground, fg, XNBackground, bg,
1246 //XNFontSet, R->TermWin.fontset,
1247 NULL);
1248 } else if (R->input_style & XIMPreeditArea) {
1249 rxvt_setColor(aR_ & fg, &bg);
1250
1251 /*
1252 * The necessary width of preedit area is unknown
1253 * until create input context.
1254 */
1255 needed_rect.width = 0;
1256
1257 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1258
1259 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1260 XNForeground, fg, XNBackground, bg,
1261 //XNFontSet, R->TermWin.fontset,
1262 NULL);
1263 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1264 XNForeground, fg, XNBackground, bg,
1265 //XNFontSet, R->TermWin.fontset,
1266 NULL);
1267 }
1268 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1269 XNClientWindow, R->TermWin.parent[0],
1270 XNFocusWindow, R->TermWin.parent[0],
1271 XNDestroyCallback, &ximcallback,
1272 preedit_attr ? XNPreeditAttributes : NULL,
1273 preedit_attr,
1274 status_attr ? XNStatusAttributes : NULL,
1275 status_attr, NULL);
1276 if (preedit_attr)
1277 XFree(preedit_attr);
1278 if (status_attr)
1279 XFree(status_attr);
1280 if (R->Input_Context == NULL) {
1281 rxvt_print_error("failed to create input context");
1282 XCloseIM(xim);
1283 return False;
1284 }
1285 if (R->input_style & XIMPreeditArea)
1286 rxvt_IMSetStatusPosition(aR);
1287 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1288 return True;
1289}
1290
1291/* EXTPROTO */
1292void
1293rxvt_IMSetStatusPosition(pR)
1294{
1295 XRectangle preedit_rect, status_rect, *needed_rect;
1296 XVaNestedList preedit_attr, status_attr;
1297
1298 if (R->Input_Context == NULL
1299 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea)
1300 || !rxvt_IMisRunning(aR))
1301 return;
1302
1303/* Getting the necessary width of preedit area */ 1368 /* Getting the necessary width of preedit area */
1304 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1369 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1305 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1370 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL);
1306 XFree(status_attr); 1371 XFree(status_attr);
1307 1372
1308 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1373 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1309 1374
1310 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1375 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1311 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1376 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1312 1377
1313 XSetICValues(R->Input_Context, 1378 XSetICValues(Input_Context,
1314 XNPreeditAttributes, preedit_attr, 1379 XNPreeditAttributes, preedit_attr,
1315 XNStatusAttributes, status_attr, NULL); 1380 XNStatusAttributes, status_attr, NULL);
1316 1381
1317 XFree(preedit_attr); 1382 XFree(preedit_attr);
1318 XFree(status_attr); 1383 XFree(status_attr);
1319} 1384}
1320#endif /* USE_XIM */ 1385#endif /* USE_XIM */
1321 1386
1322/*----------------------------------------------------------------------*/ 1387/*----------------------------------------------------------------------*/
1323rxvt_t rxvt_current_term; 1388rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines