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.230 by root, Sun Aug 27 10:10:25 2006 UTC

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

Diff Legend

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