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.217 by root, Thu Feb 2 18:00:23 2006 UTC vs.
Revision 1.220 by root, Sat Feb 11 10:53:37 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 256
257 for (int i = 0; i < TOTAL_COLORS; i++) 257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i)) 258 if (ISSET_PIXCOLOR (i))
259 { 259 {
260 pix_colors_focused [i].free (this); 260 pix_colors_focused [i].free (this);
… …
488 init_xlocale (); 488 init_xlocale ();
489 489
490 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
491 491
492#if 0 492#if 0
493 XSynchronize (xdisp, True); 493 XSynchronize (dpy, True);
494#endif 494#endif
495 495
496#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
499#endif 499#endif
500#ifdef TRANSPARENT 500#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
502 { 502 {
503 XSelectInput (xdisp, display->root, PropertyChangeMask); 503 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents (); 504 check_our_parents ();
505 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
506 } 506 }
507#endif 507#endif
508 508
… …
522#if ENABLE_XEMBED 522#if ENABLE_XEMBED
523 if (rs[Rs_embed]) 523 if (rs[Rs_embed])
524 { 524 {
525 long info[2] = { 0, XEMBED_MAPPED }; 525 long info[2] = { 0, XEMBED_MAPPED };
526 526
527 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],
528 32, PropModeReplace, (unsigned char *)&info, 2); 528 32, PropModeReplace, (unsigned char *)&info, 2);
529 } 529 }
530#endif 530#endif
531 531
532 XMapWindow (xdisp, vt); 532 XMapWindow (dpy, vt);
533 XMapWindow (xdisp, parent[0]); 533 XMapWindow (dpy, parent[0]);
534 534
535 return true; 535 return true;
536} 536}
537 537
538static struct sig_handlers 538static struct sig_handlers
… …
704 704
705 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
706 window_vt_x += sb_w; 706 window_vt_x += sb_w;
707 } 707 }
708 708
709 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
711 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
712 szHint.min_height = szHint.base_height + szHint.height_inc; 712 szHint.min_height = szHint.base_height + szHint.height_inc;
713 713
714 if (newwidth && newwidth - szHint.base_width < max_width) 714 if (newwidth && newwidth - szHint.base_width < max_width)
715 { 715 {
716 szHint.width = newwidth; 716 szHint.width = newwidth;
… …
735 735
736 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
738 738
739 if (recalc_x) 739 if (recalc_x)
740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 741
742 if (recalc_y) 742 if (recalc_y)
743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
744 744
745 ncol = width / fwidth; 745 ncol = width / fwidth;
746 nrow = height / fheight; 746 nrow = height / fheight;
747} 747}
748 748
… …
851 return true; 851 return true;
852} 852}
853 853
854void 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)
855{ 855{
856 XChangeProperty (xdisp, parent[0], 856 XChangeProperty (dpy, parent[0],
857 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
858 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
859} 859}
860 860
861void 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)
862{ 862{
863 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
864 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
865 865
866 XChangeProperty (xdisp, parent[0], 866 XChangeProperty (dpy, parent[0],
867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
868 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
869 869
870 free (s); 870 free (s);
871 free (ws); 871 free (ws);
… …
968 968
969 (ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
970 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
971 : pix_colors_focused[Color_bg]).get (bg); 971 : pix_colors_focused[Color_bg]).get (bg);
972 972
973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974} 974}
975 975
976/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
977/* 977/*
978 * 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
… …
1033 int fix_screen; 1033 int fix_screen;
1034 int old_width = szHint.width; 1034 int old_width = szHint.width;
1035 int old_height = szHint.height; 1035 int old_height = szHint.height;
1036 1036
1037 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)))
1038 XSetWMNormalHints (xdisp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1039 1041
1040 if (!ignoreparent) 1042 if (!ignoreparent)
1041 { 1043 {
1042#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1043 /* 1045 /*
… …
1047 int x, y, x1, y1; 1049 int x, y, x1, y1;
1048 int dx, dy; 1050 int dx, dy;
1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1050 Window unused_cr; 1052 Window unused_cr;
1051 1053
1052 XTranslateCoordinates (xdisp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1053 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1056 /* 1058 /*
1057 * 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
1058 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1059 */ 1061 */
… …
1061 { 1063 {
1062 x -= x1; 1064 x -= x1;
1063 y -= y1; 1065 y -= y1;
1064 } 1066 }
1065 1067
1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1068 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1069 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1070 1072
1071 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1072 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
… …
1076 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1077 dy = 0; 1079 dy = 0;
1078 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1079 dy /= 2; 1081 dy /= 2;
1080 1082
1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1082 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1083#else 1085#else
1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1085#endif 1087#endif
1086 } 1088 }
1087 1089
1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1089 1091
1090 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1091 { 1093 {
1092 if (scrollBar.state) 1094 if (scrollBar.state)
1093 { 1095 {
1094 XMoveResizeWindow (xdisp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1095 window_sb_x, 0, 1097 window_sb_x, 0,
1096 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1097 resize_scrollbar (); 1099 resize_scrollbar ();
1098 } 1100 }
1099 1101
1100 XMoveResizeWindow (xdisp, vt, 1102 XMoveResizeWindow (dpy, vt,
1101 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1102 width, height); 1104 width, height);
1103 1105
1104 scr_clear (); 1106 scr_clear ();
1105#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
… …
1117 if (pixmap) 1119 if (pixmap)
1118 scr_touch (false); 1120 scr_touch (false);
1119#endif 1121#endif
1120 1122
1121#ifdef USE_XIM 1123#ifdef USE_XIM
1122 IMSetStatusPosition (); 1124 IMSetPosition ();
1123#endif 1125#endif
1124} 1126}
1125 1127
1126/* 1128/*
1127 * 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.
… …
1132{ 1134{
1133 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1134 1136
1135 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1136 { 1138 {
1137 XGetWindowAttributes (xdisp, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1138 1140
1139 if (newwidth == 0) 1141 if (newwidth == 0)
1140 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1141 if (newheight == 0) 1143 if (newheight == 0)
1142 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1205 1207
1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1207 *p = '\0'; 1209 *p = '\0';
1208 1210
1209 atom = XInternAtom (xdisp, server, False); 1211 atom = XInternAtom (dpy, server, False);
1210 win = XGetSelectionOwner (xdisp, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1211 1213
1212 if (win != None) 1214 if (win != None)
1213 return True; 1215 return True;
1214 } 1216 }
1215 1217
… …
1439 "*", 1441 "*",
1440 fheight, 1442 fheight,
1441 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1442 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1443 1445
1444 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1445 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1446 1448
1447 if (missing_charset_list) 1449 if (missing_charset_list)
1448 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1449 1451
… …
1524 preedit_attr, 1526 preedit_attr,
1525 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1526 status_attr, NULL); 1528 status_attr, NULL);
1527 1529
1528 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1529 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1530 if (fs) XFreeFontSet (xdisp, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1531 1533
1532 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1533 { 1535 {
1534 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1535 im_destroy (); 1537 im_destroy ();
… …
1540 // 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
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input (); 1544 vt_select_input ();
1543#endif 1545#endif
1544 1546
1545 if (input_style & XIMPreeditArea)
1546 IMSetStatusPosition (); 1547 IMSetPosition ();
1547 1548
1548 return true; 1549 return true;
1549} 1550}
1550 1551
1551void 1552void
… …
1609 SET_LOCALE (locale); 1610 SET_LOCALE (locale);
1610#endif 1611#endif
1611} 1612}
1612 1613
1613void 1614void
1614rxvt_term::IMSetStatusPosition () 1615rxvt_term::IMSetPosition ()
1615{ 1616{
1616 XRectangle preedit_rect, status_rect, *needed_rect; 1617 XRectangle preedit_rect, status_rect, *needed_rect;
1617 XVaNestedList preedit_attr, status_attr; 1618 XVaNestedList preedit_attr, status_attr;
1618 1619
1619 if (!Input_Context 1620 if (!Input_Context
1620 || !focus 1621 || !focus
1621 || !(input_style & XIMPreeditArea) 1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1622 || !IMisRunning ()) 1623 || !IMisRunning ())
1623 return; 1624 return;
1624 1625
1625 /* Getting the necessary width of preedit area */ 1626 /* Getting the necessary width of preedit area */
1626 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1627 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
… …
1629 1630
1630 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1631 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1631 XFree (needed_rect); 1632 XFree (needed_rect);
1632 1633
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1634 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1635 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1635 1636
1636 XSetICValues (Input_Context, 1637 XSetICValues (Input_Context,
1637 XNPreeditAttributes, preedit_attr, 1638 XNPreeditAttributes, preedit_attr,
1638 XNStatusAttributes, status_attr, NULL); 1639 XNStatusAttributes, status_attr,
1640 NULL);
1639 1641
1640 XFree (preedit_attr); 1642 XFree (preedit_attr);
1641 XFree (status_attr); 1643 XFree (status_attr);
1642} 1644}
1643#endif /* USE_XIM */ 1645#endif /* USE_XIM */

Diff Legend

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