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.351 by sf-exg, Tue Feb 1 00:41:01 2011 UTC vs.
Revision 1.359 by sf-exg, Fri Jul 29 09:41:22 2011 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2010 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
105 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
107 } 107 }
108 108
109 // check to see whether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
113 113
114 // allocate a new combination 114 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
… …
187#endif 187#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 194
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 196
… …
242 scrollBar.destroy (); 241 scrollBar.destroy ();
243 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
244 243
245 delete drawable; 244 delete drawable;
246 // destroy all windows 245 // destroy all windows
247 if (parent[0]) 246 if (parent)
248 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
249 248
250 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
251 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
252 { 251 {
253 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
273 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
274 free (env_display); 273 free (env_display);
275 free (env_term); 274 free (env_term);
276 free (locale); 275 free (locale);
277 free (v_buffer); 276 free (v_buffer);
278 free (incr_buf); 277
278 delete selection_req;
279 279
280 delete envv; 280 delete envv;
281 delete argv; 281 delete argv;
282 282
283#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
… …
319#endif 319#endif
320 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
321#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
322 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
323#endif 323#endif
324 incr_ev.stop ();
325 termwin_ev.stop (display); 324 termwin_ev.stop (display);
326 vt_ev.stop (display); 325 vt_ev.stop (display);
327 } 326 }
328 327
329 flush_ev.stop (); 328 flush_ev.stop ();
… …
736 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
737#endif 736#endif
738} 737}
739 738
740/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
741/* set_fonts () - load and set the various fonts 740/* load and set the various fonts */
742 *
743 * init = 1 - initialize
744 *
745 * fontname == FONT_UP - switch to bigger font
746 * fontname == FONT_DN - switch to smaller font
747 */
748bool 741bool
749rxvt_term::set_fonts () 742rxvt_term::set_fonts ()
750{ 743{
751 rxvt_fontset *fs = new rxvt_fontset (this); 744 rxvt_fontset *fs = new rxvt_fontset (this);
752 rxvt_fontprop prop; 745 rxvt_fontprop prop;
… …
809#else 802#else
810 fontset[style] = fontset[0]; 803 fontset[style] = fontset[0];
811#endif 804#endif
812 } 805 }
813 806
814 if (parent[0]) 807 if (parent)
815 { 808 {
816 resize_all_windows (0, 0, 0); 809 resize_all_windows (0, 0, 0);
817 scr_remap_chars (); 810 scr_remap_chars ();
818 scr_touch (true); 811 scr_touch (true);
819 } 812 }
… …
822} 815}
823 816
824void 817void
825rxvt_term::set_string_property (Atom prop, const char *str, int len) 818rxvt_term::set_string_property (Atom prop, const char *str, int len)
826{ 819{
827 XChangeProperty (dpy, parent[0], 820 XChangeProperty (dpy, parent,
828 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
829 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
830} 823}
831 824
832void 825void
… …
834{ 827{
835 XTextProperty ct; 828 XTextProperty ct;
836 829
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 { 831 {
839 XSetTextProperty (dpy, parent[0], &ct, prop); 832 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value); 833 XFree (ct.value);
841 } 834 }
842} 835}
843 836
844void 837void
845rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
846{ 839{
847 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
848 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
849 842
850 XChangeProperty (dpy, parent[0], 843 XChangeProperty (dpy, parent,
851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
852 (const unsigned char *)s, strlen (s)); 845 (const unsigned char *)s, strlen (s));
853 846
854 free (s); 847 free (s);
855 free (ws); 848 free (ws);
… …
1009 1002
1010 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1003 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1011 if (set_hint) 1004 if (set_hint)
1012 { 1005 {
1013 szHint.flags &= ~(PBaseSize | PResizeInc); 1006 szHint.flags &= ~(PBaseSize | PResizeInc);
1014 XSetWMNormalHints (dpy, parent[0], &szHint); 1007 XSetWMNormalHints (dpy, parent, &szHint);
1015 szHint.flags |= PBaseSize | PResizeInc; 1008 szHint.flags |= PBaseSize | PResizeInc;
1016 } 1009 }
1017 1010
1018 if (!ignoreparent) 1011 if (!ignoreparent)
1019 { 1012 {
… …
1025 int x, y, x1, y1; 1018 int x, y, x1, y1;
1026 int dx, dy; 1019 int dx, dy;
1027 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1020 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1028 Window unused_cr; 1021 Window unused_cr;
1029 1022
1030 XTranslateCoordinates (dpy, parent[0], display->root, 1023 XTranslateCoordinates (dpy, parent, display->root,
1031 0, 0, &x, &y, &unused_cr); 1024 0, 0, &x, &y, &unused_cr);
1032 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1025 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1033 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1026 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1034 /* 1027 /*
1035 * if display->root isn't the parent window, a WM will probably have offset 1028 * if display->root isn't the parent window, a WM will probably have offset
1036 * our position for handles and decorations. Counter it 1029 * our position for handles and decorations. Counter it
1037 */ 1030 */
… …
1054 if (y < y1) /* top half */ 1047 if (y < y1) /* top half */
1055 dy = 0; 1048 dy = 0;
1056 else if (y == y1) /* exact center */ 1049 else if (y == y1) /* exact center */
1057 dy /= 2; 1050 dy /= 2;
1058 1051
1059 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1052 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1060 szHint.width, szHint.height); 1053 szHint.width, szHint.height);
1061#else 1054#else
1062 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1055 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1063#endif 1056#endif
1064 } 1057 }
1065 1058
1066 if (set_hint) 1059 if (set_hint)
1067 XSetWMNormalHints (dpy, parent[0], &szHint); 1060 XSetWMNormalHints (dpy, parent, &szHint);
1068 1061
1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1062 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1070 1063
1071 if (fix_screen || newwidth != old_width || newheight != old_height) 1064 if (fix_screen || newwidth != old_width || newheight != old_height)
1072 { 1065 {
… …
1085 1078
1086 if (fix_screen || old_height == 0) 1079 if (fix_screen || old_height == 0)
1087 scr_reset (); 1080 scr_reset ();
1088 1081
1089#ifdef USE_XIM 1082#ifdef USE_XIM
1090 IMSetPosition (); 1083 im_set_position ();
1091#endif 1084#endif
1092} 1085}
1093 1086
1094/* 1087/*
1095 * Set the width/height of the vt window in characters. Units are pixels. 1088 * Set the width/height of the vt window in characters. Units are pixels.
… …
1156 status_rect.height = fheight; 1149 status_rect.height = fheight;
1157} 1150}
1158 1151
1159/* Checking whether input method is running. */ 1152/* Checking whether input method is running. */
1160bool 1153bool
1161rxvt_term::IMisRunning () 1154rxvt_term::im_is_running ()
1162{ 1155{
1163 Atom atom; 1156 Atom atom;
1164 Window win; 1157 Window win;
1165 char server[IMBUFSIZ]; 1158 char server[IMBUFSIZ];
1166 1159
… …
1182 1175
1183 return false; 1176 return false;
1184} 1177}
1185 1178
1186void 1179void
1187rxvt_term::IMSendSpot () 1180rxvt_term::im_send_spot ()
1188{ 1181{
1189 XPoint nspot; 1182 XPoint nspot;
1190 XVaNestedList preedit_attr; 1183 XVaNestedList preedit_attr;
1191 1184
1192 if (!Input_Context 1185 if (!Input_Context
… …
1298/* 1291/*
1299 * Try to open a XIM with the current modifiers, then see if we can 1292 * Try to open a XIM with the current modifiers, then see if we can
1300 * open a suitable preedit type 1293 * open a suitable preedit type
1301 */ 1294 */
1302bool 1295bool
1303rxvt_term::IM_get_IC (const char *modifiers) 1296rxvt_term::im_get_ic (const char *modifiers)
1304{ 1297{
1305 int i, j, found; 1298 int i, j, found;
1306 XIM xim; 1299 XIM xim;
1307 XPoint spot; 1300 XPoint spot;
1308 XRectangle rect, status_rect, needed_rect; 1301 XRectangle rect, status_rect, needed_rect;
1309 unsigned long fg, bg; 1302 unsigned long fg, bg;
1310 const char *p; 1303 const char *p;
1311 char **s; 1304 char **s;
1312 XIMStyles *xim_styles; 1305 XIMStyles *xim_styles;
1313#ifdef ENABLE_XIM_ONTHESPOT
1314 XIMCallback xcb[4];
1315#endif
1316 1306
1317 set_environ (envv); 1307 set_environ (envv);
1318 1308
1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1309 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1320 return false; 1310 return false;
… …
1460 NULL); 1450 NULL);
1461 } 1451 }
1462#if ENABLE_XIM_ONTHESPOT 1452#if ENABLE_XIM_ONTHESPOT
1463 else if (input_style & XIMPreeditCallbacks) 1453 else if (input_style & XIMPreeditCallbacks)
1464 { 1454 {
1455 XIMCallback xcb[4];
1456
1465 im_set_position (spot); 1457 im_set_position (spot);
1466 1458
1467 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1459 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1468 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1460 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1469 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1461 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1484#endif 1476#endif
1485 1477
1486 Input_Context = XCreateIC (xim, 1478 Input_Context = XCreateIC (xim,
1487 XNInputStyle, input_style, 1479 XNInputStyle, input_style,
1488 XNClientWindow, vt, 1480 XNClientWindow, vt,
1489 XNFocusWindow, parent[0], 1481 XNFocusWindow, parent,
1490 preedit_attr ? XNPreeditAttributes : NULL, 1482 preedit_attr ? XNPreeditAttributes : NULL,
1491 preedit_attr, 1483 preedit_attr,
1492 status_attr ? XNStatusAttributes : NULL, 1484 status_attr ? XNStatusAttributes : NULL,
1493 status_attr, NULL); 1485 status_attr, NULL);
1494 1486
… …
1507 // unfortunately, only the focus window is used by XIM, hard to fix 1499 // unfortunately, only the focus window is used by XIM, hard to fix
1508 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1500 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1509 vt_select_input (); 1501 vt_select_input ();
1510#endif 1502#endif
1511 1503
1512 IMSetPosition (); 1504 im_set_position ();
1513 1505
1514 return true; 1506 return true;
1515} 1507}
1516 1508
1517void 1509void
… …
1545 { 1537 {
1546 if (*s[i]) 1538 if (*s[i])
1547 { 1539 {
1548 strcpy (buf, "@im="); 1540 strcpy (buf, "@im=");
1549 strncat (buf, s[i], IMBUFSIZ - 5); 1541 strncat (buf, s[i], IMBUFSIZ - 5);
1550 if (IM_get_IC (buf)) 1542 if (im_get_ic (buf))
1551 { 1543 {
1552 found = true; 1544 found = true;
1553 break; 1545 break;
1554 } 1546 }
1555 } 1547 }
… …
1560 if (found) 1552 if (found)
1561 goto done; 1553 goto done;
1562 } 1554 }
1563 1555
1564 /* try with XMODIFIERS env. var. */ 1556 /* try with XMODIFIERS env. var. */
1565 if (IM_get_IC ("")) 1557 if (im_get_ic (""))
1566 goto done; 1558 goto done;
1567 1559
1568 /* try with no modifiers base IF the user didn't specify an IM */ 1560 /* try with no modifiers base IF the user didn't specify an IM */
1569 if (IM_get_IC ("@im=none")) 1561 if (im_get_ic ("@im=none"))
1570 goto done; 1562 goto done;
1571 1563
1572done: 1564done:
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1565#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1566 if (rs[Rs_imLocale])
1575 SET_LOCALE (locale); 1567 SET_LOCALE (locale);
1576#endif 1568#endif
1577} 1569}
1578 1570
1579void 1571void
1580rxvt_term::IMSetPosition () 1572rxvt_term::im_set_position ()
1581{ 1573{
1582 XRectangle preedit_rect, status_rect, *needed_rect; 1574 XRectangle preedit_rect, status_rect, *needed_rect;
1583 XVaNestedList preedit_attr, status_attr; 1575 XVaNestedList preedit_attr, status_attr;
1584 1576
1585 if (!Input_Context 1577 if (!Input_Context
1586 || !focus 1578 || !focus
1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1579 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1588 || !IMisRunning ()) 1580 || !im_is_running ())
1589 return; 1581 return;
1590 1582
1591 if (input_style & XIMPreeditPosition) 1583 if (input_style & XIMPreeditPosition)
1592 { 1584 {
1593 im_set_size (preedit_rect); 1585 im_set_size (preedit_rect);
… …
1623 1615
1624void 1616void
1625rxvt_term::get_window_origin (int &x, int &y) 1617rxvt_term::get_window_origin (int &x, int &y)
1626{ 1618{
1627 Window cr; 1619 Window cr;
1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1620 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1629} 1621}
1630 1622
1631Pixmap 1623Pixmap
1632rxvt_term::get_pixmap_property (Atom property) 1624rxvt_term::get_pixmap_property (Atom property)
1633{ 1625{

Diff Legend

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