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.329 by sf-exg, Wed Jul 21 11:02:14 2010 UTC vs.
Revision 1.354 by root, Mon Feb 21 07:41:02 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 <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.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
… …
50# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
51# include <clocale> 52# include <clocale>
52# endif 53# endif
53#endif 54#endif
54 55
56struct termios rxvt_term::def_tio;
55vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
56 58
57// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
58rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
59 61
… …
94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
95{ 97{
96 compose_char *cc; 98 compose_char *cc;
97 99
98 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
99 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
100 cc = (*this)[c1]; 102 cc = (*this)[c1];
101 while (cc) 103 while (cc)
102 { 104 {
103 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
104 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
105 } 107 }
106 108
107 // check to see whether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
108 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
109 {
110 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
111 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
112 }
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)
116 { 116 {
117 static int seen; 117 static int seen;
118 118
119 if (!seen++) 119 if (!seen++)
120 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
121 121
122 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
123 } 123 }
124 124
125 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
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
… …
226 delete fontset[i]; 225 delete fontset[i];
227#endif 226#endif
228 delete fontset[0]; 227 delete fontset[0];
229 228
230#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 230 bg_destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 231#endif
239 232
240 if (display) 233 if (display)
241 { 234 {
242 selection_clear (); 235 selection_clear ();
… …
279 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
280 free (env_display); 273 free (env_display);
281 free (env_term); 274 free (env_term);
282 free (locale); 275 free (locale);
283 free (v_buffer); 276 free (v_buffer);
284 free (incr_buf); 277
278 delete selection_req;
285 279
286 delete envv; 280 delete envv;
287 delete argv; 281 delete argv;
288 282
289#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
… …
325#endif 319#endif
326 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
328 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
329#endif 323#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 324 termwin_ev.stop (display);
332 vt_ev.stop (display); 325 vt_ev.stop (display);
333 } 326 }
334 327
335 flush_ev.stop (); 328 flush_ev.stop ();
… …
357rxvt_term::destroy_cb (ev::idle &w, int revents) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
358{ 351{
359 make_current (); 352 make_current ();
360 353
361 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);
362} 367}
363 368
364/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
365/* 370/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
380print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
381{ 386{
382 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
384 char number[32]; 389 char number[32];
385 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 393 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
389 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
392 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
… …
474 rxvt_emergency_cleanup (); 479 rxvt_emergency_cleanup ();
475 w.stop (); 480 w.stop ();
476 kill (getpid (), w.signum); 481 kill (getpid (), w.signum);
477} 482}
478 483
484static void
485rxvt_get_ttymode (struct termios *tio)
486{
487 if (tcgetattr (STDIN_FILENO, tio) < 0)
488 memset (tio, 0, sizeof (struct termios));
489
490 for (int i = 0; i < NCCS; i++)
491 tio->c_cc[i] = VDISABLE;
492
493 tio->c_cc[VINTR] = CINTR;
494 tio->c_cc[VQUIT] = CQUIT;
495 tio->c_cc[VERASE] = CERASE;
496#ifdef VERASE2
497 tio->c_cc[VERASE2] = CERASE2;
498#endif
499 tio->c_cc[VKILL] = CKILL;
500 tio->c_cc[VEOF] = CEOF;
501 tio->c_cc[VSTART] = CSTART;
502 tio->c_cc[VSTOP] = CSTOP;
503 tio->c_cc[VSUSP] = CSUSP;
504# ifdef VDSUSP
505 tio->c_cc[VDSUSP] = CDSUSP;
506# endif
507# ifdef VREPRINT
508 tio->c_cc[VREPRINT] = CRPRNT;
509# endif
510# ifdef VDISCRD
511 tio->c_cc[VDISCRD] = CFLUSH;
512# endif
513# ifdef VWERSE
514 tio->c_cc[VWERSE] = CWERASE;
515# endif
516# ifdef VLNEXT
517 tio->c_cc[VLNEXT] = CLNEXT;
518# endif
519# ifdef VSTATUS
520 tio->c_cc[VSTATUS] = CSTATUS;
521# endif
522
523# if VMIN != VEOF
524 tio->c_cc[VMIN] = 1;
525# endif
526# if VTIME != VEOL
527 tio->c_cc[VTIME] = 0;
528# endif
529
530 /* input modes */
531 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
532# ifdef IMAXBEL
533 | IMAXBEL
534# endif
535 | IXON);
536
537 /* output modes */
538 tio->c_oflag = (OPOST | ONLCR);
539
540 /* control modes */
541 tio->c_cflag = (CS8 | CREAD);
542
543 /* local modes */
544 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
545# if defined (ECHOCTL) && defined (ECHOKE)
546 | ECHOCTL | ECHOKE
547# endif
548 | ECHOE | ECHOK);
549}
550
479char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
480 552
481void 553void
482rxvt_init () 554rxvt_init ()
483{ 555{
484 assert (("fontMask must not overlap other RS masks", 556 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); 557 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486 558
487 ptytty::init (); 559 rxvt_get_ttymode (&rxvt_term::def_tio);
488 560
561 // get rid of stdin/stdout as we don't need them, to free resources
562 dup2 (STDERR_FILENO, STDIN_FILENO);
563 dup2 (STDERR_FILENO, STDOUT_FILENO);
564
489 if (!ev_default_loop (0)) 565 if (!ev_default_loop ())
490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
491 567
492 rxvt_environ = environ; 568 rxvt_environ = environ;
493 569
494 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
… …
873void 949void
874rxvt_term::set_colorfgbg () 950rxvt_term::set_colorfgbg ()
875{ 951{
876 unsigned int i; 952 unsigned int i;
877 const char *xpmb = ""; 953 const char *xpmb = "";
878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
879 956
880 strcpy (fstr, "default");
881 strcpy (bstr, "default");
882 for (i = Color_Black; i <= Color_White; i++) 957 for (i = Color_Black; i <= Color_White; i++)
883 if (pix_colors[Color_fg] == pix_colors[i]) 958 if (pix_colors[Color_fg] == pix_colors[i])
884 { 959 {
885 sprintf (fstr, "%d", (i - Color_Black)); 960 sprintf (fstr, "%d", i - Color_Black);
886 break; 961 break;
887 } 962 }
888 963
889 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
890 if (pix_colors[Color_bg] == pix_colors[i]) 965 if (pix_colors[Color_bg] == pix_colors[i])
891 { 966 {
892 sprintf (bstr, "%d", (i - Color_Black)); 967 sprintf (bstr, "%d", i - Color_Black);
893#ifdef BG_IMAGE_FROM_FILE 968#ifdef BG_IMAGE_FROM_FILE
894 xpmb = "default;"; 969 xpmb = "default;";
895#endif 970#endif
896 break; 971 break;
897 } 972 }
… …
1000 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
1001 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
1002 width, height); 1077 width, height);
1003 1078
1004#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
1005 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
1006 update_background (); 1081 update_background ();
1007#endif 1082#endif
1008 } 1083 }
1009 1084
1010 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
1011 scr_reset (); 1086 scr_reset ();
1012
1013#ifdef HAVE_BG_PIXMAP
1014// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1015// if (bgPixmap.pixmap)
1016// scr_touch (false);
1017#endif
1018 1087
1019#ifdef USE_XIM 1088#ifdef USE_XIM
1020 IMSetPosition (); 1089 IMSetPosition ();
1021#endif 1090#endif
1022} 1091}
… …
1105 1174
1106 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1107 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1108 1177
1109 if (win != None) 1178 if (win != None)
1110 return True; 1179 return true;
1111 } 1180 }
1112 1181
1113 return False; 1182 return false;
1114} 1183}
1115 1184
1116void 1185void
1117rxvt_term::IMSendSpot () 1186rxvt_term::IMSendSpot ()
1118{ 1187{
… …
1271 p = pet[pi]; 1340 p = pet[pi];
1272 1341
1273 if (!p) 1342 if (!p)
1274 continue; 1343 continue;
1275 1344
1276 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1277 1346
1278 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1279 { 1348 {
1280 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1281 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1293 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1294 1363
1295 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1296 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1297 { 1366 {
1298 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1299 1368
1300 found = 1; 1369 found = 1;
1301 goto foundpet; 1370 goto foundpet;
1302 } 1371 }
1303 1372
1304 } 1373 }
1305 1374
1306 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1307 } 1376 }
1308 1377
1309foundpet: 1378foundpet:
1310 1379
1311 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1467 p = rs[Rs_inputMethod]; 1536 p = rs[Rs_inputMethod];
1468 if (p && *p) 1537 if (p && *p)
1469 { 1538 {
1470 bool found = false; 1539 bool found = false;
1471 1540
1472 s = rxvt_splitcommastring (p); 1541 s = rxvt_strsplit (',', p);
1473 1542
1474 for (i = 0; s[i]; i++) 1543 for (i = 0; s[i]; i++)
1475 { 1544 {
1476 if (*s[i]) 1545 if (*s[i])
1477 { 1546 {
… …
1483 break; 1552 break;
1484 } 1553 }
1485 } 1554 }
1486 } 1555 }
1487 1556
1488 rxvt_freecommastring (s); 1557 rxvt_free_strsplit (s);
1489 1558
1490 if (found) 1559 if (found)
1491 goto done; 1560 goto done;
1492 } 1561 }
1493 1562
… …
1554void 1623void
1555rxvt_term::get_window_origin (int &x, int &y) 1624rxvt_term::get_window_origin (int &x, int &y)
1556{ 1625{
1557 Window cr; 1626 Window cr;
1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1627 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560} 1628}
1561 1629
1562Pixmap 1630Pixmap
1563rxvt_term::get_pixmap_property (int prop_id) 1631rxvt_term::get_pixmap_property (Atom property)
1564{ 1632{
1565 if (prop_id > 0 && prop_id < NUM_XA) 1633 Pixmap pixmap = None;
1566 if (xa[prop_id]) 1634
1567 {
1568 int aformat; 1635 int aformat;
1569 unsigned long nitems, bytes_after; 1636 unsigned long nitems, bytes_after;
1570 Atom atype; 1637 Atom atype;
1571 unsigned char *prop = NULL; 1638 unsigned char *prop;
1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1639 int result = XGetWindowProperty (dpy, display->root, property,
1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1640 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574 &nitems, &bytes_after, &prop); 1641 &nitems, &bytes_after, &prop);
1575 if (result == Success && prop && atype == XA_PIXMAP) 1642 if (result == Success)
1643 {
1644 if (atype == XA_PIXMAP)
1576 return *(Pixmap *)prop; 1645 pixmap = *(Pixmap *)prop;
1646 XFree (prop);
1577 } 1647 }
1578 1648
1579 return None; 1649 return pixmap;
1580} 1650}
1581 1651
1582#ifdef HAVE_BG_PIXMAP 1652#ifdef HAVE_BG_PIXMAP
1583# if TRACE_PIXMAPS
1584# undef update_background
1585void
1586rxvt_term::trace_update_background (const char *file, int line)
1587{
1588 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1589 update_background ();
1590}
1591# endif
1592 1653
1593void 1654void
1594rxvt_term::update_background () 1655rxvt_term::update_background ()
1595{ 1656{
1596 if (update_background_ev.is_active ()) 1657 if (update_background_ev.is_active ())
1597 return; 1658 return;
1598 1659
1599 bgPixmap.invalidate (); 1660 bg_invalidate ();
1600 1661
1601 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1602 1663
1603 if (to_wait <= 0.) 1664 if (to_wait <= 0.)
1604 bgPixmap.render (); 1665 bg_render ();
1605 else 1666 else
1606 update_background_ev.start (to_wait); 1667 update_background_ev.start (to_wait);
1607} 1668}
1608 1669
1609void 1670void
1610rxvt_term::update_background_cb (ev::timer &w, int revents) 1671rxvt_term::update_background_cb (ev::timer &w, int revents)
1611{ 1672{
1612 make_current (); 1673 make_current ();
1613 1674
1614 update_background_ev.stop (); 1675 update_background_ev.stop ();
1615 bgPixmap.render (); 1676 bg_render ();
1616 refresh_check (); 1677 refresh_check ();
1617} 1678}
1618 1679
1619#endif /* HAVE_BG_PIXMAP */ 1680#endif /* HAVE_BG_PIXMAP */
1620 1681

Diff Legend

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