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.211 by root, Tue Jan 31 16:57:35 2006 UTC

… …
216#endif 216#endif
217 delete fontset[0]; 217 delete fontset[0];
218 218
219 if (display) 219 if (display)
220 { 220 {
221 dDisp;
222
223 selection_clear (); 221 selection_clear ();
224 222
225#ifdef USE_XIM 223#ifdef USE_XIM
226 im_destroy (); 224 im_destroy ();
227#endif 225#endif
228#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
231#endif 229#endif
232#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
234#endif 232#endif
235#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
246#endif 244#endif
247#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
251#endif 249#endif
252 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
253 251
254 delete drawable; 252 delete drawable;
255 // destroy all windows 253 // destroy all windows
256 if (parent[0]) 254 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
256
257 clear ();
258 } 258 }
259 259
260 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
261 delete pix_colors_focused; 261 delete pix_colors_focused;
262#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
… …
368{ 368{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 370 (*t)->emergency_cleanup ();
371} 371}
372 372
373#if ENABLE_FRILLS 373#if !ENABLE_MINIMAL
374static void 374static void
375print_x_error (Display *dpy, XErrorEvent *event) 375print_x_error (Display *dpy, XErrorEvent *event)
376{ 376{
377 char buffer[BUFSIZ]; 377 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 378 char mesg[BUFSIZ];
… …
426 GET_R->allowedxerror = event->error_code; 426 GET_R->allowedxerror = event->error_code;
427 else 427 else
428 { 428 {
429 // GET_R is most likely not the terminal which caused the error, 429 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 430 // so just output the error and continue
431#if ENABLE_FRILLS 431#if ENABLE_MINIMAL
432 old_xerror_handler (display, event);
433#else
432 print_x_error (display, event); 434 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 435#endif
436 } 436 }
437 437
438 return 0; 438 return 0;
439} 439}
… …
475 475
476 pty = ptytty::create (); 476 pty = ptytty::create ();
477 477
478 create_windows (argc, argv); 478 create_windows (argc, argv);
479 479
480 dDisp;
481
482 init_xlocale (); 480 init_xlocale ();
483 481
484 scr_reset (); // initialize screen 482 scr_reset (); // initialize screen
485 483
486#if 0 484#if 0
487 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
488#endif 486#endif
489 487
490#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
493#endif 491#endif
494#ifdef TRANSPARENT 492#ifdef TRANSPARENT
495 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
496 { 494 {
497 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
498 check_our_parents (); 496 check_our_parents ();
499 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
500 } 498 }
501#endif 499#endif
502 500
… …
516#if ENABLE_XEMBED 514#if ENABLE_XEMBED
517 if (rs[Rs_embed]) 515 if (rs[Rs_embed])
518 { 516 {
519 long info[2] = { 0, XEMBED_MAPPED }; 517 long info[2] = { 0, XEMBED_MAPPED };
520 518
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2); 520 32, PropModeReplace, (unsigned char *)&info, 2);
523 } 521 }
524#endif 522#endif
525 523
526 XMapWindow (disp, vt); 524 XMapWindow (xdisp, vt);
527 XMapWindow (disp, parent[0]); 525 XMapWindow (xdisp, parent[0]);
528 526
529 return true; 527 return true;
530} 528}
531 529
532static struct sig_handlers 530static struct sig_handlers
… …
622{ 620{
623 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
625 unsigned int w, h; 623 unsigned int w, h;
626 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
627 dDisp;
628 625
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 629
… …
729 726
730 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
732 729
733 if (recalc_x) 730 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
735 if (recalc_y) 733 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
737 735
738 ncol = width / fwidth; 736 ncol = width / fwidth;
739 nrow = height / fheight; 737 nrow = height / fheight;
740} 738}
741 739
… …
844 return true; 842 return true;
845} 843}
846 844
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 845void rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 846{
849 XChangeProperty (display->display, parent[0], 847 XChangeProperty (xdisp, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 848 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 849 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 850}
853 851
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 853{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 854 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 855 char *s = rxvt_wcstoutf8 (ws);
858 856
859 XChangeProperty (display->display, parent[0], 857 XChangeProperty (xdisp, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 859 (const unsigned char *)s, strlen (s));
862 860
863 free (s); 861 free (s);
864 free (ws); 862 free (ws);
… …
914 SET_PIXCOLOR (idx); 912 SET_PIXCOLOR (idx);
915 goto done; 913 goto done;
916 } 914 }
917 } 915 }
918 916
919 if (!rXParseAllocColor (&xcol, color)) 917 if (!set_color (xcol, color))
920 return; 918 return;
921 919
922 /* XStoreColor (display->display, display->cmap, XColor*); */ 920 /* XStoreColor (xdisp, display->cmap, XColor*); */
923 921
924 /* 922 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 923 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
927 */ 925 */
… …
930 if (pix_colors[idx] == pix_colors[i]) 928 if (pix_colors[idx] == pix_colors[i])
931 break; 929 break;
932 if (i > Color_White) 930 if (i > Color_White)
933 { 931 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ 932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, 933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen)); 934 DisplayPlanes (xdisp, display->screen));
937 } 935 }
938# endif 936# endif
939 937
940 pix_colors_focused[idx] = xcol; 938 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx); 939 SET_PIXCOLOR (idx);
… …
944 /* Cursor cursor; */ 942 /* Cursor cursor; */
945done: 943done:
946 944
947#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
948 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 947 {
948 rxvt_rgba c;
949 pix_colors [Color_fade].get (this, c);
950 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
951 }
950#endif 952#endif
951 953
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 954 /*TODO: handle Color_BD, scrollbar background, etc. */
953 955
954 recolour_cursor (); 956 recolour_cursor ();
… …
969 : pix_colors_focused[Color_fg]; 971 : pix_colors_focused[Color_fg];
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 973 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 974 : pix_colors_focused[Color_bg];
973 975
974 XQueryColors (display->display, display->cmap, xcol, 2); 976 XQueryColors (xdisp, cmap, xcol, 2);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 977 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
976} 978}
977 979
978/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
979/* 981/*
980 * find if fg/bg matches any of the normal (low-intensity) colors 982 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 1011}
1010 1012
1011/*----------------------------------------------------------------------*/ 1013/*----------------------------------------------------------------------*/
1012 1014
1013int 1015bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1016rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 1017{
1016 if (!screen_in_out->set (display, colour)) 1018 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; 1019 return true;
1020
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1022 return false;
1023} 1023}
1024 1024
1025/* -------------------------------------------------------------------- * 1025/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1026 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1027 * -------------------------------------------------------------------- */
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 1030{
1031 int fix_screen; 1031 int fix_screen;
1032 int old_width = szHint.width; 1032 int old_width = szHint.width;
1033 int old_height = szHint.height; 1033 int old_height = szHint.height;
1034 dDisp;
1035 1034
1036 window_calc (newwidth, newheight); 1035 window_calc (newwidth, newheight);
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1036 XSetWMNormalHints (xdisp, parent[0], &szHint);
1038 1037
1039 if (!ignoreparent) 1038 if (!ignoreparent)
1040 { 1039 {
1041#ifdef SMART_RESIZE 1040#ifdef SMART_RESIZE
1042 /* 1041 /*
… …
1046 int x, y, x1, y1; 1045 int x, y, x1, y1;
1047 int dx, dy; 1046 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1047 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1048 Window unused_cr;
1050 1049
1051 XTranslateCoordinates (disp, parent[0], display->root, 1050 XTranslateCoordinates (xdisp, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1051 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1052 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1053 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1054 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 1055 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 1056 * our position for handles and decorations. Counter it
1058 */ 1057 */
… …
1060 { 1059 {
1061 x -= x1; 1060 x -= x1;
1062 y -= y1; 1061 y -= y1;
1063 } 1062 }
1064 1063
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1064 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1065 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1066 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1067 dy = old_height - szHint.height;
1069 1068
1070 /* Check position of the center of the window */ 1069 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1070 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1074 if (y < y1) /* top half */
1076 dy = 0; 1075 dy = 0;
1077 else if (y == y1) /* exact center */ 1076 else if (y == y1) /* exact center */
1078 dy /= 2; 1077 dy /= 2;
1079 1078
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1079 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1080 szHint.width, szHint.height);
1082#else 1081#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1082 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1084#endif 1083#endif
1085 } 1084 }
1086 1085
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1086 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1087
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1088 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1089 {
1091 if (scrollBar.state) 1090 if (scrollBar.state)
1092 { 1091 {
1093 XMoveResizeWindow (disp, scrollBar.win, 1092 XMoveResizeWindow (xdisp, scrollBar.win,
1094 window_sb_x, 0, 1093 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height); 1094 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1095 resize_scrollbar ();
1097 } 1096 }
1098 1097
1099 XMoveResizeWindow (disp, vt, 1098 XMoveResizeWindow (xdisp, vt,
1100 window_vt_x, window_vt_y, 1099 window_vt_x, window_vt_y,
1101 width, height); 1100 width, height);
1102 1101
1103 scr_clear (); 1102 scr_clear ();
1104#ifdef XPM_BACKGROUND 1103#ifdef XPM_BACKGROUND
… …
1128{ 1127{
1129 XWindowAttributes wattr; 1128 XWindowAttributes wattr;
1130 1129
1131 if (newwidth == 0 || newheight == 0) 1130 if (newwidth == 0 || newheight == 0)
1132 { 1131 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1132 XGetWindowAttributes (xdisp, display->root, &wattr);
1134 1133
1135 if (newwidth == 0) 1134 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1135 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1136 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1137 newheight = wattr.height - szHint.base_height;
… …
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1199 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1201 1200
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1201 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203 *p = '\0'; 1202 *p = '\0';
1204 1203
1205 atom = XInternAtom (display->display, server, False); 1204 atom = XInternAtom (xdisp, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1205 win = XGetSelectionOwner (xdisp, atom);
1207 1206
1208 if (win != None) 1207 if (win != None)
1209 return True; 1208 return True;
1210 } 1209 }
1211 1210
… …
1435 "*", 1434 "*",
1436 fheight, 1435 fheight,
1437 fheight + 1, fheight - 1, 1436 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1437 fheight - 2, fheight + 2);
1439 1438
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1439 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1440 &missing_charset_list, &missing_charset_count, &def_string);
1442 1441
1443 if (missing_charset_list) 1442 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1443 XFreeStringList (missing_charset_list);
1445 1444
… …
1521 status_attr ? XNStatusAttributes : NULL, 1520 status_attr ? XNStatusAttributes : NULL,
1522 status_attr, NULL); 1521 status_attr, NULL);
1523 1522
1524 if (preedit_attr) XFree (preedit_attr); 1523 if (preedit_attr) XFree (preedit_attr);
1525 if (status_attr) XFree (status_attr); 1524 if (status_attr) XFree (status_attr);
1526 if (fs) XFreeFontSet (display->display, fs); 1525 if (fs) XFreeFontSet (xdisp, fs);
1527 1526
1528 if (Input_Context == NULL) 1527 if (Input_Context == NULL)
1529 { 1528 {
1530 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1529 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1531 im_destroy (); 1530 im_destroy ();

Diff Legend

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