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.306 by ayin, Mon Feb 18 09:58:04 2008 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
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
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 97{
95 compose_char *cc; 98 compose_char *cc;
96 99
97 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 102 cc = (*this)[c1];
100 while (cc) 103 while (cc)
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 {
109 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
111 }
112 113
113 // allocate a new combination 114 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 116 {
116 static int seen; 117 static int seen;
117 118
118 if (!seen++) 119 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 121
121 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
122 } 123 }
123 124
124 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
227 delete fontset[0]; 228 delete fontset[0];
228 229
229#ifdef HAVE_BG_PIXMAP 230#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 231 bgPixmap.destroy ();
231#endif 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
232 239
233 if (display) 240 if (display)
234 { 241 {
235 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
236 244
237#ifdef USE_XIM 245#ifdef USE_XIM
238 im_destroy (); 246 im_destroy ();
239#endif 247#endif
240#ifdef XTERM_SCROLLBAR 248 scrollBar.destroy ();
241 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
242 if (ShadowGC) XFreeGC (dpy, ShadowGC);
243#endif
244#ifdef PLAIN_SCROLLBAR
245 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
246#endif
247#ifdef NEXT_SCROLLBAR
248 if (blackGC) XFreeGC (dpy, blackGC);
249 if (whiteGC) XFreeGC (dpy, whiteGC);
250 if (grayGC) XFreeGC (dpy, grayGC);
251 if (darkGC) XFreeGC (dpy, darkGC);
252 if (stippleGC) XFreeGC (dpy, stippleGC);
253 if (dimple) XFreePixmap (dpy, dimple);
254 if (upArrow) XFreePixmap (dpy, upArrow);
255 if (downArrow) XFreePixmap (dpy, downArrow);
256 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
257 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
258#endif
259#ifdef RXVT_SCROLLBAR
260 if (topShadowGC) XFreeGC (dpy, topShadowGC);
261 if (botShadowGC) XFreeGC (dpy, botShadowGC);
262 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
263#endif
264 if (gc) XFreeGC (dpy, gc); 249 if (gc) XFreeGC (dpy, gc);
265 250
266 delete drawable; 251 delete drawable;
267 // destroy all windows 252 // destroy all windows
268 if (parent[0]) 253 if (parent[0])
… …
288 /* clear all resources */ 273 /* clear all resources */
289 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
290 free (allocated [i]); 275 free (allocated [i]);
291 276
292 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
293 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
294 free (env_display); 280 free (env_display);
295 free (env_term); 281 free (env_term);
296 free (locale); 282 free (locale);
297 free (v_buffer); 283 free (v_buffer);
… …
373 make_current (); 359 make_current ();
374 360
375 delete this; 361 delete this;
376} 362}
377 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
378/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
379/* 377/*
380 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
381 * 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
382 */ 380 */
… …
394print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
395{ 393{
396 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
397 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
398 char number[32]; 396 char number[32];
399 char *mtype = "XlibMessage"; 397 const char mtype[] = "XlibMessage";
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("%s: %s\n", mesg, buffer);
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
406 sprintf(number, "%d", event->request_code); 404 sprintf(number, "%d", event->request_code);
407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
408 rxvt_warn ("(which is %s)\n", buffer); 406 rxvt_warn ("(which is %s)\n", buffer);
409 if (event->request_code >= 128) { 407 if (event->request_code >= 128) {
410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
411 mesg, BUFSIZ); 409 mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413 } 411 }
414 if ((event->error_code == BadWindow) || 412 if ((event->error_code == BadWindow) ||
415 (event->error_code == BadPixmap) || 413 (event->error_code == BadPixmap) ||
416 (event->error_code == BadCursor) || 414 (event->error_code == BadCursor) ||
417 (event->error_code == BadFont) || 415 (event->error_code == BadFont) ||
418 (event->error_code == BadDrawable) || 416 (event->error_code == BadDrawable) ||
419 (event->error_code == BadColor) || 417 (event->error_code == BadColor) ||
420 (event->error_code == BadGC) || 418 (event->error_code == BadGC) ||
421 (event->error_code == BadIDChoice) || 419 (event->error_code == BadIDChoice) ||
422 (event->error_code == BadValue) || 420 (event->error_code == BadValue) ||
423 (event->error_code == BadAtom)) { 421 (event->error_code == BadAtom)) {
424 if (event->error_code == BadValue) 422 if (event->error_code == BadValue)
425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
426 mesg, BUFSIZ); 424 mesg, BUFSIZ);
427 else if (event->error_code == BadAtom) 425 else if (event->error_code == BadAtom)
428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
429 mesg, BUFSIZ); 427 mesg, BUFSIZ);
430 else 428 else
431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
432 mesg, BUFSIZ); 430 mesg, BUFSIZ);
433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434 } 432 }
435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436 mesg, BUFSIZ); 434 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438} 436}
439#endif 437#endif
440 438
441int 439int
… …
488 rxvt_emergency_cleanup (); 486 rxvt_emergency_cleanup ();
489 w.stop (); 487 w.stop ();
490 kill (getpid (), w.signum); 488 kill (getpid (), w.signum);
491} 489}
492 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
493char **rxvt_environ; // startup environment 558char **rxvt_environ; // startup environment
494 559
495void 560void
496rxvt_init () 561rxvt_init ()
497{ 562{
498 ptytty::init (); 563 assert (("fontMask must not overlap other RS masks",
564 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
499 565
566 rxvt_get_ttymode (&rxvt_term::def_tio);
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
500 if (!ev_default_loop (0)) 572 if (!ev_default_loop ())
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 573 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502 574
503 rxvt_environ = environ; 575 rxvt_environ = environ;
504 576
505 signal (SIGHUP, SIG_IGN); 577 signal (SIGHUP, SIG_IGN);
506 signal (SIGPIPE, SIG_IGN); 578 signal (SIGPIPE, SIG_IGN);
507 579
508 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 580 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
509 sig_handlers.sw_int.start (SIGINT); ev_unref (); 581 sig_handlers.sw_int.start (SIGINT); ev_unref ();
510
511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
512 /* signal (SIGURG, SIG_DFL); */
513 582
514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
515 // TODO: handle this with exceptions and tolerate the memory loss 584 // TODO: handle this with exceptions and tolerate the memory loss
516 XSetIOErrorHandler (rxvt_xioerror_handler); 585 XSetIOErrorHandler (rxvt_xioerror_handler);
517 586
… …
545 if (rs[Rs_geometry]) 614 if (rs[Rs_geometry])
546 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 615 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547 616
548 if (flags & WidthValue) 617 if (flags & WidthValue)
549 { 618 {
619 if (!w)
620 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
621
550 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 622 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
551 szHint.flags |= USSize; 623 szHint.flags |= USSize;
552 } 624 }
553 625
554 if (flags & HeightValue) 626 if (flags & HeightValue)
555 { 627 {
628 if (!h)
629 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
630
556 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 631 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
557 szHint.flags |= USSize; 632 szHint.flags |= USSize;
558 } 633 }
559 634
560 if (flags & XValue) 635 if (flags & XValue)
561 { 636 {
… …
636 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 711 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
637 712
638 if (recalc_y) 713 if (recalc_y)
639 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
640 715
641 ncol = width / fwidth; 716 ncol = width / fwidth;
642 nrow = height / fheight; 717 nrow = height / fheight;
643} 718}
644 719
645/*----------------------------------------------------------------------*/ 720/*----------------------------------------------------------------------*/
646/* 721/*
… …
657 732
658 ws.ws_col = ncol; 733 ws.ws_col = ncol;
659 ws.ws_row = nrow; 734 ws.ws_row = nrow;
660 ws.ws_xpixel = width; 735 ws.ws_xpixel = width;
661 ws.ws_ypixel = height; 736 ws.ws_ypixel = height;
662 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 737 ioctl (pty->pty, TIOCSWINSZ, &ws);
663 738
664#if 0 739#if 0
665 // TIOCSWINSZ is supposed to do this automatically and correctly 740 // TIOCSWINSZ is supposed to do this automatically and correctly
666 if (cmd_pid) /* force through to the command */ 741 if (cmd_pid) /* force through to the command */
667 kill (-cmd_pid, SIGWINCH); 742 kill (-cmd_pid, SIGWINCH);
… …
697#endif 772#endif
698 773
699 delete fontset[0]; 774 delete fontset[0];
700 fontset[0] = fs; 775 fontset[0] = fs;
701 776
702 prop = (*fs)[1]->properties (); 777 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
703 prop.height += lineSpace; 778 prop.height += lineSpace;
779 prop.width += letterSpace;
704 780
705 fs->set_prop (prop, false); 781 fs->set_prop (prop, false);
706 782
707 fwidth = prop.width; 783 fwidth = prop.width;
708 fheight = prop.height; 784 fheight = prop.height;
… …
758 prop, XA_STRING, 8, PropModeReplace, 834 prop, XA_STRING, 8, PropModeReplace,
759 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 835 (const unsigned char *)str, len >= 0 ? len : strlen (str));
760} 836}
761 837
762void 838void
839rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
840{
841 XTextProperty ct;
842
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 {
845 XSetTextProperty (dpy, parent[0], &ct, prop);
846 XFree (ct.value);
847 }
848}
849
850void
763rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 851rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
764{ 852{
765 wchar_t *ws = rxvt_mbstowcs (str, len); 853 wchar_t *ws = rxvt_mbstowcs (str, len);
766 char *s = rxvt_wcstoutf8 (ws); 854 char *s = rxvt_wcstoutf8 (ws);
767 855
… …
777/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
778/* xterm sequences - title, iconName, color (exptl) */ 866/* xterm sequences - title, iconName, color (exptl) */
779void 867void
780rxvt_term::set_title (const char *str) 868rxvt_term::set_title (const char *str)
781{ 869{
782 set_string_property (XA_WM_NAME, str); 870 set_mbstring_property (XA_WM_NAME, str);
783#if ENABLE_EWMH 871#if ENABLE_EWMH
784 set_utf8_property (xa[XA_NET_WM_NAME], str); 872 set_utf8_property (xa[XA_NET_WM_NAME], str);
785#endif 873#endif
786} 874}
787 875
788void 876void
789rxvt_term::set_icon_name (const char *str) 877rxvt_term::set_icon_name (const char *str)
790{ 878{
791 set_string_property (XA_WM_ICON_NAME, str); 879 set_mbstring_property (XA_WM_ICON_NAME, str);
792#if ENABLE_EWMH 880#if ENABLE_EWMH
793 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 881 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
794#endif 882#endif
795} 883}
796 884
… …
868void 956void
869rxvt_term::set_colorfgbg () 957rxvt_term::set_colorfgbg ()
870{ 958{
871 unsigned int i; 959 unsigned int i;
872 const char *xpmb = ""; 960 const char *xpmb = "";
873 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 961 char fstr[] = "default";
962 char bstr[] = "default";
874 963
875 strcpy (fstr, "default");
876 strcpy (bstr, "default");
877 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
878 if (pix_colors[Color_fg] == pix_colors[i]) 965 if (pix_colors[Color_fg] == pix_colors[i])
879 { 966 {
880 sprintf (fstr, "%d", (i - Color_Black)); 967 sprintf (fstr, "%d", i - Color_Black);
881 break; 968 break;
882 } 969 }
883 970
884 for (i = Color_Black; i <= Color_White; i++) 971 for (i = Color_Black; i <= Color_White; i++)
885 if (pix_colors[Color_bg] == pix_colors[i]) 972 if (pix_colors[Color_bg] == pix_colors[i])
886 { 973 {
887 sprintf (bstr, "%d", (i - Color_Black)); 974 sprintf (bstr, "%d", i - Color_Black);
888#ifdef BG_IMAGE_FROM_FILE 975#ifdef BG_IMAGE_FROM_FILE
889 xpmb = "default;"; 976 xpmb = "default;";
890#endif 977#endif
891 break; 978 break;
892 } 979 }
… …
922 int old_width = szHint.width; 1009 int old_width = szHint.width;
923 int old_height = szHint.height; 1010 int old_height = szHint.height;
924 1011
925 window_calc (newwidth, newheight); 1012 window_calc (newwidth, newheight);
926 1013
927 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1014 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1015
1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1017 if (set_hint)
1018 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc);
928 XSetWMNormalHints (dpy, parent[0], &szHint); 1020 XSetWMNormalHints (dpy, parent[0], &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc;
1022 }
929 1023
930 if (!ignoreparent) 1024 if (!ignoreparent)
931 { 1025 {
932#ifdef SMART_RESIZE 1026#ifdef SMART_RESIZE
933 /* 1027 /*
… …
973#else 1067#else
974 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1068 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
975#endif 1069#endif
976 } 1070 }
977 1071
1072 if (set_hint)
1073 XSetWMNormalHints (dpy, parent[0], &szHint);
1074
978 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
979 1076
980 if (fix_screen || newwidth != old_width || newheight != old_height) 1077 if (fix_screen || newwidth != old_width || newheight != old_height)
981 { 1078 {
982 if (scrollBar.state) 1079 if (scrollBar.state)
983 resize_scrollbar (); 1080 scrollBar.resize ();
984 1081
985 XMoveResizeWindow (dpy, vt, 1082 XMoveResizeWindow (dpy, vt,
986 window_vt_x, window_vt_y, 1083 window_vt_x, window_vt_y,
987 width, height); 1084 width, height);
988 1085
989#ifdef HAVE_BG_PIXMAP 1086#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.window_size_sensitive ()) 1087 if (bgPixmap.window_size_sensitive ())
991 update_background (); 1088 update_background ();
992#endif 1089#endif
993
994 scr_clear ();
995 } 1090 }
996 1091
997 if (fix_screen || old_height == 0) 1092 if (fix_screen || old_height == 0)
998 scr_reset (); 1093 scr_reset ();
999
1000 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1001 //scr_touch (false);
1002 1094
1003#ifdef HAVE_BG_PIXMAP 1095#ifdef HAVE_BG_PIXMAP
1004// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1096// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1005// if (bgPixmap.pixmap) 1097// if (bgPixmap.pixmap)
1006// scr_touch (false); 1098// scr_touch (false);
… …
1078 1170
1079/* Checking whether input method is running. */ 1171/* Checking whether input method is running. */
1080bool 1172bool
1081rxvt_term::IMisRunning () 1173rxvt_term::IMisRunning ()
1082{ 1174{
1083 char *p;
1084 Atom atom; 1175 Atom atom;
1085 Window win; 1176 Window win;
1086 char server[IMBUFSIZ]; 1177 char server[IMBUFSIZ];
1087 1178
1088 /* get current locale modifier */ 1179 /* get current locale modifier */
1089 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1180 if (char *p = XSetLocaleModifiers (0))
1090 { 1181 {
1091 strcpy (server, "@server="); 1182 strcpy (server, "@server=");
1092 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1183 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1093 1184
1094 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1185 if (p = strchr (server + 1, '@')) /* first one only */
1095 *p = '\0'; 1186 *p = '\0';
1096 1187
1097 atom = XInternAtom (dpy, server, False); 1188 atom = XInternAtom (dpy, server, False);
1098 win = XGetSelectionOwner (dpy, atom); 1189 win = XGetSelectionOwner (dpy, atom);
1099 1190
… …
1166 1257
1167 term->make_current (); 1258 term->make_current ();
1168 1259
1169 if (text) 1260 if (text)
1170 { 1261 {
1171 void *str; 1262 wchar_t *str;
1172 1263
1173 if (!text->encoding_is_wchar && text->string.multi_byte) 1264 if (!text->encoding_is_wchar && text->string.multi_byte)
1174 { 1265 {
1175 // of course, X makes it ugly again 1266 // of course, X makes it ugly again
1176 if (term->rs[Rs_imLocale]) 1267 if (term->rs[Rs_imLocale])
1177 SET_LOCALE (term->rs[Rs_imLocale]); 1268 SET_LOCALE (term->rs[Rs_imLocale]);
1178 1269
1179 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1270 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1180 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1271 mbstowcs (str, text->string.multi_byte, text->length + 1);
1181 1272
1182 if (term->rs[Rs_imLocale]) 1273 if (term->rs[Rs_imLocale])
1183 SET_LOCALE (term->locale); 1274 SET_LOCALE (term->locale);
1184 } 1275 }
1185 else 1276 else
1186 str = (void *)text->string.wide_char; 1277 str = text->string.wide_char;
1187 1278
1188 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1279 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1189 DT_INT, call_data->caret, 1280 DT_INT, call_data->caret,
1190 DT_INT, call_data->chg_first, 1281 DT_INT, call_data->chg_first,
1191 DT_INT, call_data->chg_length, 1282 DT_INT, call_data->chg_length,
… …
1262 p = pet[pi]; 1353 p = pet[pi];
1263 1354
1264 if (!p) 1355 if (!p)
1265 continue; 1356 continue;
1266 1357
1267 s = rxvt_splitcommastring (p); 1358 s = rxvt_strsplit (',', p);
1268 1359
1269 for (i = found = 0; !found && s[i]; i++) 1360 for (i = found = 0; !found && s[i]; i++)
1270 { 1361 {
1271 if (!strcmp (s[i], "OverTheSpot")) 1362 if (!strcmp (s[i], "OverTheSpot"))
1272 input_style = XIMPreeditPosition | XIMStatusNothing; 1363 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1284 input_style = XIMPreeditNothing | XIMStatusNothing; 1375 input_style = XIMPreeditNothing | XIMStatusNothing;
1285 1376
1286 for (j = 0; j < xim_styles->count_styles; j++) 1377 for (j = 0; j < xim_styles->count_styles; j++)
1287 if (input_style == xim_styles->supported_styles[j]) 1378 if (input_style == xim_styles->supported_styles[j])
1288 { 1379 {
1289 rxvt_freecommastring (s); 1380 rxvt_free_strsplit (s);
1290 1381
1291 found = 1; 1382 found = 1;
1292 goto foundpet; 1383 goto foundpet;
1293 } 1384 }
1294 1385
1295 } 1386 }
1296 1387
1297 rxvt_freecommastring (s); 1388 rxvt_free_strsplit (s);
1298 } 1389 }
1299 1390
1300foundpet: 1391foundpet:
1301 1392
1302 XFree (xim_styles); 1393 XFree (xim_styles);
… …
1458 p = rs[Rs_inputMethod]; 1549 p = rs[Rs_inputMethod];
1459 if (p && *p) 1550 if (p && *p)
1460 { 1551 {
1461 bool found = false; 1552 bool found = false;
1462 1553
1463 s = rxvt_splitcommastring (p); 1554 s = rxvt_strsplit (',', p);
1464 1555
1465 for (i = 0; s[i]; i++) 1556 for (i = 0; s[i]; i++)
1466 { 1557 {
1467 if (*s[i]) 1558 if (*s[i])
1468 { 1559 {
… …
1474 break; 1565 break;
1475 } 1566 }
1476 } 1567 }
1477 } 1568 }
1478 1569
1479 rxvt_freecommastring (s); 1570 rxvt_free_strsplit (s);
1480 1571
1481 if (found) 1572 if (found)
1482 goto done; 1573 goto done;
1483 } 1574 }
1484 1575
… …
1545void 1636void
1546rxvt_term::get_window_origin (int &x, int &y) 1637rxvt_term::get_window_origin (int &x, int &y)
1547{ 1638{
1548 Window cr; 1639 Window cr;
1549 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1640 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1550/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1551} 1641}
1552 1642
1553Pixmap 1643Pixmap
1554rxvt_term::get_pixmap_property (int prop_id) 1644rxvt_term::get_pixmap_property (Atom property)
1555{ 1645{
1556 if (prop_id > 0 && prop_id < NUM_XA) 1646 Pixmap pixmap = None;
1557 if (xa[prop_id]) 1647
1558 {
1559 int aformat; 1648 int aformat;
1560 unsigned long nitems, bytes_after; 1649 unsigned long nitems, bytes_after;
1561 Atom atype; 1650 Atom atype;
1562 unsigned char *prop = NULL; 1651 unsigned char *prop;
1563 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1652 int result = XGetWindowProperty (dpy, display->root, property,
1564 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1653 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1565 &nitems, &bytes_after, &prop); 1654 &nitems, &bytes_after, &prop);
1566 if (result == Success && prop && atype == XA_PIXMAP) 1655 if (result == Success)
1656 {
1657 if (atype == XA_PIXMAP)
1567 return *(Pixmap *)prop; 1658 pixmap = *(Pixmap *)prop;
1659 XFree (prop);
1568 } 1660 }
1569 1661
1570 return None; 1662 return pixmap;
1571} 1663}
1572 1664
1573#ifdef HAVE_BG_PIXMAP 1665#ifdef HAVE_BG_PIXMAP
1574# if TRACE_PIXMAPS
1575# undef update_background
1576void
1577rxvt_term::trace_update_background (const char *file, int line)
1578{
1579 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1580 update_background ();
1581}
1582# endif
1583 1666
1584void 1667void
1585rxvt_term::update_background () 1668rxvt_term::update_background ()
1586{ 1669{
1587 if (update_background_ev.is_active ()) 1670 if (update_background_ev.is_active ())

Diff Legend

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