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.191 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.228 by root, Wed Aug 2 09:14:19 2006 UTC

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

Diff Legend

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