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.212 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.218 by root, Thu Feb 2 18:04:46 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
… …
691 699
692 if (scrollBar.state) 700 if (scrollBar.state)
693 { 701 {
694 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
696 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
697 window_vt_x += sb_w; 706 window_vt_x += sb_w;
698 } 707 }
699 708
700 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
… …
726 735
727 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
729 738
730 if (recalc_x) 739 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 741
733 if (recalc_y) 742 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 744
736 ncol = width / fwidth; 745 ncol = width / fwidth;
737 nrow = height / fheight; 746 nrow = height / fheight;
738} 747}
739 748
… …
842 return true; 851 return true;
843} 852}
844 853
845void 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)
846{ 855{
847 XChangeProperty (xdisp, parent[0], 856 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 859}
851 860
852void 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)
853{ 862{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
856 865
857 XChangeProperty (xdisp, parent[0], 866 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
860 869
861 free (s); 870 free (s);
862 free (ws); 871 free (ws);
… …
931 940
932#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
933 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
934 { 943 {
935 rgba c; 944 rgba c;
936 pix_colors [Color_fade].get (this, c); 945 pix_colors [Color_fade].get (c);
937 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
938 } 947 }
939#endif 948#endif
940 949
941 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
… …
949#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
950 959
951void 960void
952rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
953{ 962{
954 XColor xcol[2]; 963 XColor fg, bg;
955 964
956 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
957 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
958 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
959 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
960 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
961 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
962 972
963 XQueryColors (xdisp, cmap, xcol, 2);
964 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
965} 974}
966 975
967/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
968/* 977/*
969 * 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
… …
1007 1016
1008 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1009 return false; 1018 return false;
1010} 1019}
1011 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
1012/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1013 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1014 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1015void 1030void
1016rxvt_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)
… …
1018 int fix_screen; 1033 int fix_screen;
1019 int old_width = szHint.width; 1034 int old_width = szHint.width;
1020 int old_height = szHint.height; 1035 int old_height = szHint.height;
1021 1036
1022 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1023 XSetWMNormalHints (xdisp, parent[0], &szHint); 1038 XSetWMNormalHints (dpy, parent[0], &szHint);
1024 1039
1025 if (!ignoreparent) 1040 if (!ignoreparent)
1026 { 1041 {
1027#ifdef SMART_RESIZE 1042#ifdef SMART_RESIZE
1028 /* 1043 /*
… …
1032 int x, y, x1, y1; 1047 int x, y, x1, y1;
1033 int dx, dy; 1048 int dx, dy;
1034 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1035 Window unused_cr; 1050 Window unused_cr;
1036 1051
1037 XTranslateCoordinates (xdisp, parent[0], display->root, 1052 XTranslateCoordinates (dpy, parent[0], display->root,
1038 0, 0, &x, &y, &unused_cr); 1053 0, 0, &x, &y, &unused_cr);
1039 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1054 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1040 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1041 /* 1056 /*
1042 * if display->root isn't the parent window, a WM will probably have offset 1057 * if display->root isn't the parent window, a WM will probably have offset
1043 * our position for handles and decorations. Counter it 1058 * our position for handles and decorations. Counter it
1044 */ 1059 */
… …
1046 { 1061 {
1047 x -= x1; 1062 x -= x1;
1048 y -= y1; 1063 y -= y1;
1049 } 1064 }
1050 1065
1051 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1066 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1052 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1067 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1053 dx = old_width - szHint.width; 1068 dx = old_width - szHint.width;
1054 dy = old_height - szHint.height; 1069 dy = old_height - szHint.height;
1055 1070
1056 /* Check position of the center of the window */ 1071 /* Check position of the center of the window */
1057 if (x < x1) /* left half */ 1072 if (x < x1) /* left half */
… …
1061 if (y < y1) /* top half */ 1076 if (y < y1) /* top half */
1062 dy = 0; 1077 dy = 0;
1063 else if (y == y1) /* exact center */ 1078 else if (y == y1) /* exact center */
1064 dy /= 2; 1079 dy /= 2;
1065 1080
1066 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1081 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1067 szHint.width, szHint.height); 1082 szHint.width, szHint.height);
1068#else 1083#else
1069 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1084 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1070#endif 1085#endif
1071 } 1086 }
1072 1087
1073 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1074 1089
1075 if (fix_screen || newwidth != old_width || newheight != old_height) 1090 if (fix_screen || newwidth != old_width || newheight != old_height)
1076 { 1091 {
1077 if (scrollBar.state) 1092 if (scrollBar.state)
1078 { 1093 {
1079 XMoveResizeWindow (xdisp, scrollBar.win, 1094 XMoveResizeWindow (dpy, scrollBar.win,
1080 window_sb_x, 0, 1095 window_sb_x, 0,
1081 scrollbar_TotalWidth (), szHint.height); 1096 scrollbar_TotalWidth (), szHint.height);
1082 resize_scrollbar (); 1097 resize_scrollbar ();
1083 } 1098 }
1084 1099
1085 XMoveResizeWindow (xdisp, vt, 1100 XMoveResizeWindow (dpy, vt,
1086 window_vt_x, window_vt_y, 1101 window_vt_x, window_vt_y,
1087 width, height); 1102 width, height);
1088 1103
1089 scr_clear (); 1104 scr_clear ();
1090#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
… …
1092#endif 1107#endif
1093 } 1108 }
1094 1109
1095 if (fix_screen || old_height == 0) 1110 if (fix_screen || old_height == 0)
1096 scr_reset (); 1111 scr_reset ();
1112
1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1114 //scr_touch (false);
1097 1115
1098#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1099 if (pixmap) 1117 if (pixmap)
1100 scr_touch (false); 1118 scr_touch (false);
1101#endif 1119#endif
… …
1114{ 1132{
1115 XWindowAttributes wattr; 1133 XWindowAttributes wattr;
1116 1134
1117 if (newwidth == 0 || newheight == 0) 1135 if (newwidth == 0 || newheight == 0)
1118 { 1136 {
1119 XGetWindowAttributes (xdisp, display->root, &wattr); 1137 XGetWindowAttributes (dpy, display->root, &wattr);
1120 1138
1121 if (newwidth == 0) 1139 if (newwidth == 0)
1122 newwidth = wattr.width - szHint.base_width; 1140 newwidth = wattr.width - szHint.base_width;
1123 if (newheight == 0) 1141 if (newheight == 0)
1124 newheight = wattr.height - szHint.base_height; 1142 newheight = wattr.height - szHint.base_height;
… …
1138#ifdef USE_XIM 1156#ifdef USE_XIM
1139 1157
1140void 1158void
1141rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1142{ 1160{
1143 fg = pix_colors[Color_fg]; 1161 fg = pix_colors [Color_fg];
1144 bg = pix_colors[Color_bg]; 1162 bg = pix_colors [Color_bg];
1145} 1163}
1146 1164
1147void 1165void
1148rxvt_term::im_set_size (XRectangle &size) 1166rxvt_term::im_set_size (XRectangle &size)
1149{ 1167{
… …
1186 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1187 1205
1188 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1189 *p = '\0'; 1207 *p = '\0';
1190 1208
1191 atom = XInternAtom (xdisp, server, False); 1209 atom = XInternAtom (dpy, server, False);
1192 win = XGetSelectionOwner (xdisp, atom); 1210 win = XGetSelectionOwner (dpy, atom);
1193 1211
1194 if (win != None) 1212 if (win != None)
1195 return True; 1213 return True;
1196 } 1214 }
1197 1215
… …
1421 "*", 1439 "*",
1422 fheight, 1440 fheight,
1423 fheight + 1, fheight - 1, 1441 fheight + 1, fheight - 1,
1424 fheight - 2, fheight + 2); 1442 fheight - 2, fheight + 2);
1425 1443
1426 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1444 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1427 &missing_charset_list, &missing_charset_count, &def_string); 1445 &missing_charset_list, &missing_charset_count, &def_string);
1428 1446
1429 if (missing_charset_list) 1447 if (missing_charset_list)
1430 XFreeStringList (missing_charset_list); 1448 XFreeStringList (missing_charset_list);
1431 1449
… …
1507 status_attr ? XNStatusAttributes : NULL, 1525 status_attr ? XNStatusAttributes : NULL,
1508 status_attr, NULL); 1526 status_attr, NULL);
1509 1527
1510 if (preedit_attr) XFree (preedit_attr); 1528 if (preedit_attr) XFree (preedit_attr);
1511 if (status_attr) XFree (status_attr); 1529 if (status_attr) XFree (status_attr);
1512 if (fs) XFreeFontSet (xdisp, fs); 1530 if (fs) XFreeFontSet (dpy, fs);
1513 1531
1514 if (Input_Context == NULL) 1532 if (Input_Context == NULL)
1515 { 1533 {
1516 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1534 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1517 im_destroy (); 1535 im_destroy ();

Diff Legend

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