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.214 by root, Tue Jan 31 19:53:30 2006 UTC vs.
Revision 1.219 by root, Sat Feb 11 02:28:19 2006 UTC

… …
222 222
223#ifdef USE_XIM 223#ifdef USE_XIM
224 im_destroy (); 224 im_destroy ();
225#endif 225#endif
226#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC); 228 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 229#endif
230#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 232#endif
233#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC); 234 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC); 235 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC); 236 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC); 237 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC); 238 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple); 239 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow); 240 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow); 241 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi); 242 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi); 243 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 244#endif
245#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC); 246 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC); 247 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 249#endif
250 if (gc) XFreeGC (xdisp, gc); 250 if (gc) XFreeGC (dpy, gc);
251 251
252 delete drawable; 252 delete drawable;
253 // destroy all windows 253 // destroy all windows
254 if (parent[0]) 254 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 255 XDestroyWindow (dpy, parent[0]);
256
257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i))
259 {
260 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING
262 pix_colors_unfocused [i].free (this);
263#endif
264 }
256 265
257 clear (); 266 clear ();
258 } 267 }
259 268
260 // TODO: free pixcolours, colours should become part of rxvt_display
261 delete pix_colors_focused; 269 delete pix_colors_focused;
262#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
264#endif 272#endif
265 273
… …
480 init_xlocale (); 488 init_xlocale ();
481 489
482 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
483 491
484#if 0 492#if 0
485 XSynchronize (xdisp, True); 493 XSynchronize (dpy, True);
486#endif 494#endif
487 495
488#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
491#endif 499#endif
492#ifdef TRANSPARENT 500#ifdef TRANSPARENT
493 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
494 { 502 {
495 XSelectInput (xdisp, display->root, PropertyChangeMask); 503 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents (); 504 check_our_parents ();
497 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
498 } 506 }
499#endif 507#endif
500 508
… …
514#if ENABLE_XEMBED 522#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 523 if (rs[Rs_embed])
516 { 524 {
517 long info[2] = { 0, XEMBED_MAPPED }; 525 long info[2] = { 0, XEMBED_MAPPED };
518 526
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 527 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2); 528 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 529 }
522#endif 530#endif
523 531
524 XMapWindow (xdisp, vt); 532 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 533 XMapWindow (dpy, parent[0]);
526 534
527 return true; 535 return true;
528} 536}
529 537
530static struct sig_handlers 538static struct sig_handlers
… …
696 704
697 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
698 window_vt_x += sb_w; 706 window_vt_x += sb_w;
699 } 707 }
700 708
701 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
702 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
703 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
704 szHint.min_height = szHint.base_height + szHint.height_inc; 712 szHint.min_height = szHint.base_height + szHint.height_inc;
705 713
706 if (newwidth && newwidth - szHint.base_width < max_width) 714 if (newwidth && newwidth - szHint.base_width < max_width)
707 { 715 {
708 szHint.width = newwidth; 716 szHint.width = newwidth;
… …
727 735
728 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
729 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
730 738
731 if (recalc_x) 739 if (recalc_x)
732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
733 741
734 if (recalc_y) 742 if (recalc_y)
735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
736 744
737 ncol = width / fwidth; 745 ncol = width / fwidth;
738 nrow = height / fheight; 746 nrow = height / fheight;
739} 747}
740 748
… …
843 return true; 851 return true;
844} 852}
845 853
846void rxvt_term::set_string_property (Atom prop, const char *str, int len) 854void rxvt_term::set_string_property (Atom prop, const char *str, int len)
847{ 855{
848 XChangeProperty (xdisp, parent[0], 856 XChangeProperty (dpy, parent[0],
849 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
850 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
851} 859}
852 860
853void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
854{ 862{
855 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
856 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
857 865
858 XChangeProperty (xdisp, parent[0], 866 XChangeProperty (dpy, parent[0],
859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
861 869
862 free (s); 870 free (s);
863 free (ws); 871 free (ws);
… …
950#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
951 959
952void 960void
953rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
954{ 962{
955 XColor xcol[2]; 963 XColor fg, bg;
956 964
957 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
958 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
959 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
960 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
961 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
962 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
963 972
964 XQueryColors (xdisp, cmap, xcol, 2);
965 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
966} 974}
967 975
968/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
969/* 977/*
970 * 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 1016
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false; 1018 return false;
1011} 1019}
1012 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]);
1025}
1026
1013/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1014 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1015 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1016void 1030void
1017rxvt_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)
… …
1019 int fix_screen; 1033 int fix_screen;
1020 int old_width = szHint.width; 1034 int old_width = szHint.width;
1021 int old_height = szHint.height; 1035 int old_height = szHint.height;
1022 1036
1023 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)))
1024 XSetWMNormalHints (xdisp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1025 1041
1026 if (!ignoreparent) 1042 if (!ignoreparent)
1027 { 1043 {
1028#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1029 /* 1045 /*
… …
1033 int x, y, x1, y1; 1049 int x, y, x1, y1;
1034 int dx, dy; 1050 int dx, dy;
1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1036 Window unused_cr; 1052 Window unused_cr;
1037 1053
1038 XTranslateCoordinates (xdisp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1039 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1042 /* 1058 /*
1043 * 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
1044 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1045 */ 1061 */
… …
1047 { 1063 {
1048 x -= x1; 1064 x -= x1;
1049 y -= y1; 1065 y -= y1;
1050 } 1066 }
1051 1067
1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1054 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1055 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1056 1072
1057 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1058 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
… …
1062 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1063 dy = 0; 1079 dy = 0;
1064 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1065 dy /= 2; 1081 dy /= 2;
1066 1082
1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1068 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1069#else 1085#else
1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1071#endif 1087#endif
1072 } 1088 }
1073 1089
1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1075 1091
1076 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1077 { 1093 {
1078 if (scrollBar.state) 1094 if (scrollBar.state)
1079 { 1095 {
1080 XMoveResizeWindow (xdisp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1081 window_sb_x, 0, 1097 window_sb_x, 0,
1082 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1083 resize_scrollbar (); 1099 resize_scrollbar ();
1084 } 1100 }
1085 1101
1086 XMoveResizeWindow (xdisp, vt, 1102 XMoveResizeWindow (dpy, vt,
1087 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1088 width, height); 1104 width, height);
1089 1105
1090 scr_clear (); 1106 scr_clear ();
1091#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
… …
1093#endif 1109#endif
1094 } 1110 }
1095 1111
1096 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1097 scr_reset (); 1113 scr_reset ();
1114
1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 //scr_touch (false);
1098 1117
1099#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1100 if (pixmap) 1119 if (pixmap)
1101 scr_touch (false); 1120 scr_touch (false);
1102#endif 1121#endif
… …
1115{ 1134{
1116 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1117 1136
1118 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1119 { 1138 {
1120 XGetWindowAttributes (xdisp, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1121 1140
1122 if (newwidth == 0) 1141 if (newwidth == 0)
1123 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1124 if (newheight == 0) 1143 if (newheight == 0)
1125 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1139#ifdef USE_XIM 1158#ifdef USE_XIM
1140 1159
1141void 1160void
1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1143{ 1162{
1144 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1145 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1146} 1165}
1147 1166
1148void 1167void
1149rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1150{ 1169{
… …
1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1188 1207
1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1190 *p = '\0'; 1209 *p = '\0';
1191 1210
1192 atom = XInternAtom (xdisp, server, False); 1211 atom = XInternAtom (dpy, server, False);
1193 win = XGetSelectionOwner (xdisp, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1194 1213
1195 if (win != None) 1214 if (win != None)
1196 return True; 1215 return True;
1197 } 1216 }
1198 1217
… …
1422 "*", 1441 "*",
1423 fheight, 1442 fheight,
1424 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1425 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1426 1445
1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1428 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1429 1448
1430 if (missing_charset_list) 1449 if (missing_charset_list)
1431 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1432 1451
… …
1508 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1509 status_attr, NULL); 1528 status_attr, NULL);
1510 1529
1511 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1512 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1513 if (fs) XFreeFontSet (xdisp, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1514 1533
1515 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1516 { 1535 {
1517 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1518 im_destroy (); 1537 im_destroy ();

Diff Legend

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