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.29 by pcg, Wed Feb 11 08:13:45 2004 UTC vs.
Revision 1.32 by pcg, Fri Feb 13 12:16:21 2004 UTC

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

Diff Legend

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