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.189 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.218 by root, Thu Feb 2 18:04:46 2006 UTC

… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
58 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 62 return false;
60 63
61 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
63 return true; 66 return true;
64} 67}
65 68
66void 69void
67rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
68{ 71{
69 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
71} 74}
72 75
73void 76void
74rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
75{ 78{
76 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
77} 80}
78 81
79#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
166#ifdef POINTER_BLANK 169#ifdef POINTER_BLANK
167 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
168#endif 171#endif
169#ifdef USE_XIM 172#ifdef USE_XIM
170 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
171#endif 177#endif
172 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
173 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
174 child_ev (this, &rxvt_term::child_cb), 180 child_ev (this, &rxvt_term::child_cb),
175 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
… …
182 188
183 termlist.push_back (this); 189 termlist.push_back (this);
184 190
185#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
186 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
187
188 if (!keyboard)
189 rxvt_fatal ("out of memory, aborting.\n");
190#endif 193#endif
191} 194}
192 195
193// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
194// for use before an emergency exit 197// for use before an emergency exit
… …
200 delete pty; pty = 0; 203 delete pty; pty = 0;
201} 204}
202 205
203rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
204{ 207{
205 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
206
207 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
208 209
209 emergency_cleanup (); 210 emergency_cleanup ();
210 211
211#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
215#endif 216#endif
216 delete fontset[0]; 217 delete fontset[0];
217 218
218 if (display) 219 if (display)
219 { 220 {
220 dDisp;
221
222 selection_clear (); 221 selection_clear ();
223 222
224#ifdef USE_XIM 223#ifdef USE_XIM
225 im_destroy (); 224 im_destroy ();
226#endif 225#endif
227#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
228 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
229 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (dpy, ShadowGC);
230#endif 229#endif
231#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
232 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
233#endif 232#endif
234#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
235 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (dpy, blackGC);
236 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (dpy, whiteGC);
237 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (dpy, grayGC);
238 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (dpy, darkGC);
239 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (dpy, stippleGC);
240 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (dpy, dimple);
241 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (dpy, upArrow);
242 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (dpy, downArrow);
243 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
244 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
245#endif 244#endif
246#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
247 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (dpy, topShadowGC);
248 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (dpy, botShadowGC);
249 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
250#endif 249#endif
251 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (dpy, gc);
252 251
253 delete drawable; 252 delete drawable;
254 // destroy all windows 253 // destroy all windows
255 if (parent[0]) 254 if (parent[0])
256 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (dpy, parent[0]);
257 }
258 256
259 // TODO: free pixcolours, colours should become part of rxvt_display 257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i))
259 {
260 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING
262 pix_colors_unfocused [i].free (this);
263#endif
264 }
265
266 clear ();
267 }
268
260 delete pix_colors_focused; 269 delete pix_colors_focused;
261#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
262 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
263#endif 272#endif
264 273
… …
270 for (int i = 0; i < allocated.size (); i++) 279 for (int i = 0; i < allocated.size (); i++)
271 free (allocated [i]); 280 free (allocated [i]);
272 281
273 free (selection.text); 282 free (selection.text);
274 // TODO: manage env vars in child only(!) 283 // TODO: manage env vars in child only(!)
275 free (env_windowid);
276 free (env_display); 284 free (env_display);
277 free (env_term); 285 free (env_term);
278 free (env_colorfgbg);
279 free (locale); 286 free (locale);
280 free (v_buffer); 287 free (v_buffer);
281 free (incr_buf); 288 free (incr_buf);
282 289
283 delete envv; 290 delete envv;
… …
303void 310void
304rxvt_term::destroy () 311rxvt_term::destroy ()
305{ 312{
306 if (destroy_ev.active) 313 if (destroy_ev.active)
307 return; 314 return;
315
316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 317
309#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
310 scr_overlay_off (); 319 scr_overlay_off ();
311#endif 320#endif
312 321
… …
367{ 376{
368 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
369 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
370} 379}
371 380
372#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
373static void 382static void
374print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
375{ 384{
376 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
377 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
… …
425 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
426 else 435 else
427 { 436 {
428 // GET_R is most likely not the terminal which caused the error, 437 // GET_R is most likely not the terminal which caused the error,
429 // so just output the error and continue 438 // so just output the error and continue
430#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
431 print_x_error (display, event); 442 print_x_error (display, event);
432#else
433 old_xerror_handler (display, event);
434#endif 443#endif
435 } 444 }
436 445
437 return 0; 446 return 0;
438} 447}
… …
446 _exit (EXIT_FAILURE); 455 _exit (EXIT_FAILURE);
447} 456}
448 457
449/*----------------------------------------------------------------------*/ 458/*----------------------------------------------------------------------*/
450bool 459bool
451rxvt_term::init (int argc, const char *const *argv) 460rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
452{ 461{
462 this->envv = envv;
463
453 SET_R (this); 464 SET_R (this);
454 set_locale (""); 465 set_locale ("");
455 set_environ (envv); // few things in X do not call setlocale :( 466 set_environ (envv); // few things in X do not call setlocale :(
456 467
457 if (!init_vars ()) 468 if (!init_vars ())
… …
468#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
469 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
470 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
471#endif 482#endif
472 483
473#if ENABLE_PERL 484 pty = ptytty::create ();
474 if (!rs[Rs_perl_ext_1])
475 rs[Rs_perl_ext_1] = "default";
476
477 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
478 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
479 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
480 {
481 rxvt_perl.init (this);
482 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
483 }
484#endif
485
486 pty = rxvt_new_ptytty ();
487 485
488 create_windows (argc, argv); 486 create_windows (argc, argv);
489 487
490 dDisp;
491
492 init_xlocale (); 488 init_xlocale ();
493 489
494 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
495 491
496#if 0 492#if 0
497 XSynchronize (disp, True); 493 XSynchronize (dpy, True);
498#endif 494#endif
499 495
500#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
501 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
502 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
503#endif 499#endif
504#ifdef TRANSPARENT 500#ifdef TRANSPARENT
505 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
506 { 502 {
507 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (dpy, display->root, PropertyChangeMask);
508 check_our_parents (); 504 check_our_parents ();
509 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
510 } 506 }
511#endif 507#endif
512 508
513 XMapWindow (disp, vt);
514 XMapWindow (disp, parent[0]);
515
516 set_colorfgbg (); 509 set_colorfgbg ();
517 510
518 init_command (cmd_argv); 511 init_command (cmd_argv);
519 512
520 free (cmd_argv); 513 free (cmd_argv);
… …
523 pty_ev.start (pty->pty, EVENT_READ); 516 pty_ev.start (pty->pty, EVENT_READ);
524 517
525 check_ev.start (); 518 check_ev.start ();
526 519
527 HOOK_INVOKE ((this, HOOK_START, DT_END)); 520 HOOK_INVOKE ((this, HOOK_START, DT_END));
521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
532 XMapWindow (dpy, vt);
533 XMapWindow (dpy, parent[0]);
528 534
529 return true; 535 return true;
530} 536}
531 537
532static struct sig_handlers 538static struct sig_handlers
… …
537 * Catch a fatal signal and tidy up before quitting 543 * Catch a fatal signal and tidy up before quitting
538 */ 544 */
539 void 545 void
540 sig_term (sig_watcher &w) 546 sig_term (sig_watcher &w)
541 { 547 {
542#ifdef DEBUG_CMD
543 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
544#endif
545 rxvt_emergency_cleanup (); 548 rxvt_emergency_cleanup ();
546 signal (w.signum, SIG_DFL); 549 signal (w.signum, SIG_DFL);
547 kill (getpid (), w.signum); 550 kill (getpid (), w.signum);
548 } 551 }
549 552
… …
557char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
558 561
559void 562void
560rxvt_init () 563rxvt_init ()
561{ 564{
562 uid_t uid = getuid (); 565 ptytty::init ();
563 gid_t gid = getgid ();
564
565 // before doing anything else, check for setuid/setgid operation,
566 // start the helper process and drop privileges
567 if (uid != geteuid ()
568 || gid != getegid ())
569 {
570#if PTYTTY_HELPER
571 rxvt_ptytty_server ();
572#else
573 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
574#endif
575
576 // drop privileges
577#if HAVE_SETRESUID
578 setresgid (gid, gid, gid);
579 setresuid (uid, uid, uid);
580#elif HAVE_SETREUID
581 setregid (gid, gid);
582 setreuid (uid, uid);
583#elif HAVE_SETUID
584 setgid (gid);
585 setuid (uid);
586#endif
587
588 if (uid != geteuid ()
589 || gid != getegid ())
590 rxvt_fatal ("unable to drop privileges, aborting.\n");
591 }
592 566
593 rxvt_environ = environ; 567 rxvt_environ = environ;
594 568
595 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
596 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
… …
631 rxvt_fatal ("memory allocation failure. aborting.\n"); 605 rxvt_fatal ("memory allocation failure. aborting.\n");
632 606
633 return p; 607 return p;
634} 608}
635 609
636void * 610void *
637rxvt_realloc (void *ptr, size_t size) 611rxvt_realloc (void *ptr, size_t size)
638{ 612{
639 void *p = realloc (ptr, size); 613 void *p = realloc (ptr, size);
640 614
641 if (!p) 615 if (!p)
… …
654{ 628{
655 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
656 int x, y, sb_w, flags; 630 int x, y, sb_w, flags;
657 unsigned int w, h; 631 unsigned int w, h;
658 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
659 dDisp;
660
661 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
662 ncol, nrow, szHint.width, szHint.height));
663 633
664 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
665 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
666 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
667 637
… …
729 699
730 if (scrollBar.state) 700 if (scrollBar.state)
731 { 701 {
732 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
733 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
734 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
735 window_vt_x += sb_w; 706 window_vt_x += sb_w;
736 } 707 }
737 708
738 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
… …
764 735
765 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
766 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
767 738
768 if (recalc_x) 739 if (recalc_x)
769 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741
770 if (recalc_y) 742 if (recalc_y)
771 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
772 744
773 ncol = width / fwidth; 745 ncol = width / fwidth;
774 nrow = height / fheight; 746 nrow = height / fheight;
775 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
776 ncol, nrow, szHint.width,
777 szHint.height));
778 return;
779} 747}
780 748
781/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
782/* 750/*
783 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
… …
883 return true; 851 return true;
884} 852}
885 853
886void rxvt_term::set_string_property (Atom prop, const char *str, int len) 854void rxvt_term::set_string_property (Atom prop, const char *str, int len)
887{ 855{
888 XChangeProperty (display->display, parent[0], 856 XChangeProperty (dpy, parent[0],
889 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
890 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
891} 859}
892 860
893void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
894{ 862{
895 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
896 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
897 865
898 XChangeProperty (display->display, parent[0], 866 XChangeProperty (dpy, parent[0],
899 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
900 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
901 869
902 free (s); 870 free (s);
903 free (ws); 871 free (ws);
… …
928void 896void
929rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
930{ 898{
931 rxvt_color xcol; 899 rxvt_color xcol;
932 int i; 900 int i;
933 901
934 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
935 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
936 908
937 /* handle color aliases */ 909 /* handle color aliases */
938 if (isdigit (*color)) 910 if (isdigit (*color))
939 { 911 {
940 i = atoi (color); 912 i = atoi (color);
941 913
942 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
943 { /* bright colors */ 915 { /* bright colors */
944 i -= 8; 916 i -= 8;
945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
946 SET_PIXCOLOR (idx);
947 goto done; 918 goto done;
948 } 919 }
949 920
950 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
951 { /* normal colors */ 922 { /* normal colors */
952 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
953 SET_PIXCOLOR (idx);
954 goto done; 924 goto done;
955 } 925 }
956 } 926 }
957 927
958 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
959 return;
960
961 /* XStoreColor (display->display, display->cmap, XColor*); */
962 929
963 /* 930 /*
964 * FIXME: should free colors here, but no idea how to do it so instead, 931 * FIXME: should free colors here, but no idea how to do it so instead,
965 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
966 */ 933 */
967# if 0
968 for (i = Color_Black; i <= Color_White; i++)
969 if (pix_colors[idx] == pix_colors[i])
970 break;
971 if (i > Color_White)
972 {
973 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
974 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
975 DisplayPlanes (display->display, display->screen));
976 }
977# endif
978 934
979 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
980 SET_PIXCOLOR (idx);
981 936
982 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
983 /* Cursor cursor; */ 938 /* Cursor cursor; */
984done: 939done:
985 940
986#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
987 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
988 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
989#endif 948#endif
990 949
991 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
992 951
993 recolour_cursor (); 952 recolour_cursor ();
… …
999#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1000 959
1001void 960void
1002rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1003{ 962{
1004 XColor xcol[2]; 963 XColor fg, bg;
1005 964
1006 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1007 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1008 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1009 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1010 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1011 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1012 972
1013 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1014 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1015} 974}
1016 975
1017/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1018/* 977/*
1019 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1023{ 982{
1024 unsigned int i; 983 unsigned int i;
1025 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1026 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1027 986
1028 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1029 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1030 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1031 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1033 { 991 {
… …
1048 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1049} 1007}
1050 1008
1051/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1052 1010
1053int 1011bool
1054rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1055{ 1013{
1056 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1057 {
1058 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1059 return false;
1060 }
1061
1062 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1063} 1025}
1064 1026
1065/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1066 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1067 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1068void 1030void
1069rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1070{ 1032{
1071 int fix_screen; 1033 int fix_screen;
1072 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1073 dDisp; 1035 int old_height = szHint.height;
1074 1036
1075 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1076 XSetWMNormalHints (disp, parent[0], &szHint); 1038 XSetWMNormalHints (dpy, parent[0], &szHint);
1077 1039
1078 if (!ignoreparent) 1040 if (!ignoreparent)
1079 { 1041 {
1080#ifdef SMART_RESIZE 1042#ifdef SMART_RESIZE
1081 /* 1043 /*
… …
1085 int x, y, x1, y1; 1047 int x, y, x1, y1;
1086 int dx, dy; 1048 int dx, dy;
1087 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1088 Window unused_cr; 1050 Window unused_cr;
1089 1051
1090 XTranslateCoordinates (disp, parent[0], display->root, 1052 XTranslateCoordinates (dpy, parent[0], display->root,
1091 0, 0, &x, &y, &unused_cr); 1053 0, 0, &x, &y, &unused_cr);
1092 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1054 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1093 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1094 /* 1056 /*
1095 * if display->root isn't the parent window, a WM will probably have offset 1057 * if display->root isn't the parent window, a WM will probably have offset
1096 * our position for handles and decorations. Counter it 1058 * our position for handles and decorations. Counter it
1097 */ 1059 */
… …
1099 { 1061 {
1100 x -= x1; 1062 x -= x1;
1101 y -= y1; 1063 y -= y1;
1102 } 1064 }
1103 1065
1104 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1066 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1105 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1067 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1106 dx = old_width - szHint.width; 1068 dx = old_width - szHint.width;
1107 dy = old_height - szHint.height; 1069 dy = old_height - szHint.height;
1108 1070
1109 /* Check position of the center of the window */ 1071 /* Check position of the center of the window */
1110 if (x < x1) /* left half */ 1072 if (x < x1) /* left half */
1111 dx = 0; 1073 dx = 0;
… …
1114 if (y < y1) /* top half */ 1076 if (y < y1) /* top half */
1115 dy = 0; 1077 dy = 0;
1116 else if (y == y1) /* exact center */ 1078 else if (y == y1) /* exact center */
1117 dy /= 2; 1079 dy /= 2;
1118 1080
1119 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1081 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1120 szHint.width, szHint.height); 1082 szHint.width, szHint.height);
1121#else 1083#else
1122 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1084 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1123#endif 1085#endif
1124 } 1086 }
1125 1087
1126 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1127 1089
1128 if (fix_screen || newwidth != old_width || newheight != old_height) 1090 if (fix_screen || newwidth != old_width || newheight != old_height)
1129 { 1091 {
1130 if (scrollBar.state) 1092 if (scrollBar.state)
1131 { 1093 {
1132 XMoveResizeWindow (disp, scrollBar.win, 1094 XMoveResizeWindow (dpy, scrollBar.win,
1133 window_sb_x, 0, 1095 window_sb_x, 0,
1134 scrollbar_TotalWidth (), szHint.height); 1096 scrollbar_TotalWidth (), szHint.height);
1135 resize_scrollbar (); 1097 resize_scrollbar ();
1136 } 1098 }
1137 1099
1138 XMoveResizeWindow (disp, vt, 1100 XMoveResizeWindow (dpy, vt,
1139 window_vt_x, window_vt_y, 1101 window_vt_x, window_vt_y,
1140 width, height); 1102 width, height);
1141 1103
1142 scr_clear (); 1104 scr_clear ();
1143#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1144 resize_pixmap (); 1106 resize_pixmap ();
1145#endif 1107#endif
1146 } 1108 }
1147 1109
1148 if (fix_screen || old_height == 0) 1110 if (fix_screen || old_height == 0)
1149 {
1150 int curr_screen = -1;
1151 int old_ncol = prev_ncol;
1152
1153 /* scr_reset only works on the primary screen */
1154 if (old_height) /* this is not the first time through */
1155 {
1156 unsigned int ocol = ncol;
1157 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1158 curr_screen = scr_change_screen (PRIMARY);
1159 ncol = ocol;
1160 }
1161
1162 scr_reset (); 1111 scr_reset ();
1163 1112
1164 if (curr_screen >= 0) /* this is not the first time through */ 1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1165 { 1114 //scr_touch (false);
1166 scr_change_screen (curr_screen);
1167 selection_check (old_ncol != ncol ? 4 : 0);
1168 }
1169 }
1170
1171 old_width = szHint.width;
1172 old_height = szHint.height;
1173 1115
1174#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1175 if (pixmap) 1117 if (pixmap)
1176 scr_touch (false); 1118 scr_touch (false);
1177#endif 1119#endif
… …
1190{ 1132{
1191 XWindowAttributes wattr; 1133 XWindowAttributes wattr;
1192 1134
1193 if (newwidth == 0 || newheight == 0) 1135 if (newwidth == 0 || newheight == 0)
1194 { 1136 {
1195 XGetWindowAttributes (display->display, display->root, &wattr); 1137 XGetWindowAttributes (dpy, display->root, &wattr);
1196 1138
1197 if (newwidth == 0) 1139 if (newwidth == 0)
1198 newwidth = wattr.width - szHint.base_width; 1140 newwidth = wattr.width - szHint.base_width;
1199 if (newheight == 0) 1141 if (newheight == 0)
1200 newheight = wattr.height - szHint.base_height; 1142 newheight = wattr.height - szHint.base_height;
… …
1214#ifdef USE_XIM 1156#ifdef USE_XIM
1215 1157
1216void 1158void
1217rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1218{ 1160{
1219 fg = pix_colors[Color_fg]; 1161 fg = pix_colors [Color_fg];
1220 bg = pix_colors[Color_bg]; 1162 bg = pix_colors [Color_bg];
1221} 1163}
1222 1164
1223void 1165void
1224rxvt_term::im_set_size (XRectangle &size) 1166rxvt_term::im_set_size (XRectangle &size)
1225{ 1167{
… …
1262 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1263 1205
1264 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1265 *p = '\0'; 1207 *p = '\0';
1266 1208
1267 atom = XInternAtom (display->display, server, False); 1209 atom = XInternAtom (dpy, server, False);
1268 win = XGetSelectionOwner (display->display, atom); 1210 win = XGetSelectionOwner (dpy, atom);
1269 1211
1270 if (win != None) 1212 if (win != None)
1271 return True; 1213 return True;
1272 } 1214 }
1273 1215
… …
1280 XPoint nspot; 1222 XPoint nspot;
1281 XVaNestedList preedit_attr; 1223 XVaNestedList preedit_attr;
1282 1224
1283 if (!Input_Context 1225 if (!Input_Context
1284 || !focus 1226 || !focus
1285 || !(input_style & XIMPreeditPosition)) 1227 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1286 return; 1228 return;
1287 1229
1288 im_set_position (nspot); 1230 im_set_position (nspot);
1289 1231
1290 if (nspot.x == spot.x && nspot.y == spot.y) 1232 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1309 input_method = 0; 1251 input_method = 0;
1310 } 1252 }
1311 1253
1312 Input_Context = 0; 1254 Input_Context = 0;
1313} 1255}
1256
1257#ifdef ENABLE_XIM_ONTHESPOT
1258
1259static void
1260xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1261{
1262 ((rxvt_term *)client_data)->make_current ();
1263 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1264}
1265
1266static void
1267xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1268{
1269 ((rxvt_term *)client_data)->make_current ();
1270 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1271}
1272
1273static void
1274xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1275{
1276 rxvt_term *term = (rxvt_term *)client_data;
1277 XIMText *text = call_data->text;
1278
1279 term->make_current ();
1280
1281 if (text)
1282 {
1283 void *str;
1284
1285 if (!text->encoding_is_wchar && text->string.multi_byte)
1286 {
1287 // of course, X makes it ugly again
1288 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->rs[Rs_imLocale]);
1290
1291 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1292 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1293
1294 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->locale);
1296 }
1297 else
1298 str = (void *)text->string.wide_char;
1299
1300 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1301 DT_INT, call_data->caret,
1302 DT_INT, call_data->chg_first,
1303 DT_INT, call_data->chg_length,
1304 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1305 DT_WCS_LEN, str, str ? (int)text->length : 0,
1306 DT_END));
1307 }
1308 else
1309 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310 DT_INT, call_data->caret,
1311 DT_INT, call_data->chg_first,
1312 DT_INT, call_data->chg_length,
1313 DT_END));
1314}
1315
1316#if 0
1317static void
1318xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1319{
1320 ((rxvt_term *)client_data)->make_current ();
1321 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1322 DT_INT, call_data->position,
1323 DT_INT, call_data->direction,
1324 DT_INT, call_data->style,
1325 DT_END));
1326}
1327#endif
1328
1329#endif
1314 1330
1315/* 1331/*
1316 * Try to open a XIM with the current modifiers, then see if we can 1332 * Try to open a XIM with the current modifiers, then see if we can
1317 * open a suitable preedit type 1333 * open a suitable preedit type
1318 */ 1334 */
… …
1325 XRectangle rect, status_rect, needed_rect; 1341 XRectangle rect, status_rect, needed_rect;
1326 unsigned long fg, bg; 1342 unsigned long fg, bg;
1327 const char *p; 1343 const char *p;
1328 char **s; 1344 char **s;
1329 XIMStyles *xim_styles; 1345 XIMStyles *xim_styles;
1346#ifdef ENABLE_XIM_ONTHESPOT
1347 XIMCallback xcb[4];
1348#endif
1330 1349
1331 set_environ (envv); 1350 set_environ (envv);
1332 1351
1333 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1352 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1334 return false; 1353 return false;
1335 1354
1336 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1337 input_method = display->get_xim (locale, modifiers); 1355 input_method = display->get_xim (locale, modifiers);
1338 if (input_method == NULL) 1356 if (input_method == NULL)
1339 return false; 1357 return false;
1340 1358
1341 xim = input_method->xim; 1359 xim = input_method->xim;
… …
1361 s = rxvt_splitcommastring (p); 1379 s = rxvt_splitcommastring (p);
1362 1380
1363 for (i = found = 0; !found && s[i]; i++) 1381 for (i = found = 0; !found && s[i]; i++)
1364 { 1382 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1383 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = (XIMPreeditPosition | XIMStatusNothing); 1384 input_style = XIMPreeditPosition | XIMStatusNothing;
1367 else if (!strcmp (s[i], "OffTheSpot")) 1385 else if (!strcmp (s[i], "OffTheSpot"))
1368 input_style = (XIMPreeditArea | XIMStatusArea); 1386 input_style = XIMPreeditArea | XIMStatusArea;
1369 else if (!strcmp (s[i], "Root")) 1387 else if (!strcmp (s[i], "Root"))
1370 input_style = (XIMPreeditNothing | XIMStatusNothing); 1388 input_style = XIMPreeditNothing | XIMStatusNothing;
1371 else if (!strcmp (s[i], "None")) 1389 else if (!strcmp (s[i], "None"))
1372 input_style = (XIMPreeditNone | XIMStatusNone); 1390 input_style = XIMPreeditNone | XIMStatusNone;
1391#ifdef ENABLE_XIM_ONTHESPOT
1392 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1393 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1394#endif
1395 else
1396 input_style = XIMPreeditNothing | XIMStatusNothing;
1373 1397
1374 for (j = 0; j < xim_styles->count_styles; j++) 1398 for (j = 0; j < xim_styles->count_styles; j++)
1375 if (input_style == xim_styles->supported_styles[j]) 1399 if (input_style == xim_styles->supported_styles[j])
1376 { 1400 {
1377 rxvt_freecommastring (s); 1401 rxvt_freecommastring (s);
… …
1415 "*", 1439 "*",
1416 fheight, 1440 fheight,
1417 fheight + 1, fheight - 1, 1441 fheight + 1, fheight - 1,
1418 fheight - 2, fheight + 2); 1442 fheight - 2, fheight + 2);
1419 1443
1420 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1444 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1421 &missing_charset_list, &missing_charset_count, &def_string); 1445 &missing_charset_list, &missing_charset_count, &def_string);
1422 1446
1423 if (missing_charset_list) 1447 if (missing_charset_list)
1424 XFreeStringList (missing_charset_list); 1448 XFreeStringList (missing_charset_list);
1425 1449
… …
1466 XNBackground, bg, 1490 XNBackground, bg,
1467 XNArea, &status_rect, 1491 XNArea, &status_rect,
1468 XNFontSet, fs, 1492 XNFontSet, fs,
1469 NULL); 1493 NULL);
1470 } 1494 }
1495#if ENABLE_XIM_ONTHESPOT
1496 else if (input_style & XIMPreeditCallbacks)
1497 {
1498 im_set_position (spot);
1499
1500 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1501 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1502 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1503# if 0
1504 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1505# endif
1506
1507 preedit_attr = XVaCreateNestedList (0,
1508 XNSpotLocation, &spot,
1509 XNPreeditStartCallback, &xcb[0],
1510 XNPreeditDoneCallback , &xcb[1],
1511 XNPreeditDrawCallback , &xcb[2],
1512# if 0
1513 XNPreeditCaretCallback, &xcb[3],
1514# endif
1515 NULL);
1516 }
1517#endif
1471 1518
1472 Input_Context = XCreateIC (xim, 1519 Input_Context = XCreateIC (xim,
1473 XNInputStyle, input_style, 1520 XNInputStyle, input_style,
1474 XNClientWindow, vt, 1521 XNClientWindow, vt,
1475 XNFocusWindow, parent[0], 1522 XNFocusWindow, parent[0],
… …
1478 status_attr ? XNStatusAttributes : NULL, 1525 status_attr ? XNStatusAttributes : NULL,
1479 status_attr, NULL); 1526 status_attr, NULL);
1480 1527
1481 if (preedit_attr) XFree (preedit_attr); 1528 if (preedit_attr) XFree (preedit_attr);
1482 if (status_attr) XFree (status_attr); 1529 if (status_attr) XFree (status_attr);
1483 if (fs) XFreeFontSet (display->display, fs); 1530 if (fs) XFreeFontSet (dpy, fs);
1484 1531
1485 if (Input_Context == NULL) 1532 if (Input_Context == NULL)
1486 { 1533 {
1487 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1534 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1488 im_destroy (); 1535 im_destroy ();
1489 return false; 1536 return false;
1490 } 1537 }
1491 1538
1539#if 0
1540 // unfortunately, only the focus window is used by XIM, hard to fix
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input ();
1543#endif
1544
1492 if (input_style & XIMPreeditArea) 1545 if (input_style & XIMPreeditArea)
1493 IMSetStatusPosition (); 1546 IMSetStatusPosition ();
1494 1547
1495 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1496 return true; 1548 return true;
1497} 1549}
1498 1550
1499void 1551void
1500rxvt_term::im_cb () 1552rxvt_term::im_cb ()
… …
1506 1558
1507 make_current (); 1559 make_current ();
1508 1560
1509 im_destroy (); 1561 im_destroy ();
1510 1562
1511 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1512 if (Input_Context) 1563 if (Input_Context)
1513 return; 1564 return;
1514 1565
1515#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1566#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1516 if (rs[Rs_imLocale]) 1567 if (rs[Rs_imLocale])
… …
1589 XFree (preedit_attr); 1640 XFree (preedit_attr);
1590 XFree (status_attr); 1641 XFree (status_attr);
1591} 1642}
1592#endif /* USE_XIM */ 1643#endif /* USE_XIM */
1593 1644
1594/*----------------------------------------------------------------------*/
1595rxvt_t rxvt_current_term;
1596
1597/*----------------------- end-of-file (C source) -----------------------*/ 1645/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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