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.194 by root, Sun Jan 22 00:36:59 2006 UTC vs.
Revision 1.235 by ayin, Sun Jun 10 15:16:15 2007 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 :
153#if TRANSPARENT || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
148#if TRANSPARENT 156#if TRANSPARENT
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
150#endif 158#endif
151#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 161#endif
154#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
198void rxvt_term::emergency_cleanup () 206void rxvt_term::emergency_cleanup ()
199{ 207{
200 if (cmd_pid) 208 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
202 210
211 pty_ev.stop ();
203 delete pty; pty = 0; 212 delete pty; pty = 0;
204} 213}
205 214
206rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
207{ 216{
… …
216#endif 225#endif
217 delete fontset[0]; 226 delete fontset[0];
218 227
219 if (display) 228 if (display)
220 { 229 {
221 dDisp;
222
223 selection_clear (); 230 selection_clear ();
224 231
225#ifdef USE_XIM 232#ifdef USE_XIM
226 im_destroy (); 233 im_destroy ();
227#endif 234#endif
228#ifdef XTERM_SCROLLBAR 235#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 238#endif
232#ifdef PLAIN_SCROLLBAR 239#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 241#endif
235#ifdef NEXT_SCROLLBAR 242#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 243 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 244 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 245 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 246 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 247 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 248 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 249 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 250 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 253#endif
247#ifdef RXVT_SCROLLBAR 254#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 258#endif
252 if (gc) XFreeGC (disp, gc); 259 if (gc) XFreeGC (dpy, gc);
253 260
254 delete drawable; 261 delete drawable;
255 // destroy all windows 262 // destroy all windows
256 if (parent[0]) 263 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 264 XDestroyWindow (dpy, parent[0]);
258 }
259 265
260 // TODO: free pixcolours, colours should become part of rxvt_display 266 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 267 if (ISSET_PIXCOLOR (i))
268 {
269 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
271 pix_colors_unfocused [i].free (this);
272#endif
273 }
274
275 clear ();
276 }
277
278 delete [] pix_colors_focused;
279#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
264#endif 281#endif
265 282
266 displays.put (display); 283 displays.put (display);
267 284
268 scr_release (); 285 scr_release ();
… …
271 for (int i = 0; i < allocated.size (); i++) 288 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 289 free (allocated [i]);
273 290
274 free (selection.text); 291 free (selection.text);
275 // TODO: manage env vars in child only(!) 292 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 293 free (env_display);
278 free (env_term); 294 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 295 free (locale);
281 free (v_buffer); 296 free (v_buffer);
282 free (incr_buf); 297 free (incr_buf);
283 298
284 delete envv; 299 delete envv;
… …
295{ 310{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 312
298 cmd_pid = 0; 313 cmd_pid = 0;
299 314
300 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
301 destroy (); 316 destroy ();
302} 317}
303 318
304void 319void
305rxvt_term::destroy () 320rxvt_term::destroy ()
306{ 321{
307 if (destroy_ev.active) 322 if (destroy_ev.active)
308 return; 323 return;
309 324
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 326
313#if ENABLE_OVERLAY 327#if ENABLE_OVERLAY
314 scr_overlay_off (); 328 scr_overlay_off ();
315#endif 329#endif
316 330
… …
320 im_ev.stop (display); 334 im_ev.stop (display);
321#endif 335#endif
322#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
324#endif 338#endif
325#if TRANSPARENT 339#if TRANSPARENT || ENABLE_PERL
326 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
327#endif 341#endif
328 incr_ev.stop (); 342 incr_ev.stop ();
329 termwin_ev.stop (display); 343 termwin_ev.stop (display);
330 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
371{ 385{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 387 (*t)->emergency_cleanup ();
374} 388}
375 389
376#if ENABLE_FRILLS 390#if !ENABLE_MINIMAL
377static void 391static void
378print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
379{ 393{
380 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
… …
429 GET_R->allowedxerror = event->error_code; 443 GET_R->allowedxerror = event->error_code;
430 else 444 else
431 { 445 {
432 // GET_R is most likely not the terminal which caused the error, 446 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 447 // so just output the error and continue
434#if ENABLE_FRILLS 448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
435 print_x_error (display, event); 451 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 452#endif
439 } 453 }
440 454
441 return 0; 455 return 0;
442} 456}
… …
470#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
471 keyboard->register_done (); 485 keyboard->register_done ();
472#endif 486#endif
473 487
474#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 491#endif
478 492
479 pty = rxvt_new_ptytty (); 493 pty = ptytty::create ();
480 494
481 create_windows (argc, argv); 495 create_windows (argc, argv);
482 496
483 dDisp;
484
485 init_xlocale (); 497 init_xlocale ();
486 498
487 scr_reset (); // initialize screen 499 scr_reset (); // initialize screen
488 500
489#if 0 501#if 0
490 XSynchronize (disp, True); 502 XSynchronize (dpy, True);
491#endif 503#endif
492 504
493#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
496#endif 508#endif
497#ifdef TRANSPARENT 509#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent)) 510 if (option (Opt_transparent))
499 { 511 {
500 XSelectInput (disp, display->root, PropertyChangeMask); 512 XSelectInput (dpy, display->root, PropertyChangeMask);
501 check_our_parents (); 513 check_our_parents ();
502 rootwin_ev.start (display, display->root); 514 rootwin_ev.start (display, display->root);
503 } 515 }
504#endif 516#endif
517#if ENABLE_PERL
518 rootwin_ev.start (display, display->root);
519#endif
505 520
506 set_colorfgbg (); 521 set_colorfgbg ();
507 522
508 init_command (cmd_argv); 523 init_command (cmd_argv);
509 524
… …
514 529
515 check_ev.start (); 530 check_ev.start ();
516 531
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 532 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 533
534#if ENABLE_XEMBED
535 if (rs[Rs_embed])
536 {
537 long info[2] = { 0, XEMBED_MAPPED };
538
539 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
540 32, PropModeReplace, (unsigned char *)&info, 2);
541 }
542#endif
543
519 XMapWindow (disp, vt); 544 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 545 XMapWindow (dpy, parent[0]);
521 546
522 return true; 547 return true;
523} 548}
524 549
525static struct sig_handlers 550static struct sig_handlers
… …
530 * Catch a fatal signal and tidy up before quitting 555 * Catch a fatal signal and tidy up before quitting
531 */ 556 */
532 void 557 void
533 sig_term (sig_watcher &w) 558 sig_term (sig_watcher &w)
534 { 559 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup (); 560 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL); 561 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum); 562 kill (getpid (), w.signum);
541 } 563 }
542 564
… …
550char **rxvt_environ; // startup environment 572char **rxvt_environ; // startup environment
551 573
552void 574void
553rxvt_init () 575rxvt_init ()
554{ 576{
555 uid_t uid = getuid (); 577 ptytty::init ();
556 gid_t gid = getgid ();
557
558 // before doing anything else, check for setuid/setgid operation,
559 // start the helper process and drop privileges
560 if (uid != geteuid ()
561 || gid != getegid ())
562 {
563#if PTYTTY_HELPER
564 rxvt_ptytty_server ();
565#else
566 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
567#endif
568
569 // drop privileges
570#if HAVE_SETRESUID
571 setresgid (gid, gid, gid);
572 setresuid (uid, uid, uid);
573#elif HAVE_SETREUID
574 setregid (gid, gid);
575 setreuid (uid, uid);
576#elif HAVE_SETUID
577 setgid (gid);
578 setuid (uid);
579#endif
580
581 if (uid != geteuid ()
582 || gid != getegid ())
583 rxvt_fatal ("unable to drop privileges, aborting.\n");
584 }
585 578
586 rxvt_environ = environ; 579 rxvt_environ = environ;
587 580
588 signal (SIGHUP, SIG_IGN); 581 signal (SIGHUP, SIG_IGN);
589 signal (SIGPIPE, SIG_IGN); 582 signal (SIGPIPE, SIG_IGN);
… …
647{ 640{
648 short recalc_x, recalc_y; 641 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 642 int x, y, sb_w, flags;
650 unsigned int w, h; 643 unsigned int w, h;
651 unsigned int max_width, max_height; 644 unsigned int max_width, max_height;
652 dDisp;
653
654 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
655 ncol, nrow, szHint.width, szHint.height));
656 645
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 646 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 647 szHint.win_gravity = NorthWestGravity;
659 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 648 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
660 649
… …
722 711
723 if (scrollBar.state) 712 if (scrollBar.state)
724 { 713 {
725 sb_w = scrollbar_TotalWidth (); 714 sb_w = scrollbar_TotalWidth ();
726 szHint.base_width += sb_w; 715 szHint.base_width += sb_w;
716
727 if (!OPTION (Opt_scrollBar_right)) 717 if (!option (Opt_scrollBar_right))
728 window_vt_x += sb_w; 718 window_vt_x += sb_w;
729 } 719 }
730 720
731 szHint.width_inc = fwidth; 721 szHint.width_inc = fwidth;
732 szHint.height_inc = fheight; 722 szHint.height_inc = fheight;
733 szHint.min_width = szHint.base_width + szHint.width_inc; 723 szHint.min_width = szHint.base_width + szHint.width_inc;
734 szHint.min_height = szHint.base_height + szHint.height_inc; 724 szHint.min_height = szHint.base_height + szHint.height_inc;
735 725
736 if (newwidth && newwidth - szHint.base_width < max_width) 726 if (newwidth && newwidth - szHint.base_width < max_width)
737 { 727 {
738 szHint.width = newwidth; 728 szHint.width = newwidth;
… …
753 { 743 {
754 min_it (height, max_height); 744 min_it (height, max_height);
755 szHint.height = szHint.base_height + height; 745 szHint.height = szHint.base_height + height;
756 } 746 }
757 747
758 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 748 if (scrollBar.state && option (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w; 749 window_sb_x = szHint.width - sb_w;
760 750
761 if (recalc_x) 751 if (recalc_x)
762 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 752 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
753
763 if (recalc_y) 754 if (recalc_y)
764 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 755 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
765 756
766 ncol = width / fwidth; 757 ncol = width / fwidth;
767 nrow = height / fheight; 758 nrow = height / fheight;
768 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
769 ncol, nrow, szHint.width,
770 szHint.height));
771 return;
772} 759}
773 760
774/*----------------------------------------------------------------------*/ 761/*----------------------------------------------------------------------*/
775/* 762/*
776 * Tell the teletype handler what size the window is. 763 * Tell the teletype handler what size the window is.
… …
828 delete fontset[0]; 815 delete fontset[0];
829 fontset[0] = fs; 816 fontset[0] = fs;
830 817
831 prop = (*fs)[1]->properties (); 818 prop = (*fs)[1]->properties ();
832 prop.height += lineSpace; 819 prop.height += lineSpace;
820
833 fs->set_prop (prop); 821 fs->set_prop (prop, false);
834 822
835 fwidth = prop.width; 823 fwidth = prop.width;
836 fheight = prop.height; 824 fheight = prop.height;
837 fbase = prop.ascent; 825 fbase = prop.ascent;
838 826
… …
847 { 835 {
848 fontset[style] = fs = new rxvt_fontset (this); 836 fontset[style] = fs = new rxvt_fontset (this);
849 rxvt_fontprop prop2 = prop; 837 rxvt_fontprop prop2 = prop;
850 838
851 if (res) 839 if (res)
852 prop2.weight = prop2.slant = rxvt_fontprop::unset; 840 {
841 fs->populate (res);
842 fs->set_prop (prop2, false);
843 }
853 else 844 else
854 { 845 {
855 res = fontset[0]->fontdesc; 846 fs->populate (fontset[0]->fontdesc);
856 847
857 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 848 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
858 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 849 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
850
851 fs->set_prop (prop2, true);
859 } 852 }
860 853
861 fs->populate (res);
862 fs->set_prop (prop2);
863 } 854 }
864#else 855#else
865 fontset[style] = fontset[0]; 856 fontset[style] = fontset[0];
866#endif 857#endif
867 } 858 }
… …
876 return true; 867 return true;
877} 868}
878 869
879void rxvt_term::set_string_property (Atom prop, const char *str, int len) 870void rxvt_term::set_string_property (Atom prop, const char *str, int len)
880{ 871{
881 XChangeProperty (display->display, parent[0], 872 XChangeProperty (dpy, parent[0],
882 prop, XA_STRING, 8, PropModeReplace, 873 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 874 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 875}
885 876
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 877void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 878{
888 wchar_t *ws = rxvt_mbstowcs (str, len); 879 wchar_t *ws = rxvt_mbstowcs (str, len);
889 char *s = rxvt_wcstoutf8 (ws); 880 char *s = rxvt_wcstoutf8 (ws);
890 881
891 XChangeProperty (display->display, parent[0], 882 XChangeProperty (dpy, parent[0],
892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 883 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
893 (const unsigned char *)s, strlen (s)); 884 (const unsigned char *)s, strlen (s));
894 885
895 free (s); 886 free (s);
896 free (ws); 887 free (ws);
… …
921void 912void
922rxvt_term::set_window_color (int idx, const char *color) 913rxvt_term::set_window_color (int idx, const char *color)
923{ 914{
924 rxvt_color xcol; 915 rxvt_color xcol;
925 int i; 916 int i;
926 917
927 if (color == NULL || *color == '\0') 918 if (color == NULL || *color == '\0')
928 return; 919 return;
920
921 color = strdup (color);
922 allocated.push_back ((void *)color);
923 rs[Rs_color + idx] = color;
929 924
930 /* handle color aliases */ 925 /* handle color aliases */
931 if (isdigit (*color)) 926 if (isdigit (*color))
932 { 927 {
933 i = atoi (color); 928 i = atoi (color);
934 929
935 if (i >= 8 && i <= 15) 930 if (i >= 8 && i <= 15)
936 { /* bright colors */ 931 { /* bright colors */
937 i -= 8; 932 i -= 8;
938 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 933 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
939 SET_PIXCOLOR (idx);
940 goto done; 934 goto done;
941 } 935 }
942 936
943 if (i >= 0 && i <= 7) 937 if (i >= 0 && i <= 7)
944 { /* normal colors */ 938 { /* normal colors */
945 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 939 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
946 SET_PIXCOLOR (idx);
947 goto done; 940 goto done;
948 } 941 }
949 } 942 }
950 943
951 if (!rXParseAllocColor (&xcol, color)) 944 set_color (xcol, color);
952 return;
953
954 /* XStoreColor (display->display, display->cmap, XColor*); */
955 945
956 /* 946 /*
957 * FIXME: should free colors here, but no idea how to do it so instead, 947 * FIXME: should free colors here, but no idea how to do it so instead,
958 * so just keep gobbling up the colormap 948 * so just keep gobbling up the colormap
959 */ 949 */
960# if 0
961 for (i = Color_Black; i <= Color_White; i++)
962 if (pix_colors[idx] == pix_colors[i])
963 break;
964 if (i > Color_White)
965 {
966 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
967 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
968 DisplayPlanes (display->display, display->screen));
969 }
970# endif
971 950
972 pix_colors_focused[idx] = xcol; 951 pix_colors_focused[idx] = xcol;
973 SET_PIXCOLOR (idx);
974 952
975 /* XSetWindowAttributes attr; */ 953 /* XSetWindowAttributes attr; */
976 /* Cursor cursor; */ 954 /* Cursor cursor; */
977done: 955done:
978
979#if OFF_FOCUS_FADING
980 if (rs[Rs_fade])
981 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
982#endif
983
984 /*TODO: handle Color_BD, scrollbar background, etc. */ 956 /*TODO: handle Color_BD, scrollbar background, etc. */
985 957
958 update_fade_color (idx);
986 recolour_cursor (); 959 recolour_cursor ();
987 scr_recolour (); 960 scr_recolour ();
988} 961}
989 962
990#else 963#else
… …
992#endif /* XTERM_COLOR_CHANGE */ 965#endif /* XTERM_COLOR_CHANGE */
993 966
994void 967void
995rxvt_term::recolour_cursor () 968rxvt_term::recolour_cursor ()
996{ 969{
997 XColor xcol[2]; 970 XColor fg, bg;
998 971
999 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 972 (ISSET_PIXCOLOR (Color_pointer_fg)
1000 ? pix_colors_focused[Color_pointer_fg] 973 ? pix_colors_focused[Color_pointer_fg]
1001 : pix_colors_focused[Color_fg]; 974 : pix_colors_focused[Color_fg]).get (fg);
975
1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 976 (ISSET_PIXCOLOR (Color_pointer_bg)
1003 ? pix_colors_focused[Color_pointer_bg] 977 ? pix_colors_focused[Color_pointer_bg]
1004 : pix_colors_focused[Color_bg]; 978 : pix_colors_focused[Color_bg]).get (bg);
1005 979
1006 XQueryColors (display->display, display->cmap, xcol, 2); 980 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1007 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1008} 981}
1009 982
1010/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
1011/* 984/*
1012 * find if fg/bg matches any of the normal (low-intensity) colors 985 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1016{ 989{
1017 unsigned int i; 990 unsigned int i;
1018 const char *xpmb = "\0"; 991 const char *xpmb = "\0";
1019 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 992 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1020 993
1021 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1022 strcpy (fstr, "default"); 994 strcpy (fstr, "default");
1023 strcpy (bstr, "default"); 995 strcpy (bstr, "default");
1024 for (i = Color_Black; i <= Color_White; i++) 996 for (i = Color_Black; i <= Color_White; i++)
1025 if (pix_colors[Color_fg] == pix_colors[i]) 997 if (pix_colors[Color_fg] == pix_colors[i])
1026 { 998 {
… …
1041 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1013 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1042} 1014}
1043 1015
1044/*----------------------------------------------------------------------*/ 1016/*----------------------------------------------------------------------*/
1045 1017
1046int 1018bool
1047rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1019rxvt_term::set_color (rxvt_color &color, const char *name)
1048{ 1020{
1049 if (!screen_in_out->set (display, colour)) 1021 if (color.set (this, name))
1050 {
1051 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1052 return false;
1053 }
1054
1055 return true; 1022 return true;
1023
1024 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1025 return false;
1026}
1027
1028void
1029rxvt_term::alias_color (int dst, int src)
1030{
1031 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1056} 1032}
1057 1033
1058/* -------------------------------------------------------------------- * 1034/* -------------------------------------------------------------------- *
1059 * - WINDOW RESIZING - * 1035 * - WINDOW RESIZING - *
1060 * -------------------------------------------------------------------- */ 1036 * -------------------------------------------------------------------- */
1061void 1037void
1062rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1038rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1063{ 1039{
1064 int fix_screen; 1040 int fix_screen;
1065 int old_width = szHint.width, old_height = szHint.height; 1041 int old_width = szHint.width;
1066 dDisp; 1042 int old_height = szHint.height;
1067 1043
1068 window_calc (newwidth, newheight); 1044 window_calc (newwidth, newheight);
1045
1046 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1069 XSetWMNormalHints (disp, parent[0], &szHint); 1047 XSetWMNormalHints (dpy, parent[0], &szHint);
1070 1048
1071 if (!ignoreparent) 1049 if (!ignoreparent)
1072 { 1050 {
1073#ifdef SMART_RESIZE 1051#ifdef SMART_RESIZE
1074 /* 1052 /*
… …
1078 int x, y, x1, y1; 1056 int x, y, x1, y1;
1079 int dx, dy; 1057 int dx, dy;
1080 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1058 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1081 Window unused_cr; 1059 Window unused_cr;
1082 1060
1083 XTranslateCoordinates (disp, parent[0], display->root, 1061 XTranslateCoordinates (dpy, parent[0], display->root,
1084 0, 0, &x, &y, &unused_cr); 1062 0, 0, &x, &y, &unused_cr);
1085 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1063 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1086 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1064 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1087 /* 1065 /*
1088 * if display->root isn't the parent window, a WM will probably have offset 1066 * if display->root isn't the parent window, a WM will probably have offset
1089 * our position for handles and decorations. Counter it 1067 * our position for handles and decorations. Counter it
1090 */ 1068 */
… …
1092 { 1070 {
1093 x -= x1; 1071 x -= x1;
1094 y -= y1; 1072 y -= y1;
1095 } 1073 }
1096 1074
1097 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1075 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1098 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1076 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1099 dx = old_width - szHint.width; 1077 dx = old_width - szHint.width;
1100 dy = old_height - szHint.height; 1078 dy = old_height - szHint.height;
1101 1079
1102 /* Check position of the center of the window */ 1080 /* Check position of the center of the window */
1103 if (x < x1) /* left half */ 1081 if (x < x1) /* left half */
1104 dx = 0; 1082 dx = 0;
… …
1107 if (y < y1) /* top half */ 1085 if (y < y1) /* top half */
1108 dy = 0; 1086 dy = 0;
1109 else if (y == y1) /* exact center */ 1087 else if (y == y1) /* exact center */
1110 dy /= 2; 1088 dy /= 2;
1111 1089
1112 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1090 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1113 szHint.width, szHint.height); 1091 szHint.width, szHint.height);
1114#else 1092#else
1115 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1093 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1116#endif 1094#endif
1117 } 1095 }
1118 1096
1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1097 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1120 1098
1121 if (fix_screen || newwidth != old_width || newheight != old_height) 1099 if (fix_screen || newwidth != old_width || newheight != old_height)
1122 { 1100 {
1123 if (scrollBar.state) 1101 if (scrollBar.state)
1124 { 1102 {
1125 XMoveResizeWindow (disp, scrollBar.win, 1103 XMoveResizeWindow (dpy, scrollBar.win,
1126 window_sb_x, 0, 1104 window_sb_x, 0,
1127 scrollbar_TotalWidth (), szHint.height); 1105 scrollbar_TotalWidth (), szHint.height);
1128 resize_scrollbar (); 1106 resize_scrollbar ();
1129 } 1107 }
1130 1108
1131 XMoveResizeWindow (disp, vt, 1109 XMoveResizeWindow (dpy, vt,
1132 window_vt_x, window_vt_y, 1110 window_vt_x, window_vt_y,
1133 width, height); 1111 width, height);
1134 1112
1135 scr_clear (); 1113 scr_clear ();
1136#ifdef XPM_BACKGROUND 1114#ifdef XPM_BACKGROUND
1137 resize_pixmap (); 1115 resize_pixmap ();
1138#endif 1116#endif
1139 } 1117 }
1140 1118
1141 if (fix_screen || old_height == 0) 1119 if (fix_screen || old_height == 0)
1142 {
1143 int curr_screen = -1;
1144 int old_ncol = prev_ncol;
1145
1146 /* scr_reset only works on the primary screen */
1147 if (old_height) /* this is not the first time through */
1148 {
1149 unsigned int ocol = ncol;
1150 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1151 curr_screen = scr_change_screen (PRIMARY);
1152 ncol = ocol;
1153 }
1154
1155 scr_reset (); 1120 scr_reset ();
1156 1121
1157 if (curr_screen >= 0) /* this is not the first time through */ 1122 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1158 { 1123 //scr_touch (false);
1159 scr_change_screen (curr_screen);
1160 selection_check (old_ncol != ncol ? 4 : 0);
1161 }
1162 }
1163
1164 old_width = szHint.width;
1165 old_height = szHint.height;
1166 1124
1167#ifdef XPM_BACKGROUND 1125#ifdef XPM_BACKGROUND
1168 if (pixmap) 1126 if (pixmap)
1169 scr_touch (false); 1127 scr_touch (false);
1170#endif 1128#endif
1171 1129
1172#ifdef USE_XIM 1130#ifdef USE_XIM
1173 IMSetStatusPosition (); 1131 IMSetPosition ();
1174#endif 1132#endif
1175} 1133}
1176 1134
1177/* 1135/*
1178 * Set the width/height of the vt window in characters. Units are pixels. 1136 * Set the width/height of the vt window in characters. Units are pixels.
… …
1183{ 1141{
1184 XWindowAttributes wattr; 1142 XWindowAttributes wattr;
1185 1143
1186 if (newwidth == 0 || newheight == 0) 1144 if (newwidth == 0 || newheight == 0)
1187 { 1145 {
1188 XGetWindowAttributes (display->display, display->root, &wattr); 1146 XGetWindowAttributes (dpy, display->root, &wattr);
1189 1147
1190 if (newwidth == 0) 1148 if (newwidth == 0)
1191 newwidth = wattr.width - szHint.base_width; 1149 newwidth = wattr.width - szHint.base_width;
1192 if (newheight == 0) 1150 if (newheight == 0)
1193 newheight = wattr.height - szHint.base_height; 1151 newheight = wattr.height - szHint.base_height;
… …
1207#ifdef USE_XIM 1165#ifdef USE_XIM
1208 1166
1209void 1167void
1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1168rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1211{ 1169{
1212 fg = pix_colors[Color_fg]; 1170 fg = pix_colors [Color_fg];
1213 bg = pix_colors[Color_bg]; 1171 bg = pix_colors [Color_bg];
1214} 1172}
1215 1173
1216void 1174void
1217rxvt_term::im_set_size (XRectangle &size) 1175rxvt_term::im_set_size (XRectangle &size)
1218{ 1176{
… …
1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1213 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1256 1214
1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1215 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1258 *p = '\0'; 1216 *p = '\0';
1259 1217
1260 atom = XInternAtom (display->display, server, False); 1218 atom = XInternAtom (dpy, server, False);
1261 win = XGetSelectionOwner (display->display, atom); 1219 win = XGetSelectionOwner (dpy, atom);
1262 1220
1263 if (win != None) 1221 if (win != None)
1264 return True; 1222 return True;
1265 } 1223 }
1266 1224
… …
1273 XPoint nspot; 1231 XPoint nspot;
1274 XVaNestedList preedit_attr; 1232 XVaNestedList preedit_attr;
1275 1233
1276 if (!Input_Context 1234 if (!Input_Context
1277 || !focus 1235 || !focus
1278 || !(input_style & XIMPreeditPosition)) 1236 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1279 return; 1237 return;
1280 1238
1281 im_set_position (nspot); 1239 im_set_position (nspot);
1282 1240
1283 if (nspot.x == spot.x && nspot.y == spot.y) 1241 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1302 input_method = 0; 1260 input_method = 0;
1303 } 1261 }
1304 1262
1305 Input_Context = 0; 1263 Input_Context = 0;
1306} 1264}
1265
1266#ifdef ENABLE_XIM_ONTHESPOT
1267
1268static void
1269xim_preedit_start (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_START, DT_END));
1273}
1274
1275static void
1276xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1277{
1278 ((rxvt_term *)client_data)->make_current ();
1279 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1280}
1281
1282static void
1283xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1284{
1285 rxvt_term *term = (rxvt_term *)client_data;
1286 XIMText *text = call_data->text;
1287
1288 term->make_current ();
1289
1290 if (text)
1291 {
1292 void *str;
1293
1294 if (!text->encoding_is_wchar && text->string.multi_byte)
1295 {
1296 // of course, X makes it ugly again
1297 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->rs[Rs_imLocale]);
1299
1300 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1301 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1302
1303 if (term->rs[Rs_imLocale])
1304 SET_LOCALE (term->locale);
1305 }
1306 else
1307 str = (void *)text->string.wide_char;
1308
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_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1314 DT_WCS_LEN, str, str ? (int)text->length : 0,
1315 DT_END));
1316 }
1317 else
1318 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1319 DT_INT, call_data->caret,
1320 DT_INT, call_data->chg_first,
1321 DT_INT, call_data->chg_length,
1322 DT_END));
1323}
1324
1325#if 0
1326static void
1327xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1328{
1329 ((rxvt_term *)client_data)->make_current ();
1330 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1331 DT_INT, call_data->position,
1332 DT_INT, call_data->direction,
1333 DT_INT, call_data->style,
1334 DT_END));
1335}
1336#endif
1337
1338#endif
1307 1339
1308/* 1340/*
1309 * Try to open a XIM with the current modifiers, then see if we can 1341 * Try to open a XIM with the current modifiers, then see if we can
1310 * open a suitable preedit type 1342 * open a suitable preedit type
1311 */ 1343 */
… …
1318 XRectangle rect, status_rect, needed_rect; 1350 XRectangle rect, status_rect, needed_rect;
1319 unsigned long fg, bg; 1351 unsigned long fg, bg;
1320 const char *p; 1352 const char *p;
1321 char **s; 1353 char **s;
1322 XIMStyles *xim_styles; 1354 XIMStyles *xim_styles;
1355#ifdef ENABLE_XIM_ONTHESPOT
1356 XIMCallback xcb[4];
1357#endif
1323 1358
1324 set_environ (envv); 1359 set_environ (envv);
1325 1360
1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1361 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1327 return false; 1362 return false;
1328 1363
1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1330 input_method = display->get_xim (locale, modifiers); 1364 input_method = display->get_xim (locale, modifiers);
1331 if (input_method == NULL) 1365 if (input_method == NULL)
1332 return false; 1366 return false;
1333 1367
1334 xim = input_method->xim; 1368 xim = input_method->xim;
… …
1354 s = rxvt_splitcommastring (p); 1388 s = rxvt_splitcommastring (p);
1355 1389
1356 for (i = found = 0; !found && s[i]; i++) 1390 for (i = found = 0; !found && s[i]; i++)
1357 { 1391 {
1358 if (!strcmp (s[i], "OverTheSpot")) 1392 if (!strcmp (s[i], "OverTheSpot"))
1359 input_style = (XIMPreeditPosition | XIMStatusNothing); 1393 input_style = XIMPreeditPosition | XIMStatusNothing;
1360 else if (!strcmp (s[i], "OffTheSpot")) 1394 else if (!strcmp (s[i], "OffTheSpot"))
1361 input_style = (XIMPreeditArea | XIMStatusArea); 1395 input_style = XIMPreeditArea | XIMStatusArea;
1362 else if (!strcmp (s[i], "Root")) 1396 else if (!strcmp (s[i], "Root"))
1363 input_style = (XIMPreeditNothing | XIMStatusNothing); 1397 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 else if (!strcmp (s[i], "None")) 1398 else if (!strcmp (s[i], "None"))
1365 input_style = (XIMPreeditNone | XIMStatusNone); 1399 input_style = XIMPreeditNone | XIMStatusNone;
1400#ifdef ENABLE_XIM_ONTHESPOT
1401 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1402 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1403#endif
1404 else
1405 input_style = XIMPreeditNothing | XIMStatusNothing;
1366 1406
1367 for (j = 0; j < xim_styles->count_styles; j++) 1407 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1408 if (input_style == xim_styles->supported_styles[j])
1369 { 1409 {
1370 rxvt_freecommastring (s); 1410 rxvt_freecommastring (s);
… …
1408 "*", 1448 "*",
1409 fheight, 1449 fheight,
1410 fheight + 1, fheight - 1, 1450 fheight + 1, fheight - 1,
1411 fheight - 2, fheight + 2); 1451 fheight - 2, fheight + 2);
1412 1452
1413 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1453 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1414 &missing_charset_list, &missing_charset_count, &def_string); 1454 &missing_charset_list, &missing_charset_count, &def_string);
1415 1455
1416 if (missing_charset_list) 1456 if (missing_charset_list)
1417 XFreeStringList (missing_charset_list); 1457 XFreeStringList (missing_charset_list);
1418 1458
… …
1459 XNBackground, bg, 1499 XNBackground, bg,
1460 XNArea, &status_rect, 1500 XNArea, &status_rect,
1461 XNFontSet, fs, 1501 XNFontSet, fs,
1462 NULL); 1502 NULL);
1463 } 1503 }
1504#if ENABLE_XIM_ONTHESPOT
1505 else if (input_style & XIMPreeditCallbacks)
1506 {
1507 im_set_position (spot);
1508
1509 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1510 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1511 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1512# if 0
1513 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1514# endif
1515
1516 preedit_attr = XVaCreateNestedList (0,
1517 XNSpotLocation, &spot,
1518 XNPreeditStartCallback, &xcb[0],
1519 XNPreeditDoneCallback , &xcb[1],
1520 XNPreeditDrawCallback , &xcb[2],
1521# if 0
1522 XNPreeditCaretCallback, &xcb[3],
1523# endif
1524 NULL);
1525 }
1526#endif
1464 1527
1465 Input_Context = XCreateIC (xim, 1528 Input_Context = XCreateIC (xim,
1466 XNInputStyle, input_style, 1529 XNInputStyle, input_style,
1467 XNClientWindow, vt, 1530 XNClientWindow, vt,
1468 XNFocusWindow, parent[0], 1531 XNFocusWindow, parent[0],
… …
1470 preedit_attr, 1533 preedit_attr,
1471 status_attr ? XNStatusAttributes : NULL, 1534 status_attr ? XNStatusAttributes : NULL,
1472 status_attr, NULL); 1535 status_attr, NULL);
1473 1536
1474 if (preedit_attr) XFree (preedit_attr); 1537 if (preedit_attr) XFree (preedit_attr);
1475 if (status_attr) XFree (status_attr); 1538 if (status_attr) XFree (status_attr);
1476 if (fs) XFreeFontSet (display->display, fs); 1539 if (fs) XFreeFontSet (dpy, fs);
1477 1540
1478 if (Input_Context == NULL) 1541 if (Input_Context == NULL)
1479 { 1542 {
1480 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1543 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1481 im_destroy (); 1544 im_destroy ();
1482 return false; 1545 return false;
1483 } 1546 }
1484 1547
1485 if (input_style & XIMPreeditArea) 1548#if 0
1549 // unfortunately, only the focus window is used by XIM, hard to fix
1550 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1551 vt_select_input ();
1552#endif
1553
1486 IMSetStatusPosition (); 1554 IMSetPosition ();
1487 1555
1488 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1489 return true; 1556 return true;
1490} 1557}
1491 1558
1492void 1559void
1493rxvt_term::im_cb () 1560rxvt_term::im_cb ()
… …
1499 1566
1500 make_current (); 1567 make_current ();
1501 1568
1502 im_destroy (); 1569 im_destroy ();
1503 1570
1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1505 if (Input_Context) 1571 if (Input_Context)
1506 return; 1572 return;
1507 1573
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
… …
1551 SET_LOCALE (locale); 1617 SET_LOCALE (locale);
1552#endif 1618#endif
1553} 1619}
1554 1620
1555void 1621void
1556rxvt_term::IMSetStatusPosition () 1622rxvt_term::IMSetPosition ()
1557{ 1623{
1558 XRectangle preedit_rect, status_rect, *needed_rect; 1624 XRectangle preedit_rect, status_rect, *needed_rect;
1559 XVaNestedList preedit_attr, status_attr; 1625 XVaNestedList preedit_attr, status_attr;
1560 1626
1561 if (!Input_Context 1627 if (!Input_Context
1562 || !focus 1628 || !focus
1563 || !(input_style & XIMPreeditArea) 1629 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1564 || !IMisRunning ()) 1630 || !IMisRunning ())
1565 return; 1631 return;
1566 1632
1633 if (input_style & XIMPreeditPosition)
1634 {
1635 im_set_size (preedit_rect);
1636 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1637
1638 XSetICValues (Input_Context,
1639 XNPreeditAttributes, preedit_attr, NULL);
1640 }
1641 else
1642 {
1567 /* Getting the necessary width of preedit area */ 1643 /* Getting the necessary width of preedit area */
1568 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1644 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1569 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1645 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1570 XFree (status_attr); 1646 XFree (status_attr);
1571 1647
1572 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1648 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1573 XFree (needed_rect); 1649 XFree (needed_rect);
1574 1650
1575 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1651 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1576 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1652 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1577 1653
1578 XSetICValues (Input_Context, 1654 XSetICValues (Input_Context,
1579 XNPreeditAttributes, preedit_attr, 1655 XNPreeditAttributes, preedit_attr,
1580 XNStatusAttributes, status_attr, NULL); 1656 XNStatusAttributes, status_attr,
1657 NULL);
1581 1658
1659 XFree (status_attr);
1660 }
1661
1582 XFree (preedit_attr); 1662 XFree (preedit_attr);
1583 XFree (status_attr);
1584} 1663}
1585#endif /* USE_XIM */ 1664#endif /* USE_XIM */
1586 1665
1587/*----------------------- end-of-file (C source) -----------------------*/ 1666/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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