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

Diff Legend

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