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.26 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.38 by pcg, Sat Feb 21 21:43:37 2004 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines