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.317 by root, Tue May 12 08:21:56 2009 UTC vs.
Revision 1.343 by sf-exg, Tue Dec 21 10:37:42 2010 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
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
… …
49# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <clocale>
51# endif 53# endif
52#endif 54#endif
53 55
56struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
55 58
56// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
58 61
… …
101 { 104 {
102 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
104 } 107 }
105 108
106 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
108 { 111 {
109 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
111 } 114 }
… …
237#endif 240#endif
238 241
239 if (display) 242 if (display)
240 { 243 {
241 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
242 246
243#ifdef USE_XIM 247#ifdef USE_XIM
244 im_destroy (); 248 im_destroy ();
245#endif 249#endif
246 scrollBar.destroy (); 250 scrollBar.destroy ();
… …
271 /* clear all resources */ 275 /* clear all resources */
272 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 277 free (allocated [i]);
274 278
275 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
276 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
277 free (env_display); 282 free (env_display);
278 free (env_term); 283 free (env_term);
279 free (locale); 284 free (locale);
280 free (v_buffer); 285 free (v_buffer);
… …
356 make_current (); 361 make_current ();
357 362
358 delete this; 363 delete this;
359} 364}
360 365
366void
367rxvt_term::set_option (uint8_t opt, bool set)
368{
369 if (!opt)
370 return;
371
372 uint8_t mask = 1 << (opt & 7);
373 uint8_t &val = options [opt >> 3];
374
375 val = val & ~mask | (set ? mask : 0);
376}
377
361/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
362/* 379/*
363 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
364 * TODO: if debugging, this should free up any known resources if we can 381 * TODO: if debugging, this should free up any known resources if we can
365 */ 382 */
… …
377print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
378{ 395{
379 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
381 char number[32]; 398 char number[32];
382 char *mtype = "XlibMessage"; 399 const char mtype[] = "XlibMessage";
383 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
384 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 402 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386 rxvt_warn ("%s: %s\n", mesg, buffer); 403 rxvt_warn ("%s: %s\n", mesg, buffer);
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389 sprintf(number, "%d", event->request_code); 406 sprintf(number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer); 408 rxvt_warn ("(which is %s)\n", buffer);
392 if (event->request_code >= 128) { 409 if (event->request_code >= 128) {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394 mesg, BUFSIZ); 411 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 } 413 }
397 if ((event->error_code == BadWindow) || 414 if ((event->error_code == BadWindow) ||
398 (event->error_code == BadPixmap) || 415 (event->error_code == BadPixmap) ||
399 (event->error_code == BadCursor) || 416 (event->error_code == BadCursor) ||
400 (event->error_code == BadFont) || 417 (event->error_code == BadFont) ||
401 (event->error_code == BadDrawable) || 418 (event->error_code == BadDrawable) ||
402 (event->error_code == BadColor) || 419 (event->error_code == BadColor) ||
403 (event->error_code == BadGC) || 420 (event->error_code == BadGC) ||
404 (event->error_code == BadIDChoice) || 421 (event->error_code == BadIDChoice) ||
405 (event->error_code == BadValue) || 422 (event->error_code == BadValue) ||
406 (event->error_code == BadAtom)) { 423 (event->error_code == BadAtom)) {
407 if (event->error_code == BadValue) 424 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
409 mesg, BUFSIZ); 426 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom) 427 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
412 mesg, BUFSIZ); 429 mesg, BUFSIZ);
413 else 430 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 432 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 434 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 436 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 438}
422#endif 439#endif
423 440
424int 441int
… …
471 rxvt_emergency_cleanup (); 488 rxvt_emergency_cleanup ();
472 w.stop (); 489 w.stop ();
473 kill (getpid (), w.signum); 490 kill (getpid (), w.signum);
474} 491}
475 492
493static void
494rxvt_get_ttymode (struct termios *tio)
495{
496 if (tcgetattr (STDIN_FILENO, tio) < 0)
497 memset (tio, 0, sizeof (struct termios));
498
499 for (int i = 0; i < NCCS; i++)
500 tio->c_cc[i] = VDISABLE;
501
502 tio->c_cc[VINTR] = CINTR;
503 tio->c_cc[VQUIT] = CQUIT;
504 tio->c_cc[VERASE] = CERASE;
505#ifdef VERASE2
506 tio->c_cc[VERASE2] = CERASE2;
507#endif
508 tio->c_cc[VKILL] = CKILL;
509 tio->c_cc[VEOF] = CEOF;
510 tio->c_cc[VSTART] = CSTART;
511 tio->c_cc[VSTOP] = CSTOP;
512 tio->c_cc[VSUSP] = CSUSP;
513# ifdef VDSUSP
514 tio->c_cc[VDSUSP] = CDSUSP;
515# endif
516# ifdef VREPRINT
517 tio->c_cc[VREPRINT] = CRPRNT;
518# endif
519# ifdef VDISCRD
520 tio->c_cc[VDISCRD] = CFLUSH;
521# endif
522# ifdef VWERSE
523 tio->c_cc[VWERSE] = CWERASE;
524# endif
525# ifdef VLNEXT
526 tio->c_cc[VLNEXT] = CLNEXT;
527# endif
528# ifdef VSTATUS
529 tio->c_cc[VSTATUS] = CSTATUS;
530# endif
531
532# if VMIN != VEOF
533 tio->c_cc[VMIN] = 1;
534# endif
535# if VTIME != VEOL
536 tio->c_cc[VTIME] = 0;
537# endif
538
539 /* input modes */
540 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
541# ifdef IMAXBEL
542 | IMAXBEL
543# endif
544 | IXON);
545
546 /* output modes */
547 tio->c_oflag = (OPOST | ONLCR);
548
549 /* control modes */
550 tio->c_cflag = (CS8 | CREAD);
551
552 /* local modes */
553 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
554# if defined (ECHOCTL) && defined (ECHOKE)
555 | ECHOCTL | ECHOKE
556# endif
557 | ECHOE | ECHOK);
558}
559
476char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
477 561
478void 562void
479rxvt_init () 563rxvt_init ()
480{ 564{
481 ptytty::init (); 565 assert (("fontMask must not overlap other RS masks",
566 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
482 567
568 rxvt_get_ttymode (&rxvt_term::def_tio);
569
570 // get rid of stdin/stdout as we don't need them, to free resources
571 dup2 (STDERR_FILENO, STDIN_FILENO);
572 dup2 (STDERR_FILENO, STDOUT_FILENO);
573
483 if (!ev_default_loop (0)) 574 if (!ev_default_loop ())
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 575 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
485 576
486 rxvt_environ = environ; 577 rxvt_environ = environ;
487 578
488 signal (SIGHUP, SIG_IGN); 579 signal (SIGHUP, SIG_IGN);
489 signal (SIGPIPE, SIG_IGN); 580 signal (SIGPIPE, SIG_IGN);
490 581
491 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 582 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
492 sig_handlers.sw_int.start (SIGINT); ev_unref (); 583 sig_handlers.sw_int.start (SIGINT); ev_unref ();
493
494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
495 /* signal (SIGURG, SIG_DFL); */
496 584
497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 585 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
498 // TODO: handle this with exceptions and tolerate the memory loss 586 // TODO: handle this with exceptions and tolerate the memory loss
499 XSetIOErrorHandler (rxvt_xioerror_handler); 587 XSetIOErrorHandler (rxvt_xioerror_handler);
500 588
… …
686#endif 774#endif
687 775
688 delete fontset[0]; 776 delete fontset[0];
689 fontset[0] = fs; 777 fontset[0] = fs;
690 778
691 prop = (*fs)[1]->properties (); 779 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
692 prop.height += lineSpace; 780 prop.height += lineSpace;
781 prop.width += letterSpace;
693 782
694 fs->set_prop (prop, false); 783 fs->set_prop (prop, false);
695 784
696 fwidth = prop.width; 785 fwidth = prop.width;
697 fheight = prop.height; 786 fheight = prop.height;
… …
747 prop, XA_STRING, 8, PropModeReplace, 836 prop, XA_STRING, 8, PropModeReplace,
748 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 837 (const unsigned char *)str, len >= 0 ? len : strlen (str));
749} 838}
750 839
751void 840void
841rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
842{
843 XTextProperty ct;
844
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 {
847 XSetTextProperty (dpy, parent[0], &ct, prop);
848 XFree (ct.value);
849 }
850}
851
852void
752rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
753{ 854{
754 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
755 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
756 857
… …
766/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
767/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
768void 869void
769rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
770{ 871{
771 set_string_property (XA_WM_NAME, str); 872 set_mbstring_property (XA_WM_NAME, str);
772#if ENABLE_EWMH 873#if ENABLE_EWMH
773 set_utf8_property (xa[XA_NET_WM_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_NAME], str);
774#endif 875#endif
775} 876}
776 877
777void 878void
778rxvt_term::set_icon_name (const char *str) 879rxvt_term::set_icon_name (const char *str)
779{ 880{
780 set_string_property (XA_WM_ICON_NAME, str); 881 set_mbstring_property (XA_WM_ICON_NAME, str);
781#if ENABLE_EWMH 882#if ENABLE_EWMH
782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
783#endif 884#endif
784} 885}
785 886
… …
992 } 1093 }
993 1094
994 if (fix_screen || old_height == 0) 1095 if (fix_screen || old_height == 0)
995 scr_reset (); 1096 scr_reset ();
996 1097
997 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
998 //scr_touch (false);
999
1000#ifdef HAVE_BG_PIXMAP 1098#ifdef HAVE_BG_PIXMAP
1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1099// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1002// if (bgPixmap.pixmap) 1100// if (bgPixmap.pixmap)
1003// scr_touch (false); 1101// scr_touch (false);
1004#endif 1102#endif
… …
1162 1260
1163 term->make_current (); 1261 term->make_current ();
1164 1262
1165 if (text) 1263 if (text)
1166 { 1264 {
1167 void *str; 1265 wchar_t *str;
1168 1266
1169 if (!text->encoding_is_wchar && text->string.multi_byte) 1267 if (!text->encoding_is_wchar && text->string.multi_byte)
1170 { 1268 {
1171 // of course, X makes it ugly again 1269 // of course, X makes it ugly again
1172 if (term->rs[Rs_imLocale]) 1270 if (term->rs[Rs_imLocale])
1173 SET_LOCALE (term->rs[Rs_imLocale]); 1271 SET_LOCALE (term->rs[Rs_imLocale]);
1174 1272
1175 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1273 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1176 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1274 mbstowcs (str, text->string.multi_byte, text->length + 1);
1177 1275
1178 if (term->rs[Rs_imLocale]) 1276 if (term->rs[Rs_imLocale])
1179 SET_LOCALE (term->locale); 1277 SET_LOCALE (term->locale);
1180 } 1278 }
1181 else 1279 else
1182 str = (void *)text->string.wide_char; 1280 str = text->string.wide_char;
1183 1281
1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1282 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1185 DT_INT, call_data->caret, 1283 DT_INT, call_data->caret,
1186 DT_INT, call_data->chg_first, 1284 DT_INT, call_data->chg_first,
1187 DT_INT, call_data->chg_length, 1285 DT_INT, call_data->chg_length,
… …
1541void 1639void
1542rxvt_term::get_window_origin (int &x, int &y) 1640rxvt_term::get_window_origin (int &x, int &y)
1543{ 1641{
1544 Window cr; 1642 Window cr;
1545 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1546/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1547} 1644}
1548 1645
1549Pixmap 1646Pixmap
1550rxvt_term::get_pixmap_property (int prop_id) 1647rxvt_term::get_pixmap_property (Atom property)
1551{ 1648{
1552 if (prop_id > 0 && prop_id < NUM_XA) 1649 Pixmap pixmap = None;
1553 if (xa[prop_id]) 1650
1554 {
1555 int aformat; 1651 int aformat;
1556 unsigned long nitems, bytes_after; 1652 unsigned long nitems, bytes_after;
1557 Atom atype; 1653 Atom atype;
1558 unsigned char *prop = NULL; 1654 unsigned char *prop;
1559 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1655 int result = XGetWindowProperty (dpy, display->root, property,
1560 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1656 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1561 &nitems, &bytes_after, &prop); 1657 &nitems, &bytes_after, &prop);
1562 if (result == Success && prop && atype == XA_PIXMAP) 1658 if (result == Success)
1659 {
1660 if (atype == XA_PIXMAP)
1563 return *(Pixmap *)prop; 1661 pixmap = *(Pixmap *)prop;
1662 XFree (prop);
1564 } 1663 }
1565 1664
1566 return None; 1665 return pixmap;
1567} 1666}
1568 1667
1569#ifdef HAVE_BG_PIXMAP 1668#ifdef HAVE_BG_PIXMAP
1570# if TRACE_PIXMAPS
1571# undef update_background
1572void
1573rxvt_term::trace_update_background (const char *file, int line)
1574{
1575 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1576 update_background ();
1577}
1578# endif
1579 1669
1580void 1670void
1581rxvt_term::update_background () 1671rxvt_term::update_background ()
1582{ 1672{
1583 if (update_background_ev.is_active ()) 1673 if (update_background_ev.is_active ())

Diff Legend

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