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

Diff Legend

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