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.31 by pcg, Fri Feb 13 12:11:05 2004 UTC vs.
Revision 1.33 by pcg, Fri Feb 13 13:28:17 2004 UTC

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

Diff Legend

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