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.206 by root, Wed Jan 25 21:03:04 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{
… …
222 228
223#ifdef USE_XIM 229#ifdef USE_XIM
224 im_destroy (); 230 im_destroy ();
225#endif 231#endif
226#ifdef XTERM_SCROLLBAR 232#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); 233 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC); 234 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 235#endif
230#ifdef PLAIN_SCROLLBAR 236#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); 237 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 238#endif
233#ifdef NEXT_SCROLLBAR 239#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC); 240 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC); 241 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC); 242 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC); 243 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC); 244 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple); 245 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow); 246 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow); 247 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi); 248 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi); 249 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 250#endif
245#ifdef RXVT_SCROLLBAR 251#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC); 252 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC); 253 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); 254 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 255#endif
250 if (gc) XFreeGC (xdisp, gc); 256 if (gc) XFreeGC (dpy, gc);
251 257
252 delete drawable; 258 delete drawable;
253 // destroy all windows 259 // destroy all windows
254 if (parent[0]) 260 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 261 XDestroyWindow (dpy, parent[0]);
262
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 }
256 271
257 clear (); 272 clear ();
258 } 273 }
259 274
260 // TODO: free pixcolours, colours should become part of rxvt_display
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
266 displays.put (display); 280 displays.put (display);
267 281
268 scr_release (); 282 scr_release ();
… …
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}
… …
480 init_xlocale (); 494 init_xlocale ();
481 495
482 scr_reset (); // initialize screen 496 scr_reset (); // initialize screen
483 497
484#if 0 498#if 0
485 XSynchronize (xdisp, True); 499 XSynchronize (dpy, True);
486#endif 500#endif
487 501
488#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 503 if (OPTION (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
491#endif 505#endif
492#ifdef TRANSPARENT 506#ifdef TRANSPARENT
493 if (OPTION (Opt_transparent)) 507 if (OPTION (Opt_transparent))
494 { 508 {
495 XSelectInput (xdisp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents (); 510 check_our_parents ();
497 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
498 } 512 }
499#endif 513#endif
514#if ENABLE_PERL
515 rootwin_ev.start (display, display->root);
516#endif
500 517
501 set_colorfgbg (); 518 set_colorfgbg ();
502 519
503 init_command (cmd_argv); 520 init_command (cmd_argv);
504 521
… …
514#if ENABLE_XEMBED 531#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 532 if (rs[Rs_embed])
516 { 533 {
517 long info[2] = { 0, XEMBED_MAPPED }; 534 long info[2] = { 0, XEMBED_MAPPED };
518 535
519 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],
520 32, PropModeReplace, (unsigned char *)&info, 2); 537 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 538 }
522#endif 539#endif
523 540
524 XMapWindow (xdisp, vt); 541 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 542 XMapWindow (dpy, parent[0]);
526 543
527 return true; 544 return true;
528} 545}
529 546
530static struct sig_handlers 547static struct sig_handlers
… …
691 708
692 if (scrollBar.state) 709 if (scrollBar.state)
693 { 710 {
694 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
696 if (!OPTION (Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
697 window_vt_x += sb_w; 715 window_vt_x += sb_w;
698 } 716 }
699 717
700 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
704 722
705 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 724 {
707 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
726 744
727 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
729 747
730 if (recalc_x) 748 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 750
733 if (recalc_y) 751 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 753
736 ncol = width / fwidth; 754 ncol = width / fwidth;
737 nrow = height / fheight; 755 nrow = height / fheight;
738} 756}
739 757
… …
794 delete fontset[0]; 812 delete fontset[0];
795 fontset[0] = fs; 813 fontset[0] = fs;
796 814
797 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
798 prop.height += lineSpace; 816 prop.height += lineSpace;
817
799 fs->set_prop (prop); 818 fs->set_prop (prop, false);
800 819
801 fwidth = prop.width; 820 fwidth = prop.width;
802 fheight = prop.height; 821 fheight = prop.height;
803 fbase = prop.ascent; 822 fbase = prop.ascent;
804 823
… …
823 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;
824 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;
825 } 844 }
826 845
827 fs->populate (res); 846 fs->populate (res);
828 fs->set_prop (prop2); 847 fs->set_prop (prop2, true);
829 } 848 }
830#else 849#else
831 fontset[style] = fontset[0]; 850 fontset[style] = fontset[0];
832#endif 851#endif
833 } 852 }
… …
842 return true; 861 return true;
843} 862}
844 863
845void 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)
846{ 865{
847 XChangeProperty (display->display, parent[0], 866 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 867 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 868 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 869}
851 870
852void 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)
853{ 872{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 873 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 874 char *s = rxvt_wcstoutf8 (ws);
856 875
857 XChangeProperty (display->display, parent[0], 876 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 877 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 878 (const unsigned char *)s, strlen (s));
860 879
861 free (s); 880 free (s);
862 free (ws); 881 free (ws);
… …
887void 906void
888rxvt_term::set_window_color (int idx, const char *color) 907rxvt_term::set_window_color (int idx, const char *color)
889{ 908{
890 rxvt_color xcol; 909 rxvt_color xcol;
891 int i; 910 int i;
892 911
893 if (color == NULL || *color == '\0') 912 if (color == NULL || *color == '\0')
894 return; 913 return;
914
915 color = strdup (color);
916 allocated.push_back ((void *)color);
917 rs[Rs_color + idx] = color;
895 918
896 /* handle color aliases */ 919 /* handle color aliases */
897 if (isdigit (*color)) 920 if (isdigit (*color))
898 { 921 {
899 i = atoi (color); 922 i = atoi (color);
900 923
901 if (i >= 8 && i <= 15) 924 if (i >= 8 && i <= 15)
902 { /* bright colors */ 925 { /* bright colors */
903 i -= 8; 926 i -= 8;
904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 927 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
905 SET_PIXCOLOR (idx);
906 goto done; 928 goto done;
907 } 929 }
908 930
909 if (i >= 0 && i <= 7) 931 if (i >= 0 && i <= 7)
910 { /* normal colors */ 932 { /* normal colors */
911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 933 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
912 SET_PIXCOLOR (idx);
913 goto done; 934 goto done;
914 } 935 }
915 } 936 }
916 937
917 if (!rXParseAllocColor (&xcol, color)) 938 set_color (xcol, color);
918 return;
919
920 /* XStoreColor (display->display, display->cmap, XColor*); */
921 939
922 /* 940 /*
923 * 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,
924 * so just keep gobbling up the colormap 942 * so just keep gobbling up the colormap
925 */ 943 */
926# if 0
927 for (i = Color_Black; i <= Color_White; i++)
928 if (pix_colors[idx] == pix_colors[i])
929 break;
930 if (i > Color_White)
931 {
932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
933 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
934 DisplayPlanes (display->display, display->screen));
935 }
936# endif
937 944
938 pix_colors_focused[idx] = xcol; 945 pix_colors_focused[idx] = xcol;
939 SET_PIXCOLOR (idx);
940 946
941 /* XSetWindowAttributes attr; */ 947 /* XSetWindowAttributes attr; */
942 /* Cursor cursor; */ 948 /* Cursor cursor; */
943done: 949done:
944
945#if OFF_FOCUS_FADING
946 if (rs[Rs_fade])
947 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
951 951
952 update_fade_color (idx);
952 recolour_cursor (); 953 recolour_cursor ();
953 scr_recolour (); 954 scr_recolour ();
954} 955}
955 956
956#else 957#else
… …
958#endif /* XTERM_COLOR_CHANGE */ 959#endif /* XTERM_COLOR_CHANGE */
959 960
960void 961void
961rxvt_term::recolour_cursor () 962rxvt_term::recolour_cursor ()
962{ 963{
963 XColor xcol[2]; 964 XColor fg, bg;
964 965
965 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 966 (ISSET_PIXCOLOR (Color_pointer_fg)
966 ? pix_colors_focused[Color_pointer_fg] 967 ? pix_colors_focused[Color_pointer_fg]
967 : pix_colors_focused[Color_fg]; 968 : pix_colors_focused[Color_fg]).get (fg);
969
968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
969 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
970 : pix_colors_focused[Color_bg]; 972 : pix_colors_focused[Color_bg]).get (bg);
971 973
972 XQueryColors (display->display, cmap, xcol, 2); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
973 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
974} 975}
975 976
976/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
977/* 978/*
978 * 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
… …
1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1007 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1007} 1008}
1008 1009
1009/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
1010 1011
1011int 1012bool
1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1013rxvt_term::set_color (rxvt_color &color, const char *name)
1013{ 1014{
1014 if (!screen_in_out->set (this, colour)) 1015 if (color.set (this, name))
1015 {
1016 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1017 return false;
1018 }
1019
1020 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]);
1021} 1026}
1022 1027
1023/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1024 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1025 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
… …
1029 int fix_screen; 1034 int fix_screen;
1030 int old_width = szHint.width; 1035 int old_width = szHint.width;
1031 int old_height = szHint.height; 1036 int old_height = szHint.height;
1032 1037
1033 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)))
1034 XSetWMNormalHints (xdisp, parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1035 1042
1036 if (!ignoreparent) 1043 if (!ignoreparent)
1037 { 1044 {
1038#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1039 /* 1046 /*
… …
1043 int x, y, x1, y1; 1050 int x, y, x1, y1;
1044 int dx, dy; 1051 int dx, dy;
1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1046 Window unused_cr; 1053 Window unused_cr;
1047 1054
1048 XTranslateCoordinates (xdisp, parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1049 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1050 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1052 /* 1059 /*
1053 * 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
1054 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1055 */ 1062 */
… …
1057 { 1064 {
1058 x -= x1; 1065 x -= x1;
1059 y -= y1; 1066 y -= y1;
1060 } 1067 }
1061 1068
1062 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1063 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1064 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1065 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1066 1073
1067 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1068 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
… …
1072 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1073 dy = 0; 1080 dy = 0;
1074 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1075 dy /= 2; 1082 dy /= 2;
1076 1083
1077 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1078 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1079#else 1086#else
1080 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1081#endif 1088#endif
1082 } 1089 }
1083 1090
1084 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1085 1092
1086 if (fix_screen || newwidth != old_width || newheight != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1087 { 1094 {
1088 if (scrollBar.state) 1095 if (scrollBar.state)
1089 { 1096 {
1090 XMoveResizeWindow (xdisp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1091 window_sb_x, 0, 1098 window_sb_x, 0,
1092 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1093 resize_scrollbar (); 1100 resize_scrollbar ();
1094 } 1101 }
1095 1102
1096 XMoveResizeWindow (xdisp, vt, 1103 XMoveResizeWindow (dpy, vt,
1097 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1098 width, height); 1105 width, height);
1099 1106
1100 scr_clear (); 1107 scr_clear ();
1101#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
… …
1104 } 1111 }
1105 1112
1106 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1107 scr_reset (); 1114 scr_reset ();
1108 1115
1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117 //scr_touch (false);
1118
1109#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1110 if (pixmap) 1120 if (pixmap)
1111 scr_touch (false); 1121 scr_touch (false);
1112#endif 1122#endif
1113 1123
1114#ifdef USE_XIM 1124#ifdef USE_XIM
1115 IMSetStatusPosition (); 1125 IMSetPosition ();
1116#endif 1126#endif
1117} 1127}
1118 1128
1119/* 1129/*
1120 * 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.
… …
1125{ 1135{
1126 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1127 1137
1128 if (newwidth == 0 || newheight == 0) 1138 if (newwidth == 0 || newheight == 0)
1129 { 1139 {
1130 XGetWindowAttributes (display->display, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1131 1141
1132 if (newwidth == 0) 1142 if (newwidth == 0)
1133 newwidth = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1134 if (newheight == 0) 1144 if (newheight == 0)
1135 newheight = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
… …
1149#ifdef USE_XIM 1159#ifdef USE_XIM
1150 1160
1151void 1161void
1152rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1162rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1153{ 1163{
1154 fg = pix_colors[Color_fg]; 1164 fg = pix_colors [Color_fg];
1155 bg = pix_colors[Color_bg]; 1165 bg = pix_colors [Color_bg];
1156} 1166}
1157 1167
1158void 1168void
1159rxvt_term::im_set_size (XRectangle &size) 1169rxvt_term::im_set_size (XRectangle &size)
1160{ 1170{
… …
1197 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1198 1208
1199 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1200 *p = '\0'; 1210 *p = '\0';
1201 1211
1202 atom = XInternAtom (display->display, server, False); 1212 atom = XInternAtom (dpy, server, False);
1203 win = XGetSelectionOwner (display->display, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1204 1214
1205 if (win != None) 1215 if (win != None)
1206 return True; 1216 return True;
1207 } 1217 }
1208 1218
… …
1432 "*", 1442 "*",
1433 fheight, 1443 fheight,
1434 fheight + 1, fheight - 1, 1444 fheight + 1, fheight - 1,
1435 fheight - 2, fheight + 2); 1445 fheight - 2, fheight + 2);
1436 1446
1437 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1438 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1439 1449
1440 if (missing_charset_list) 1450 if (missing_charset_list)
1441 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1442 1452
… …
1517 preedit_attr, 1527 preedit_attr,
1518 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1519 status_attr, NULL); 1529 status_attr, NULL);
1520 1530
1521 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1522 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1523 if (fs) XFreeFontSet (display->display, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1524 1534
1525 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1526 { 1536 {
1527 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1528 im_destroy (); 1538 im_destroy ();
… …
1533 // unfortunately, only the focus window is used by XIM, hard to fix 1543 // unfortunately, only the focus window is used by XIM, hard to fix
1534 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1544 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1535 vt_select_input (); 1545 vt_select_input ();
1536#endif 1546#endif
1537 1547
1538 if (input_style & XIMPreeditArea)
1539 IMSetStatusPosition (); 1548 IMSetPosition ();
1540 1549
1541 return true; 1550 return true;
1542} 1551}
1543 1552
1544void 1553void
… …
1602 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1603#endif 1612#endif
1604} 1613}
1605 1614
1606void 1615void
1607rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1608{ 1617{
1609 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1610 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1611 1620
1612 if (!Input_Context 1621 if (!Input_Context
1613 || !focus 1622 || !focus
1614 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1615 || !IMisRunning ()) 1624 || !IMisRunning ())
1616 return; 1625 return;
1617 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 {
1618 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1619 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1620 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1621 XFree (status_attr); 1640 XFree (status_attr);
1622 1641
1623 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1624 XFree (needed_rect); 1643 XFree (needed_rect);
1625 1644
1626 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1627 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1628 1647
1629 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1630 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1631 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1632 1652
1653 XFree (status_attr);
1654 }
1655
1633 XFree (preedit_attr); 1656 XFree (preedit_attr);
1634 XFree (status_attr);
1635} 1657}
1636#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1637 1659
1638/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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