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.330 by sf-exg, Mon Jul 26 09:57:53 2010 UTC vs.
Revision 1.347 by sf-exg, Mon Jan 10 14:07:19 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.
… …
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));
… …
359 make_current (); 359 make_current ();
360 360
361 delete this; 361 delete this;
362} 362}
363 363
364void
365rxvt_term::set_option (uint8_t opt, bool set)
366{
367 if (!opt)
368 return;
369
370 uint8_t mask = 1 << (opt & 7);
371 uint8_t &val = options [opt >> 3];
372
373 val = val & ~mask | (set ? mask : 0);
374}
375
364/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
365/* 377/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
367 * TODO: if debugging, this should free up any known resources if we can 379 * TODO: if debugging, this should free up any known resources if we can
368 */ 380 */
… …
380print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
381{ 393{
382 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
384 char number[32]; 396 char number[32];
385 char *mtype = "XlibMessage"; 397 const char mtype[] = "XlibMessage";
386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
389 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("%s: %s\n", mesg, buffer);
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
… …
474 rxvt_emergency_cleanup (); 486 rxvt_emergency_cleanup ();
475 w.stop (); 487 w.stop ();
476 kill (getpid (), w.signum); 488 kill (getpid (), w.signum);
477} 489}
478 490
491static void
492rxvt_get_ttymode (struct termios *tio)
493{
494 if (tcgetattr (STDIN_FILENO, tio) < 0)
495 memset (tio, 0, sizeof (struct termios));
496
497 for (int i = 0; i < NCCS; i++)
498 tio->c_cc[i] = VDISABLE;
499
500 tio->c_cc[VINTR] = CINTR;
501 tio->c_cc[VQUIT] = CQUIT;
502 tio->c_cc[VERASE] = CERASE;
503#ifdef VERASE2
504 tio->c_cc[VERASE2] = CERASE2;
505#endif
506 tio->c_cc[VKILL] = CKILL;
507 tio->c_cc[VEOF] = CEOF;
508 tio->c_cc[VSTART] = CSTART;
509 tio->c_cc[VSTOP] = CSTOP;
510 tio->c_cc[VSUSP] = CSUSP;
511# ifdef VDSUSP
512 tio->c_cc[VDSUSP] = CDSUSP;
513# endif
514# ifdef VREPRINT
515 tio->c_cc[VREPRINT] = CRPRNT;
516# endif
517# ifdef VDISCRD
518 tio->c_cc[VDISCRD] = CFLUSH;
519# endif
520# ifdef VWERSE
521 tio->c_cc[VWERSE] = CWERASE;
522# endif
523# ifdef VLNEXT
524 tio->c_cc[VLNEXT] = CLNEXT;
525# endif
526# ifdef VSTATUS
527 tio->c_cc[VSTATUS] = CSTATUS;
528# endif
529
530# if VMIN != VEOF
531 tio->c_cc[VMIN] = 1;
532# endif
533# if VTIME != VEOL
534 tio->c_cc[VTIME] = 0;
535# endif
536
537 /* input modes */
538 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
539# ifdef IMAXBEL
540 | IMAXBEL
541# endif
542 | IXON);
543
544 /* output modes */
545 tio->c_oflag = (OPOST | ONLCR);
546
547 /* control modes */
548 tio->c_cflag = (CS8 | CREAD);
549
550 /* local modes */
551 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
552# if defined (ECHOCTL) && defined (ECHOKE)
553 | ECHOCTL | ECHOKE
554# endif
555 | ECHOE | ECHOK);
556}
557
479char **rxvt_environ; // startup environment 558char **rxvt_environ; // startup environment
480 559
481void 560void
482rxvt_init () 561rxvt_init ()
483{ 562{
484 assert (("fontMask must not overlap other RS masks", 563 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); 564 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486 565
487 ptytty::init (); 566 rxvt_get_ttymode (&rxvt_term::def_tio);
488 567
568 // get rid of stdin/stdout as we don't need them, to free resources
569 dup2 (STDERR_FILENO, STDIN_FILENO);
570 dup2 (STDERR_FILENO, STDOUT_FILENO);
571
489 if (!ev_default_loop (0)) 572 if (!ev_default_loop ())
490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 573 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
491 574
492 rxvt_environ = environ; 575 rxvt_environ = environ;
493 576
494 signal (SIGHUP, SIG_IGN); 577 signal (SIGHUP, SIG_IGN);
… …
873void 956void
874rxvt_term::set_colorfgbg () 957rxvt_term::set_colorfgbg ()
875{ 958{
876 unsigned int i; 959 unsigned int i;
877 const char *xpmb = ""; 960 const char *xpmb = "";
878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 961 char fstr[] = "default";
962 char bstr[] = "default";
879 963
880 strcpy (fstr, "default");
881 strcpy (bstr, "default");
882 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
883 if (pix_colors[Color_fg] == pix_colors[i]) 965 if (pix_colors[Color_fg] == pix_colors[i])
884 { 966 {
885 sprintf (fstr, "%d", (i - Color_Black)); 967 sprintf (fstr, "%d", i - Color_Black);
886 break; 968 break;
887 } 969 }
888 970
889 for (i = Color_Black; i <= Color_White; i++) 971 for (i = Color_Black; i <= Color_White; i++)
890 if (pix_colors[Color_bg] == pix_colors[i]) 972 if (pix_colors[Color_bg] == pix_colors[i])
891 { 973 {
892 sprintf (bstr, "%d", (i - Color_Black)); 974 sprintf (bstr, "%d", i - Color_Black);
893#ifdef BG_IMAGE_FROM_FILE 975#ifdef BG_IMAGE_FROM_FILE
894 xpmb = "default;"; 976 xpmb = "default;";
895#endif 977#endif
896 break; 978 break;
897 } 979 }
… …
1271 p = pet[pi]; 1353 p = pet[pi];
1272 1354
1273 if (!p) 1355 if (!p)
1274 continue; 1356 continue;
1275 1357
1276 s = rxvt_splitcommastring (p); 1358 s = rxvt_strsplit (',', p);
1277 1359
1278 for (i = found = 0; !found && s[i]; i++) 1360 for (i = found = 0; !found && s[i]; i++)
1279 { 1361 {
1280 if (!strcmp (s[i], "OverTheSpot")) 1362 if (!strcmp (s[i], "OverTheSpot"))
1281 input_style = XIMPreeditPosition | XIMStatusNothing; 1363 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1293 input_style = XIMPreeditNothing | XIMStatusNothing; 1375 input_style = XIMPreeditNothing | XIMStatusNothing;
1294 1376
1295 for (j = 0; j < xim_styles->count_styles; j++) 1377 for (j = 0; j < xim_styles->count_styles; j++)
1296 if (input_style == xim_styles->supported_styles[j]) 1378 if (input_style == xim_styles->supported_styles[j])
1297 { 1379 {
1298 rxvt_freecommastring (s); 1380 rxvt_free_strsplit (s);
1299 1381
1300 found = 1; 1382 found = 1;
1301 goto foundpet; 1383 goto foundpet;
1302 } 1384 }
1303 1385
1304 } 1386 }
1305 1387
1306 rxvt_freecommastring (s); 1388 rxvt_free_strsplit (s);
1307 } 1389 }
1308 1390
1309foundpet: 1391foundpet:
1310 1392
1311 XFree (xim_styles); 1393 XFree (xim_styles);
… …
1467 p = rs[Rs_inputMethod]; 1549 p = rs[Rs_inputMethod];
1468 if (p && *p) 1550 if (p && *p)
1469 { 1551 {
1470 bool found = false; 1552 bool found = false;
1471 1553
1472 s = rxvt_splitcommastring (p); 1554 s = rxvt_strsplit (',', p);
1473 1555
1474 for (i = 0; s[i]; i++) 1556 for (i = 0; s[i]; i++)
1475 { 1557 {
1476 if (*s[i]) 1558 if (*s[i])
1477 { 1559 {
… …
1483 break; 1565 break;
1484 } 1566 }
1485 } 1567 }
1486 } 1568 }
1487 1569
1488 rxvt_freecommastring (s); 1570 rxvt_free_strsplit (s);
1489 1571
1490 if (found) 1572 if (found)
1491 goto done; 1573 goto done;
1492 } 1574 }
1493 1575
… …
1554void 1636void
1555rxvt_term::get_window_origin (int &x, int &y) 1637rxvt_term::get_window_origin (int &x, int &y)
1556{ 1638{
1557 Window cr; 1639 Window cr;
1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1640 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560} 1641}
1561 1642
1562Pixmap 1643Pixmap
1563rxvt_term::get_pixmap_property (int prop_id) 1644rxvt_term::get_pixmap_property (Atom property)
1564{ 1645{
1565 if (prop_id > 0 && prop_id < NUM_XA) 1646 Pixmap pixmap = None;
1566 if (xa[prop_id]) 1647
1567 {
1568 int aformat; 1648 int aformat;
1569 unsigned long nitems, bytes_after; 1649 unsigned long nitems, bytes_after;
1570 Atom atype; 1650 Atom atype;
1571 unsigned char *prop = NULL; 1651 unsigned char *prop;
1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1652 int result = XGetWindowProperty (dpy, display->root, property,
1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1653 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574 &nitems, &bytes_after, &prop); 1654 &nitems, &bytes_after, &prop);
1575 if (result == Success && prop && atype == XA_PIXMAP) 1655 if (result == Success)
1656 {
1657 if (atype == XA_PIXMAP)
1576 return *(Pixmap *)prop; 1658 pixmap = *(Pixmap *)prop;
1659 XFree (prop);
1577 } 1660 }
1578 1661
1579 return None; 1662 return pixmap;
1580} 1663}
1581 1664
1582#ifdef HAVE_BG_PIXMAP 1665#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 1666
1593void 1667void
1594rxvt_term::update_background () 1668rxvt_term::update_background ()
1595{ 1669{
1596 if (update_background_ev.is_active ()) 1670 if (update_background_ev.is_active ())

Diff Legend

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