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.192 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.227 by root, Fri Jul 28 17:16:42 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 len = strlen (locale) + 1;
62
63 if (len > 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, len))
62 return false; 67 return false;
63 68
64 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, len);
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 ())
… …
469#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
470 if (OPTION (Opt_scrollBar)) 486 if (OPTION (Opt_scrollBar))
471 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
472#endif 488#endif
473 489
474 pty = rxvt_new_ptytty (); 490 pty = ptytty::create ();
475 491
476 create_windows (argc, argv); 492 create_windows (argc, argv);
477 493
478 dDisp;
479
480 init_xlocale (); 494 init_xlocale ();
481 495
482 scr_reset (); // initialize screen 496 scr_reset (); // initialize screen
483 497
484#if 0 498#if 0
485 XSynchronize (disp, True); 499 XSynchronize (dpy, True);
486#endif 500#endif
487 501
488#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 503 if (OPTION (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
491#endif 505#endif
492#ifdef TRANSPARENT 506#ifdef TRANSPARENT
493 if (OPTION (Opt_transparent)) 507 if (OPTION (Opt_transparent))
494 { 508 {
495 XSelectInput (disp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents (); 510 check_our_parents ();
497 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
498 } 512 }
499#endif 513#endif
514#if ENABLE_PERL
515 rootwin_ev.start (display, display->root);
516#endif
500 517
501 set_colorfgbg (); 518 set_colorfgbg ();
502 519
503 init_command (cmd_argv); 520 init_command (cmd_argv);
504 521
… …
509 526
510 check_ev.start (); 527 check_ev.start ();
511 528
512 HOOK_INVOKE ((this, HOOK_START, DT_END)); 529 HOOK_INVOKE ((this, HOOK_START, DT_END));
513 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
514 XMapWindow (disp, vt); 541 XMapWindow (dpy, vt);
515 XMapWindow (disp, parent[0]); 542 XMapWindow (dpy, parent[0]);
516 543
517 return true; 544 return true;
518} 545}
519 546
520static struct sig_handlers 547static struct sig_handlers
… …
525 * Catch a fatal signal and tidy up before quitting 552 * Catch a fatal signal and tidy up before quitting
526 */ 553 */
527 void 554 void
528 sig_term (sig_watcher &w) 555 sig_term (sig_watcher &w)
529 { 556 {
530#ifdef DEBUG_CMD
531 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
532#endif
533 rxvt_emergency_cleanup (); 557 rxvt_emergency_cleanup ();
534 signal (w.signum, SIG_DFL); 558 signal (w.signum, SIG_DFL);
535 kill (getpid (), w.signum); 559 kill (getpid (), w.signum);
536 } 560 }
537 561
… …
545char **rxvt_environ; // startup environment 569char **rxvt_environ; // startup environment
546 570
547void 571void
548rxvt_init () 572rxvt_init ()
549{ 573{
550 uid_t uid = getuid (); 574 ptytty::init ();
551 gid_t gid = getgid ();
552
553 // before doing anything else, check for setuid/setgid operation,
554 // start the helper process and drop privileges
555 if (uid != geteuid ()
556 || gid != getegid ())
557 {
558#if PTYTTY_HELPER
559 rxvt_ptytty_server ();
560#else
561 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
562#endif
563
564 // drop privileges
565#if HAVE_SETRESUID
566 setresgid (gid, gid, gid);
567 setresuid (uid, uid, uid);
568#elif HAVE_SETREUID
569 setregid (gid, gid);
570 setreuid (uid, uid);
571#elif HAVE_SETUID
572 setgid (gid);
573 setuid (uid);
574#endif
575
576 if (uid != geteuid ()
577 || gid != getegid ())
578 rxvt_fatal ("unable to drop privileges, aborting.\n");
579 }
580 575
581 rxvt_environ = environ; 576 rxvt_environ = environ;
582 577
583 signal (SIGHUP, SIG_IGN); 578 signal (SIGHUP, SIG_IGN);
584 signal (SIGPIPE, SIG_IGN); 579 signal (SIGPIPE, SIG_IGN);
… …
642{ 637{
643 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
644 int x, y, sb_w, flags; 639 int x, y, sb_w, flags;
645 unsigned int w, h; 640 unsigned int w, h;
646 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
647 dDisp;
648
649 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
650 ncol, nrow, szHint.width, szHint.height));
651 642
652 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
653 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
654 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
655 646
… …
717 708
718 if (scrollBar.state) 709 if (scrollBar.state)
719 { 710 {
720 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
721 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
722 if (!OPTION (Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
723 window_vt_x += sb_w; 715 window_vt_x += sb_w;
724 } 716 }
725 717
726 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
727 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
730 722
731 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 724 {
733 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
752 744
753 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
755 747
756 if (recalc_x) 748 if (recalc_x)
757 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750
758 if (recalc_y) 751 if (recalc_y)
759 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
760 753
761 ncol = width / fwidth; 754 ncol = width / fwidth;
762 nrow = height / fheight; 755 nrow = height / fheight;
763 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
764 ncol, nrow, szHint.width,
765 szHint.height));
766 return;
767} 756}
768 757
769/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
770/* 759/*
771 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
… …
871 return true; 860 return true;
872} 861}
873 862
874void 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)
875{ 864{
876 XChangeProperty (display->display, parent[0], 865 XChangeProperty (dpy, parent[0],
877 prop, XA_STRING, 8, PropModeReplace, 866 prop, XA_STRING, 8, PropModeReplace,
878 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 867 (const unsigned char *)str, len >= 0 ? len : strlen (str));
879} 868}
880 869
881void 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)
882{ 871{
883 wchar_t *ws = rxvt_mbstowcs (str, len); 872 wchar_t *ws = rxvt_mbstowcs (str, len);
884 char *s = rxvt_wcstoutf8 (ws); 873 char *s = rxvt_wcstoutf8 (ws);
885 874
886 XChangeProperty (display->display, parent[0], 875 XChangeProperty (dpy, parent[0],
887 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 876 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
888 (const unsigned char *)s, strlen (s)); 877 (const unsigned char *)s, strlen (s));
889 878
890 free (s); 879 free (s);
891 free (ws); 880 free (ws);
… …
916void 905void
917rxvt_term::set_window_color (int idx, const char *color) 906rxvt_term::set_window_color (int idx, const char *color)
918{ 907{
919 rxvt_color xcol; 908 rxvt_color xcol;
920 int i; 909 int i;
921 910
922 if (color == NULL || *color == '\0') 911 if (color == NULL || *color == '\0')
923 return; 912 return;
913
914 color = strdup (color);
915 allocated.push_back ((void *)color);
916 rs[Rs_color + idx] = color;
924 917
925 /* handle color aliases */ 918 /* handle color aliases */
926 if (isdigit (*color)) 919 if (isdigit (*color))
927 { 920 {
928 i = atoi (color); 921 i = atoi (color);
929 922
930 if (i >= 8 && i <= 15) 923 if (i >= 8 && i <= 15)
931 { /* bright colors */ 924 { /* bright colors */
932 i -= 8; 925 i -= 8;
933 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 926 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
934 SET_PIXCOLOR (idx);
935 goto done; 927 goto done;
936 } 928 }
937 929
938 if (i >= 0 && i <= 7) 930 if (i >= 0 && i <= 7)
939 { /* normal colors */ 931 { /* normal colors */
940 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 932 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
941 SET_PIXCOLOR (idx);
942 goto done; 933 goto done;
943 } 934 }
944 } 935 }
945 936
946 if (!rXParseAllocColor (&xcol, color)) 937 set_color (xcol, color);
947 return;
948
949 /* XStoreColor (display->display, display->cmap, XColor*); */
950 938
951 /* 939 /*
952 * 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,
953 * so just keep gobbling up the colormap 941 * so just keep gobbling up the colormap
954 */ 942 */
955# if 0
956 for (i = Color_Black; i <= Color_White; i++)
957 if (pix_colors[idx] == pix_colors[i])
958 break;
959 if (i > Color_White)
960 {
961 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
962 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
963 DisplayPlanes (display->display, display->screen));
964 }
965# endif
966 943
967 pix_colors_focused[idx] = xcol; 944 pix_colors_focused[idx] = xcol;
968 SET_PIXCOLOR (idx);
969 945
970 /* XSetWindowAttributes attr; */ 946 /* XSetWindowAttributes attr; */
971 /* Cursor cursor; */ 947 /* Cursor cursor; */
972done: 948done:
973
974#if OFF_FOCUS_FADING
975 if (rs[Rs_fade])
976 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
977#endif
978
979 /*TODO: handle Color_BD, scrollbar background, etc. */ 949 /*TODO: handle Color_BD, scrollbar background, etc. */
980 950
951 update_fade_color (idx);
981 recolour_cursor (); 952 recolour_cursor ();
982 scr_recolour (); 953 scr_recolour ();
983} 954}
984 955
985#else 956#else
… …
987#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
988 959
989void 960void
990rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
991{ 962{
992 XColor xcol[2]; 963 XColor fg, bg;
993 964
994 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
995 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
996 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
997 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
998 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
999 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1000 972
1001 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1002 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1003} 974}
1004 975
1005/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1006/* 977/*
1007 * 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
… …
1011{ 982{
1012 unsigned int i; 983 unsigned int i;
1013 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1014 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1015 986
1016 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1017 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1018 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1019 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1020 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1021 { 991 {
… …
1036 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1037} 1007}
1038 1008
1039/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1040 1010
1041int 1011bool
1042rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1043{ 1013{
1044 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1045 {
1046 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1047 return false;
1048 }
1049
1050 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]);
1051} 1025}
1052 1026
1053/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1054 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1055 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1056void 1030void
1057rxvt_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)
1058{ 1032{
1059 int fix_screen; 1033 int fix_screen;
1060 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1061 dDisp; 1035 int old_height = szHint.height;
1062 1036
1063 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)))
1064 XSetWMNormalHints (disp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1065 1041
1066 if (!ignoreparent) 1042 if (!ignoreparent)
1067 { 1043 {
1068#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1069 /* 1045 /*
… …
1073 int x, y, x1, y1; 1049 int x, y, x1, y1;
1074 int dx, dy; 1050 int dx, dy;
1075 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1076 Window unused_cr; 1052 Window unused_cr;
1077 1053
1078 XTranslateCoordinates (disp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1079 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1080 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1081 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1082 /* 1058 /*
1083 * 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
1084 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1085 */ 1061 */
… …
1087 { 1063 {
1088 x -= x1; 1064 x -= x1;
1089 y -= y1; 1065 y -= y1;
1090 } 1066 }
1091 1067
1092 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1093 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1094 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1095 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1096 1072
1097 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1098 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
1099 dx = 0; 1075 dx = 0;
… …
1102 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1103 dy = 0; 1079 dy = 0;
1104 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1105 dy /= 2; 1081 dy /= 2;
1106 1082
1107 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1108 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1109#else 1085#else
1110 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1111#endif 1087#endif
1112 } 1088 }
1113 1089
1114 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1115 1091
1116 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1117 { 1093 {
1118 if (scrollBar.state) 1094 if (scrollBar.state)
1119 { 1095 {
1120 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1121 window_sb_x, 0, 1097 window_sb_x, 0,
1122 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1123 resize_scrollbar (); 1099 resize_scrollbar ();
1124 } 1100 }
1125 1101
1126 XMoveResizeWindow (disp, vt, 1102 XMoveResizeWindow (dpy, vt,
1127 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1128 width, height); 1104 width, height);
1129 1105
1130 scr_clear (); 1106 scr_clear ();
1131#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1132 resize_pixmap (); 1108 resize_pixmap ();
1133#endif 1109#endif
1134 } 1110 }
1135 1111
1136 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1137 {
1138 int curr_screen = -1;
1139 int old_ncol = prev_ncol;
1140
1141 /* scr_reset only works on the primary screen */
1142 if (old_height) /* this is not the first time through */
1143 {
1144 unsigned int ocol = ncol;
1145 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1146 curr_screen = scr_change_screen (PRIMARY);
1147 ncol = ocol;
1148 }
1149
1150 scr_reset (); 1113 scr_reset ();
1151 1114
1152 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
1153 { 1116 //scr_touch (false);
1154 scr_change_screen (curr_screen);
1155 selection_check (old_ncol != ncol ? 4 : 0);
1156 }
1157 }
1158
1159 old_width = szHint.width;
1160 old_height = szHint.height;
1161 1117
1162#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1163 if (pixmap) 1119 if (pixmap)
1164 scr_touch (false); 1120 scr_touch (false);
1165#endif 1121#endif
1166 1122
1167#ifdef USE_XIM 1123#ifdef USE_XIM
1168 IMSetStatusPosition (); 1124 IMSetPosition ();
1169#endif 1125#endif
1170} 1126}
1171 1127
1172/* 1128/*
1173 * 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.
… …
1178{ 1134{
1179 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1180 1136
1181 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1182 { 1138 {
1183 XGetWindowAttributes (display->display, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1184 1140
1185 if (newwidth == 0) 1141 if (newwidth == 0)
1186 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1187 if (newheight == 0) 1143 if (newheight == 0)
1188 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1202#ifdef USE_XIM 1158#ifdef USE_XIM
1203 1159
1204void 1160void
1205rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1206{ 1162{
1207 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1208 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1209} 1165}
1210 1166
1211void 1167void
1212rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1213{ 1169{
… …
1250 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1251 1207
1252 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1253 *p = '\0'; 1209 *p = '\0';
1254 1210
1255 atom = XInternAtom (display->display, server, False); 1211 atom = XInternAtom (dpy, server, False);
1256 win = XGetSelectionOwner (display->display, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1257 1213
1258 if (win != None) 1214 if (win != None)
1259 return True; 1215 return True;
1260 } 1216 }
1261 1217
… …
1268 XPoint nspot; 1224 XPoint nspot;
1269 XVaNestedList preedit_attr; 1225 XVaNestedList preedit_attr;
1270 1226
1271 if (!Input_Context 1227 if (!Input_Context
1272 || !focus 1228 || !focus
1273 || !(input_style & XIMPreeditPosition)) 1229 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1274 return; 1230 return;
1275 1231
1276 im_set_position (nspot); 1232 im_set_position (nspot);
1277 1233
1278 if (nspot.x == spot.x && nspot.y == spot.y) 1234 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1297 input_method = 0; 1253 input_method = 0;
1298 } 1254 }
1299 1255
1300 Input_Context = 0; 1256 Input_Context = 0;
1301} 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
1302 1332
1303/* 1333/*
1304 * 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
1305 * open a suitable preedit type 1335 * open a suitable preedit type
1306 */ 1336 */
… …
1313 XRectangle rect, status_rect, needed_rect; 1343 XRectangle rect, status_rect, needed_rect;
1314 unsigned long fg, bg; 1344 unsigned long fg, bg;
1315 const char *p; 1345 const char *p;
1316 char **s; 1346 char **s;
1317 XIMStyles *xim_styles; 1347 XIMStyles *xim_styles;
1348#ifdef ENABLE_XIM_ONTHESPOT
1349 XIMCallback xcb[4];
1350#endif
1318 1351
1319 set_environ (envv); 1352 set_environ (envv);
1320 1353
1321 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1354 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1322 return false; 1355 return false;
1323 1356
1324 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1325 input_method = display->get_xim (locale, modifiers); 1357 input_method = display->get_xim (locale, modifiers);
1326 if (input_method == NULL) 1358 if (input_method == NULL)
1327 return false; 1359 return false;
1328 1360
1329 xim = input_method->xim; 1361 xim = input_method->xim;
… …
1349 s = rxvt_splitcommastring (p); 1381 s = rxvt_splitcommastring (p);
1350 1382
1351 for (i = found = 0; !found && s[i]; i++) 1383 for (i = found = 0; !found && s[i]; i++)
1352 { 1384 {
1353 if (!strcmp (s[i], "OverTheSpot")) 1385 if (!strcmp (s[i], "OverTheSpot"))
1354 input_style = (XIMPreeditPosition | XIMStatusNothing); 1386 input_style = XIMPreeditPosition | XIMStatusNothing;
1355 else if (!strcmp (s[i], "OffTheSpot")) 1387 else if (!strcmp (s[i], "OffTheSpot"))
1356 input_style = (XIMPreeditArea | XIMStatusArea); 1388 input_style = XIMPreeditArea | XIMStatusArea;
1357 else if (!strcmp (s[i], "Root")) 1389 else if (!strcmp (s[i], "Root"))
1358 input_style = (XIMPreeditNothing | XIMStatusNothing); 1390 input_style = XIMPreeditNothing | XIMStatusNothing;
1359 else if (!strcmp (s[i], "None")) 1391 else if (!strcmp (s[i], "None"))
1360 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;
1361 1399
1362 for (j = 0; j < xim_styles->count_styles; j++) 1400 for (j = 0; j < xim_styles->count_styles; j++)
1363 if (input_style == xim_styles->supported_styles[j]) 1401 if (input_style == xim_styles->supported_styles[j])
1364 { 1402 {
1365 rxvt_freecommastring (s); 1403 rxvt_freecommastring (s);
… …
1403 "*", 1441 "*",
1404 fheight, 1442 fheight,
1405 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1406 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1407 1445
1408 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1409 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1410 1448
1411 if (missing_charset_list) 1449 if (missing_charset_list)
1412 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1413 1451
… …
1454 XNBackground, bg, 1492 XNBackground, bg,
1455 XNArea, &status_rect, 1493 XNArea, &status_rect,
1456 XNFontSet, fs, 1494 XNFontSet, fs,
1457 NULL); 1495 NULL);
1458 } 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
1459 1520
1460 Input_Context = XCreateIC (xim, 1521 Input_Context = XCreateIC (xim,
1461 XNInputStyle, input_style, 1522 XNInputStyle, input_style,
1462 XNClientWindow, vt, 1523 XNClientWindow, vt,
1463 XNFocusWindow, parent[0], 1524 XNFocusWindow, parent[0],
… …
1465 preedit_attr, 1526 preedit_attr,
1466 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1467 status_attr, NULL); 1528 status_attr, NULL);
1468 1529
1469 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1470 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1471 if (fs) XFreeFontSet (display->display, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1472 1533
1473 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1474 { 1535 {
1475 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1476 im_destroy (); 1537 im_destroy ();
1477 return false; 1538 return false;
1478 } 1539 }
1479 1540
1480 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
1481 IMSetStatusPosition (); 1547 IMSetPosition ();
1482 1548
1483 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1484 return true; 1549 return true;
1485} 1550}
1486 1551
1487void 1552void
1488rxvt_term::im_cb () 1553rxvt_term::im_cb ()
… …
1494 1559
1495 make_current (); 1560 make_current ();
1496 1561
1497 im_destroy (); 1562 im_destroy ();
1498 1563
1499 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1500 if (Input_Context) 1564 if (Input_Context)
1501 return; 1565 return;
1502 1566
1503#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1567#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1504 if (rs[Rs_imLocale]) 1568 if (rs[Rs_imLocale])
… …
1546 SET_LOCALE (locale); 1610 SET_LOCALE (locale);
1547#endif 1611#endif
1548} 1612}
1549 1613
1550void 1614void
1551rxvt_term::IMSetStatusPosition () 1615rxvt_term::IMSetPosition ()
1552{ 1616{
1553 XRectangle preedit_rect, status_rect, *needed_rect; 1617 XRectangle preedit_rect, status_rect, *needed_rect;
1554 XVaNestedList preedit_attr, status_attr; 1618 XVaNestedList preedit_attr, status_attr;
1555 1619
1556 if (!Input_Context 1620 if (!Input_Context
1557 || !focus 1621 || !focus
1558 || !(input_style & XIMPreeditArea) 1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1559 || !IMisRunning ()) 1623 || !IMisRunning ())
1560 return; 1624 return;
1561 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 {
1562 /* Getting the necessary width of preedit area */ 1636 /* Getting the necessary width of preedit area */
1563 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1637 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1564 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1638 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1565 XFree (status_attr); 1639 XFree (status_attr);
1566 1640
1567 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1641 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1568 XFree (needed_rect); 1642 XFree (needed_rect);
1569 1643
1570 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1644 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1571 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1645 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1572 1646
1573 XSetICValues (Input_Context, 1647 XSetICValues (Input_Context,
1574 XNPreeditAttributes, preedit_attr, 1648 XNPreeditAttributes, preedit_attr,
1575 XNStatusAttributes, status_attr, NULL); 1649 XNStatusAttributes, status_attr,
1650 NULL);
1576 1651
1652 XFree (status_attr);
1653 }
1654
1577 XFree (preedit_attr); 1655 XFree (preedit_attr);
1578 XFree (status_attr);
1579} 1656}
1580#endif /* USE_XIM */ 1657#endif /* USE_XIM */
1581 1658
1582/*----------------------- end-of-file (C source) -----------------------*/ 1659/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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