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

Diff Legend

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