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.336 by sf-exg, Tue Nov 2 13:32:50 2010 UTC vs.
Revision 1.353 by sf-exg, Sat Feb 12 00:30:00 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-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <pcg@goof.com>
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.
… …
96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97{ 97{
98 compose_char *cc; 98 compose_char *cc;
99 99
100 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
101 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
102 cc = (*this)[c1]; 102 cc = (*this)[c1];
103 while (cc) 103 while (cc)
104 { 104 {
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.end (); cc-- > v.begin (); )
111 {
112 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
113 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
114 }
115 113
116 // allocate a new combination 114 // allocate a new combination
117 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118 { 116 {
119 static int seen; 117 static int seen;
120 118
121 if (!seen++) 119 if (!seen++)
122 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123 121
124 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
125 } 123 }
126 124
127 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
189#endif 187#endif
190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 194
198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199 196
… …
228 delete fontset[i]; 225 delete fontset[i];
229#endif 226#endif
230 delete fontset[0]; 227 delete fontset[0];
231 228
232#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy (); 230 bg_destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif 231#endif
241 232
242 if (display) 233 if (display)
243 { 234 {
244 selection_clear (); 235 selection_clear ();
… …
281 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
282 free (env_display); 273 free (env_display);
283 free (env_term); 274 free (env_term);
284 free (locale); 275 free (locale);
285 free (v_buffer); 276 free (v_buffer);
286 free (incr_buf); 277
278 delete selection_req;
287 279
288 delete envv; 280 delete envv;
289 delete argv; 281 delete argv;
290 282
291#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
… …
327#endif 319#endif
328 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
329#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
330 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
331#endif 323#endif
332 incr_ev.stop ();
333 termwin_ev.stop (display); 324 termwin_ev.stop (display);
334 vt_ev.stop (display); 325 vt_ev.stop (display);
335 } 326 }
336 327
337 flush_ev.stop (); 328 flush_ev.stop ();
… …
359rxvt_term::destroy_cb (ev::idle &w, int revents) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
360{ 351{
361 make_current (); 352 make_current ();
362 353
363 delete this; 354 delete this;
355}
356
357void
358rxvt_term::set_option (uint8_t opt, bool set)
359{
360 if (!opt)
361 return;
362
363 uint8_t mask = 1 << (opt & 7);
364 uint8_t &val = options [opt >> 3];
365
366 val = val & ~mask | (set ? mask : 0);
364} 367}
365 368
366/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
367/* 370/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
382print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
383{ 386{
384 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
386 char number[32]; 389 char number[32];
387 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 393 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
391 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
… …
946void 949void
947rxvt_term::set_colorfgbg () 950rxvt_term::set_colorfgbg ()
948{ 951{
949 unsigned int i; 952 unsigned int i;
950 const char *xpmb = ""; 953 const char *xpmb = "";
951 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
952 956
953 strcpy (fstr, "default");
954 strcpy (bstr, "default");
955 for (i = Color_Black; i <= Color_White; i++) 957 for (i = Color_Black; i <= Color_White; i++)
956 if (pix_colors[Color_fg] == pix_colors[i]) 958 if (pix_colors[Color_fg] == pix_colors[i])
957 { 959 {
958 sprintf (fstr, "%d", (i - Color_Black)); 960 sprintf (fstr, "%d", i - Color_Black);
959 break; 961 break;
960 } 962 }
961 963
962 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
963 if (pix_colors[Color_bg] == pix_colors[i]) 965 if (pix_colors[Color_bg] == pix_colors[i])
964 { 966 {
965 sprintf (bstr, "%d", (i - Color_Black)); 967 sprintf (bstr, "%d", i - Color_Black);
966#ifdef BG_IMAGE_FROM_FILE 968#ifdef BG_IMAGE_FROM_FILE
967 xpmb = "default;"; 969 xpmb = "default;";
968#endif 970#endif
969 break; 971 break;
970 } 972 }
… …
1073 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
1074 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
1075 width, height); 1077 width, height);
1076 1078
1077#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
1078 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
1079 update_background (); 1081 update_background ();
1080#endif 1082#endif
1081 } 1083 }
1082 1084
1083 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
1084 scr_reset (); 1086 scr_reset ();
1085
1086#ifdef HAVE_BG_PIXMAP
1087// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1088// if (bgPixmap.pixmap)
1089// scr_touch (false);
1090#endif
1091 1087
1092#ifdef USE_XIM 1088#ifdef USE_XIM
1093 IMSetPosition (); 1089 IMSetPosition ();
1094#endif 1090#endif
1095} 1091}
… …
1178 1174
1179 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1180 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1181 1177
1182 if (win != None) 1178 if (win != None)
1183 return True; 1179 return true;
1184 } 1180 }
1185 1181
1186 return False; 1182 return false;
1187} 1183}
1188 1184
1189void 1185void
1190rxvt_term::IMSendSpot () 1186rxvt_term::IMSendSpot ()
1191{ 1187{
… …
1344 p = pet[pi]; 1340 p = pet[pi];
1345 1341
1346 if (!p) 1342 if (!p)
1347 continue; 1343 continue;
1348 1344
1349 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1350 1346
1351 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1352 { 1348 {
1353 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1354 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1366 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1367 1363
1368 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1369 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1370 { 1366 {
1371 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1372 1368
1373 found = 1; 1369 found = 1;
1374 goto foundpet; 1370 goto foundpet;
1375 } 1371 }
1376 1372
1377 } 1373 }
1378 1374
1379 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1380 } 1376 }
1381 1377
1382foundpet: 1378foundpet:
1383 1379
1384 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1540 p = rs[Rs_inputMethod]; 1536 p = rs[Rs_inputMethod];
1541 if (p && *p) 1537 if (p && *p)
1542 { 1538 {
1543 bool found = false; 1539 bool found = false;
1544 1540
1545 s = rxvt_splitcommastring (p); 1541 s = rxvt_strsplit (',', p);
1546 1542
1547 for (i = 0; s[i]; i++) 1543 for (i = 0; s[i]; i++)
1548 { 1544 {
1549 if (*s[i]) 1545 if (*s[i])
1550 { 1546 {
… …
1556 break; 1552 break;
1557 } 1553 }
1558 } 1554 }
1559 } 1555 }
1560 1556
1561 rxvt_freecommastring (s); 1557 rxvt_free_strsplit (s);
1562 1558
1563 if (found) 1559 if (found)
1564 goto done; 1560 goto done;
1565 } 1561 }
1566 1562
… …
1630 Window cr; 1626 Window cr;
1631 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1627 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1632} 1628}
1633 1629
1634Pixmap 1630Pixmap
1635rxvt_term::get_pixmap_property (int prop_id) 1631rxvt_term::get_pixmap_property (Atom property)
1636{ 1632{
1637 if (prop_id > 0 && prop_id < NUM_XA) 1633 Pixmap pixmap = None;
1638 if (xa[prop_id]) 1634
1639 {
1640 int aformat; 1635 int aformat;
1641 unsigned long nitems, bytes_after; 1636 unsigned long nitems, bytes_after;
1642 Atom atype; 1637 Atom atype;
1643 unsigned char *prop = NULL; 1638 unsigned char *prop;
1644 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1639 int result = XGetWindowProperty (dpy, display->root, property,
1645 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1640 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1646 &nitems, &bytes_after, &prop); 1641 &nitems, &bytes_after, &prop);
1647 if (result == Success && prop && atype == XA_PIXMAP) 1642 if (result == Success)
1643 {
1644 if (atype == XA_PIXMAP)
1648 return *(Pixmap *)prop; 1645 pixmap = *(Pixmap *)prop;
1646 XFree (prop);
1649 } 1647 }
1650 1648
1651 return None; 1649 return pixmap;
1652} 1650}
1653 1651
1654#ifdef HAVE_BG_PIXMAP 1652#ifdef HAVE_BG_PIXMAP
1655 1653
1656void 1654void
1657rxvt_term::update_background () 1655rxvt_term::update_background ()
1658{ 1656{
1659 if (update_background_ev.is_active ()) 1657 if (update_background_ev.is_active ())
1660 return; 1658 return;
1661 1659
1662 bgPixmap.invalidate (); 1660 bg_invalidate ();
1663 1661
1664 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1665 1663
1666 if (to_wait <= 0.) 1664 if (to_wait <= 0.)
1667 bgPixmap.render (); 1665 bg_render ();
1668 else 1666 else
1669 update_background_ev.start (to_wait); 1667 update_background_ev.start (to_wait);
1670} 1668}
1671 1669
1672void 1670void
1673rxvt_term::update_background_cb (ev::timer &w, int revents) 1671rxvt_term::update_background_cb (ev::timer &w, int revents)
1674{ 1672{
1675 make_current (); 1673 make_current ();
1676 1674
1677 update_background_ev.stop (); 1675 update_background_ev.stop ();
1678 bgPixmap.render (); 1676 bg_render ();
1679 refresh_check (); 1677 refresh_check ();
1680} 1678}
1681 1679
1682#endif /* HAVE_BG_PIXMAP */ 1680#endif /* HAVE_BG_PIXMAP */
1683 1681

Diff Legend

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