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.205 by root, Wed Jan 25 13:24:45 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
… …
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++)
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
261 delete pix_colors_focused; 275 delete pix_colors_focused;
262#if OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 277 delete pix_colors_unfocused;
264#endif 278#endif
265 279
… …
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}
… …
475 489
476 pty = ptytty::create (); 490 pty = ptytty::create ();
477 491
478 create_windows (argc, argv); 492 create_windows (argc, argv);
479 493
480 dDisp;
481
482 init_xlocale (); 494 init_xlocale ();
483 495
484 scr_reset (); // initialize screen 496 scr_reset (); // initialize screen
485 497
486#if 0 498#if 0
487 XSynchronize (disp, True); 499 XSynchronize (dpy, True);
488#endif 500#endif
489 501
490#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar)) 503 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
493#endif 505#endif
494#ifdef TRANSPARENT 506#ifdef TRANSPARENT
495 if (OPTION (Opt_transparent)) 507 if (OPTION (Opt_transparent))
496 { 508 {
497 XSelectInput (disp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
498 check_our_parents (); 510 check_our_parents ();
499 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
500 } 512 }
501#endif 513#endif
514#if ENABLE_PERL
515 rootwin_ev.start (display, display->root);
516#endif
502 517
503 set_colorfgbg (); 518 set_colorfgbg ();
504 519
505 init_command (cmd_argv); 520 init_command (cmd_argv);
506 521
… …
516#if ENABLE_XEMBED 531#if ENABLE_XEMBED
517 if (rs[Rs_embed]) 532 if (rs[Rs_embed])
518 { 533 {
519 long info[2] = { 0, XEMBED_MAPPED }; 534 long info[2] = { 0, XEMBED_MAPPED };
520 535
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 536 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2); 537 32, PropModeReplace, (unsigned char *)&info, 2);
523 } 538 }
524#endif 539#endif
525 540
526 XMapWindow (disp, vt); 541 XMapWindow (dpy, vt);
527 XMapWindow (disp, parent[0]); 542 XMapWindow (dpy, parent[0]);
528 543
529 return true; 544 return true;
530} 545}
531 546
532static struct sig_handlers 547static struct sig_handlers
… …
622{ 637{
623 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 639 int x, y, sb_w, flags;
625 unsigned int w, h; 640 unsigned int w, h;
626 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
627 dDisp;
628 642
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 646
… …
694 708
695 if (scrollBar.state) 709 if (scrollBar.state)
696 { 710 {
697 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
698 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
699 if (!OPTION (Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
700 window_vt_x += sb_w; 715 window_vt_x += sb_w;
701 } 716 }
702 717
703 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
707 722
708 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 724 {
710 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
729 744
730 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
732 747
733 if (recalc_x) 748 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750
735 if (recalc_y) 751 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 753
738 ncol = width / fwidth; 754 ncol = width / fwidth;
739 nrow = height / fheight; 755 nrow = height / fheight;
740} 756}
741 757
… …
844 return true; 860 return true;
845} 861}
846 862
847void 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)
848{ 864{
849 XChangeProperty (display->display, parent[0], 865 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 866 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 867 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 868}
853 869
854void 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)
855{ 871{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 872 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 873 char *s = rxvt_wcstoutf8 (ws);
858 874
859 XChangeProperty (display->display, parent[0], 875 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 876 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 877 (const unsigned char *)s, strlen (s));
862 878
863 free (s); 879 free (s);
864 free (ws); 880 free (ws);
… …
889void 905void
890rxvt_term::set_window_color (int idx, const char *color) 906rxvt_term::set_window_color (int idx, const char *color)
891{ 907{
892 rxvt_color xcol; 908 rxvt_color xcol;
893 int i; 909 int i;
894 910
895 if (color == NULL || *color == '\0') 911 if (color == NULL || *color == '\0')
896 return; 912 return;
913
914 color = strdup (color);
915 allocated.push_back ((void *)color);
916 rs[Rs_color + idx] = color;
897 917
898 /* handle color aliases */ 918 /* handle color aliases */
899 if (isdigit (*color)) 919 if (isdigit (*color))
900 { 920 {
901 i = atoi (color); 921 i = atoi (color);
902 922
903 if (i >= 8 && i <= 15) 923 if (i >= 8 && i <= 15)
904 { /* bright colors */ 924 { /* bright colors */
905 i -= 8; 925 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 926 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 927 goto done;
909 } 928 }
910 929
911 if (i >= 0 && i <= 7) 930 if (i >= 0 && i <= 7)
912 { /* normal colors */ 931 { /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 932 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 933 goto done;
916 } 934 }
917 } 935 }
918 936
919 if (!rXParseAllocColor (&xcol, color)) 937 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 938
924 /* 939 /*
925 * 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,
926 * so just keep gobbling up the colormap 941 * so just keep gobbling up the colormap
927 */ 942 */
928# if 0
929 for (i = Color_Black; i <= Color_White; i++)
930 if (pix_colors[idx] == pix_colors[i])
931 break;
932 if (i > Color_White)
933 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen));
937 }
938# endif
939 943
940 pix_colors_focused[idx] = xcol; 944 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 945
943 /* XSetWindowAttributes attr; */ 946 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */ 947 /* Cursor cursor; */
945done: 948done:
946
947#if OFF_FOCUS_FADING
948 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950#endif
951
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 949 /*TODO: handle Color_BD, scrollbar background, etc. */
953 950
951 update_fade_color (idx);
954 recolour_cursor (); 952 recolour_cursor ();
955 scr_recolour (); 953 scr_recolour ();
956} 954}
957 955
958#else 956#else
… …
960#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
961 959
962void 960void
963rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
964{ 962{
965 XColor xcol[2]; 963 XColor fg, bg;
966 964
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
973 972
974 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 974}
977 975
978/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
979/* 977/*
980 * 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
… …
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 1007}
1010 1008
1011/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1012 1010
1013int 1011bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 1013{
1016 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1017 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false;
1020 }
1021
1022 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]);
1023} 1025}
1024 1026
1025/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
… …
1029rxvt_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)
1030{ 1032{
1031 int fix_screen; 1033 int fix_screen;
1032 int old_width = szHint.width; 1034 int old_width = szHint.width;
1033 int old_height = szHint.height; 1035 int old_height = szHint.height;
1034 dDisp;
1035 1036
1036 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)))
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1038 1041
1039 if (!ignoreparent) 1042 if (!ignoreparent)
1040 { 1043 {
1041#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1042 /* 1045 /*
… …
1046 int x, y, x1, y1; 1049 int x, y, x1, y1;
1047 int dx, dy; 1050 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1052 Window unused_cr;
1050 1053
1051 XTranslateCoordinates (disp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1058 /*
1056 * 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
1057 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1058 */ 1061 */
… …
1060 { 1063 {
1061 x -= x1; 1064 x -= x1;
1062 y -= y1; 1065 y -= y1;
1063 } 1066 }
1064 1067
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1069 1072
1070 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1076 dy = 0; 1079 dy = 0;
1077 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1078 dy /= 2; 1081 dy /= 2;
1079 1082
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1082#else 1085#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 1087#endif
1085 } 1088 }
1086 1089
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1091
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1093 {
1091 if (scrollBar.state) 1094 if (scrollBar.state)
1092 { 1095 {
1093 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1094 window_sb_x, 0, 1097 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1099 resize_scrollbar ();
1097 } 1100 }
1098 1101
1099 XMoveResizeWindow (disp, vt, 1102 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1101 width, height); 1104 width, height);
1102 1105
1103 scr_clear (); 1106 scr_clear ();
1104#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
… …
1107 } 1110 }
1108 1111
1109 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1110 scr_reset (); 1113 scr_reset ();
1111 1114
1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 //scr_touch (false);
1117
1112#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1113 if (pixmap) 1119 if (pixmap)
1114 scr_touch (false); 1120 scr_touch (false);
1115#endif 1121#endif
1116 1122
1117#ifdef USE_XIM 1123#ifdef USE_XIM
1118 IMSetStatusPosition (); 1124 IMSetPosition ();
1119#endif 1125#endif
1120} 1126}
1121 1127
1122/* 1128/*
1123 * 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.
… …
1128{ 1134{
1129 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1130 1136
1131 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1132 { 1138 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1140
1135 if (newwidth == 0) 1141 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1143 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1158#ifdef USE_XIM
1153 1159
1154void 1160void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1162{
1157 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1159} 1165}
1160 1166
1161void 1167void
1162rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1163{ 1169{
… …
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1201 1207
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203 *p = '\0'; 1209 *p = '\0';
1204 1210
1205 atom = XInternAtom (display->display, server, False); 1211 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1207 1213
1208 if (win != None) 1214 if (win != None)
1209 return True; 1215 return True;
1210 } 1216 }
1211 1217
… …
1435 "*", 1441 "*",
1436 fheight, 1442 fheight,
1437 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1439 1445
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1442 1448
1443 if (missing_charset_list) 1449 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1445 1451
… …
1520 preedit_attr, 1526 preedit_attr,
1521 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1522 status_attr, NULL); 1528 status_attr, NULL);
1523 1529
1524 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1525 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1526 if (fs) XFreeFontSet (display->display, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1527 1533
1528 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1529 { 1535 {
1530 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1531 im_destroy (); 1537 im_destroy ();
… …
1536 // unfortunately, only the focus window is used by XIM, hard to fix 1542 // unfortunately, only the focus window is used by XIM, hard to fix
1537 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1538 vt_select_input (); 1544 vt_select_input ();
1539#endif 1545#endif
1540 1546
1541 if (input_style & XIMPreeditArea)
1542 IMSetStatusPosition (); 1547 IMSetPosition ();
1543 1548
1544 return true; 1549 return true;
1545} 1550}
1546 1551
1547void 1552void
… …
1605 SET_LOCALE (locale); 1610 SET_LOCALE (locale);
1606#endif 1611#endif
1607} 1612}
1608 1613
1609void 1614void
1610rxvt_term::IMSetStatusPosition () 1615rxvt_term::IMSetPosition ()
1611{ 1616{
1612 XRectangle preedit_rect, status_rect, *needed_rect; 1617 XRectangle preedit_rect, status_rect, *needed_rect;
1613 XVaNestedList preedit_attr, status_attr; 1618 XVaNestedList preedit_attr, status_attr;
1614 1619
1615 if (!Input_Context 1620 if (!Input_Context
1616 || !focus 1621 || !focus
1617 || !(input_style & XIMPreeditArea) 1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1618 || !IMisRunning ()) 1623 || !IMisRunning ())
1619 return; 1624 return;
1620 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 {
1621 /* Getting the necessary width of preedit area */ 1636 /* Getting the necessary width of preedit area */
1622 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1637 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1623 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1638 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1624 XFree (status_attr); 1639 XFree (status_attr);
1625 1640
1626 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1641 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1627 XFree (needed_rect); 1642 XFree (needed_rect);
1628 1643
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1644 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1645 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1631 1646
1632 XSetICValues (Input_Context, 1647 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, 1648 XNPreeditAttributes, preedit_attr,
1634 XNStatusAttributes, status_attr, NULL); 1649 XNStatusAttributes, status_attr,
1650 NULL);
1635 1651
1652 XFree (status_attr);
1653 }
1654
1636 XFree (preedit_attr); 1655 XFree (preedit_attr);
1637 XFree (status_attr);
1638} 1656}
1639#endif /* USE_XIM */ 1657#endif /* USE_XIM */
1640 1658
1641/*----------------------- end-of-file (C source) -----------------------*/ 1659/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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