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.351 by sf-exg, Tue Feb 1 00:41:01 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));
… …
225 delete fontset[i]; 226 delete fontset[i];
226#endif 227#endif
227 delete fontset[0]; 228 delete fontset[0];
228 229
229#ifdef HAVE_BG_PIXMAP 230#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 231 bg_destroy ();
231#endif 232#endif
232 233
233 if (display) 234 if (display)
234 { 235 {
235 selection_clear (); 236 selection_clear ();
237 selection_clear (true);
236 238
237#ifdef USE_XIM 239#ifdef USE_XIM
238 im_destroy (); 240 im_destroy ();
239#endif 241#endif
240#ifdef XTERM_SCROLLBAR 242 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); 243 if (gc) XFreeGC (dpy, gc);
265 244
266 delete drawable; 245 delete drawable;
267 // destroy all windows 246 // destroy all windows
268 if (parent[0]) 247 if (parent[0])
… …
288 /* clear all resources */ 267 /* clear all resources */
289 for (int i = 0; i < allocated.size (); i++) 268 for (int i = 0; i < allocated.size (); i++)
290 free (allocated [i]); 269 free (allocated [i]);
291 270
292 free (selection.text); 271 free (selection.text);
272 free (selection.clip_text);
293 // TODO: manage env vars in child only(!) 273 // TODO: manage env vars in child only(!)
294 free (env_display); 274 free (env_display);
295 free (env_term); 275 free (env_term);
296 free (locale); 276 free (locale);
297 free (v_buffer); 277 free (v_buffer);
… …
373 make_current (); 353 make_current ();
374 354
375 delete this; 355 delete this;
376} 356}
377 357
358void
359rxvt_term::set_option (uint8_t opt, bool set)
360{
361 if (!opt)
362 return;
363
364 uint8_t mask = 1 << (opt & 7);
365 uint8_t &val = options [opt >> 3];
366
367 val = val & ~mask | (set ? mask : 0);
368}
369
378/*----------------------------------------------------------------------*/ 370/*----------------------------------------------------------------------*/
379/* 371/*
380 * Exit gracefully, clearing the utmp entry and restoring tty attributes 372 * Exit gracefully, clearing the utmp entry and restoring tty attributes
381 * TODO: if debugging, this should free up any known resources if we can 373 * TODO: if debugging, this should free up any known resources if we can
382 */ 374 */
… …
394print_x_error (Display *dpy, XErrorEvent *event) 386print_x_error (Display *dpy, XErrorEvent *event)
395{ 387{
396 char buffer[BUFSIZ]; 388 char buffer[BUFSIZ];
397 char mesg[BUFSIZ]; 389 char mesg[BUFSIZ];
398 char number[32]; 390 char number[32];
399 char *mtype = "XlibMessage"; 391 const char mtype[] = "XlibMessage";
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 392 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 393 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 394 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403 rxvt_warn ("%s: %s\n", mesg, buffer); 395 rxvt_warn ("%s: %s\n", mesg, buffer);
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 396 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 397 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
406 sprintf(number, "%d", event->request_code); 398 sprintf(number, "%d", event->request_code);
407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 399 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
408 rxvt_warn ("(which is %s)\n", buffer); 400 rxvt_warn ("(which is %s)\n", buffer);
409 if (event->request_code >= 128) { 401 if (event->request_code >= 128) {
410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 402 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
411 mesg, BUFSIZ); 403 mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 404 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413 } 405 }
414 if ((event->error_code == BadWindow) || 406 if ((event->error_code == BadWindow) ||
415 (event->error_code == BadPixmap) || 407 (event->error_code == BadPixmap) ||
416 (event->error_code == BadCursor) || 408 (event->error_code == BadCursor) ||
417 (event->error_code == BadFont) || 409 (event->error_code == BadFont) ||
418 (event->error_code == BadDrawable) || 410 (event->error_code == BadDrawable) ||
419 (event->error_code == BadColor) || 411 (event->error_code == BadColor) ||
420 (event->error_code == BadGC) || 412 (event->error_code == BadGC) ||
421 (event->error_code == BadIDChoice) || 413 (event->error_code == BadIDChoice) ||
422 (event->error_code == BadValue) || 414 (event->error_code == BadValue) ||
423 (event->error_code == BadAtom)) { 415 (event->error_code == BadAtom)) {
424 if (event->error_code == BadValue) 416 if (event->error_code == BadValue)
425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
426 mesg, BUFSIZ); 418 mesg, BUFSIZ);
427 else if (event->error_code == BadAtom) 419 else if (event->error_code == BadAtom)
428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 420 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
429 mesg, BUFSIZ); 421 mesg, BUFSIZ);
430 else 422 else
431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 423 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
432 mesg, BUFSIZ); 424 mesg, BUFSIZ);
433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434 } 426 }
435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 427 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436 mesg, BUFSIZ); 428 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 429 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438} 430}
439#endif 431#endif
440 432
441int 433int
… …
488 rxvt_emergency_cleanup (); 480 rxvt_emergency_cleanup ();
489 w.stop (); 481 w.stop ();
490 kill (getpid (), w.signum); 482 kill (getpid (), w.signum);
491} 483}
492 484
485static void
486rxvt_get_ttymode (struct termios *tio)
487{
488 if (tcgetattr (STDIN_FILENO, tio) < 0)
489 memset (tio, 0, sizeof (struct termios));
490
491 for (int i = 0; i < NCCS; i++)
492 tio->c_cc[i] = VDISABLE;
493
494 tio->c_cc[VINTR] = CINTR;
495 tio->c_cc[VQUIT] = CQUIT;
496 tio->c_cc[VERASE] = CERASE;
497#ifdef VERASE2
498 tio->c_cc[VERASE2] = CERASE2;
499#endif
500 tio->c_cc[VKILL] = CKILL;
501 tio->c_cc[VEOF] = CEOF;
502 tio->c_cc[VSTART] = CSTART;
503 tio->c_cc[VSTOP] = CSTOP;
504 tio->c_cc[VSUSP] = CSUSP;
505# ifdef VDSUSP
506 tio->c_cc[VDSUSP] = CDSUSP;
507# endif
508# ifdef VREPRINT
509 tio->c_cc[VREPRINT] = CRPRNT;
510# endif
511# ifdef VDISCRD
512 tio->c_cc[VDISCRD] = CFLUSH;
513# endif
514# ifdef VWERSE
515 tio->c_cc[VWERSE] = CWERASE;
516# endif
517# ifdef VLNEXT
518 tio->c_cc[VLNEXT] = CLNEXT;
519# endif
520# ifdef VSTATUS
521 tio->c_cc[VSTATUS] = CSTATUS;
522# endif
523
524# if VMIN != VEOF
525 tio->c_cc[VMIN] = 1;
526# endif
527# if VTIME != VEOL
528 tio->c_cc[VTIME] = 0;
529# endif
530
531 /* input modes */
532 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
533# ifdef IMAXBEL
534 | IMAXBEL
535# endif
536 | IXON);
537
538 /* output modes */
539 tio->c_oflag = (OPOST | ONLCR);
540
541 /* control modes */
542 tio->c_cflag = (CS8 | CREAD);
543
544 /* local modes */
545 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
546# if defined (ECHOCTL) && defined (ECHOKE)
547 | ECHOCTL | ECHOKE
548# endif
549 | ECHOE | ECHOK);
550}
551
493char **rxvt_environ; // startup environment 552char **rxvt_environ; // startup environment
494 553
495void 554void
496rxvt_init () 555rxvt_init ()
497{ 556{
498 ptytty::init (); 557 assert (("fontMask must not overlap other RS masks",
558 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
499 559
560 rxvt_get_ttymode (&rxvt_term::def_tio);
561
562 // get rid of stdin/stdout as we don't need them, to free resources
563 dup2 (STDERR_FILENO, STDIN_FILENO);
564 dup2 (STDERR_FILENO, STDOUT_FILENO);
565
500 if (!ev_default_loop (0)) 566 if (!ev_default_loop ())
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 567 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502 568
503 rxvt_environ = environ; 569 rxvt_environ = environ;
504 570
505 signal (SIGHUP, SIG_IGN); 571 signal (SIGHUP, SIG_IGN);
506 signal (SIGPIPE, SIG_IGN); 572 signal (SIGPIPE, SIG_IGN);
507 573
508 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 574 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
509 sig_handlers.sw_int.start (SIGINT); ev_unref (); 575 sig_handlers.sw_int.start (SIGINT); ev_unref ();
510
511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
512 /* signal (SIGURG, SIG_DFL); */
513 576
514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 577 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
515 // TODO: handle this with exceptions and tolerate the memory loss 578 // TODO: handle this with exceptions and tolerate the memory loss
516 XSetIOErrorHandler (rxvt_xioerror_handler); 579 XSetIOErrorHandler (rxvt_xioerror_handler);
517 580
… …
545 if (rs[Rs_geometry]) 608 if (rs[Rs_geometry])
546 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 609 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547 610
548 if (flags & WidthValue) 611 if (flags & WidthValue)
549 { 612 {
613 if (!w)
614 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
615
550 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 616 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
551 szHint.flags |= USSize; 617 szHint.flags |= USSize;
552 } 618 }
553 619
554 if (flags & HeightValue) 620 if (flags & HeightValue)
555 { 621 {
622 if (!h)
623 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
624
556 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 625 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
557 szHint.flags |= USSize; 626 szHint.flags |= USSize;
558 } 627 }
559 628
560 if (flags & XValue) 629 if (flags & XValue)
561 { 630 {
… …
636 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 705 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
637 706
638 if (recalc_y) 707 if (recalc_y)
639 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
640 709
641 ncol = width / fwidth; 710 ncol = width / fwidth;
642 nrow = height / fheight; 711 nrow = height / fheight;
643} 712}
644 713
645/*----------------------------------------------------------------------*/ 714/*----------------------------------------------------------------------*/
646/* 715/*
… …
657 726
658 ws.ws_col = ncol; 727 ws.ws_col = ncol;
659 ws.ws_row = nrow; 728 ws.ws_row = nrow;
660 ws.ws_xpixel = width; 729 ws.ws_xpixel = width;
661 ws.ws_ypixel = height; 730 ws.ws_ypixel = height;
662 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 731 ioctl (pty->pty, TIOCSWINSZ, &ws);
663 732
664#if 0 733#if 0
665 // TIOCSWINSZ is supposed to do this automatically and correctly 734 // TIOCSWINSZ is supposed to do this automatically and correctly
666 if (cmd_pid) /* force through to the command */ 735 if (cmd_pid) /* force through to the command */
667 kill (-cmd_pid, SIGWINCH); 736 kill (-cmd_pid, SIGWINCH);
… …
697#endif 766#endif
698 767
699 delete fontset[0]; 768 delete fontset[0];
700 fontset[0] = fs; 769 fontset[0] = fs;
701 770
702 prop = (*fs)[1]->properties (); 771 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
703 prop.height += lineSpace; 772 prop.height += lineSpace;
773 prop.width += letterSpace;
704 774
705 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
706 776
707 fwidth = prop.width; 777 fwidth = prop.width;
708 fheight = prop.height; 778 fheight = prop.height;
… …
758 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
759 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
760} 830}
761 831
762void 832void
833rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
834{
835 XTextProperty ct;
836
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 {
839 XSetTextProperty (dpy, parent[0], &ct, prop);
840 XFree (ct.value);
841 }
842}
843
844void
763rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
764{ 846{
765 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
766 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
767 849
… …
777/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
778/* xterm sequences - title, iconName, color (exptl) */ 860/* xterm sequences - title, iconName, color (exptl) */
779void 861void
780rxvt_term::set_title (const char *str) 862rxvt_term::set_title (const char *str)
781{ 863{
782 set_string_property (XA_WM_NAME, str); 864 set_mbstring_property (XA_WM_NAME, str);
783#if ENABLE_EWMH 865#if ENABLE_EWMH
784 set_utf8_property (xa[XA_NET_WM_NAME], str); 866 set_utf8_property (xa[XA_NET_WM_NAME], str);
785#endif 867#endif
786} 868}
787 869
788void 870void
789rxvt_term::set_icon_name (const char *str) 871rxvt_term::set_icon_name (const char *str)
790{ 872{
791 set_string_property (XA_WM_ICON_NAME, str); 873 set_mbstring_property (XA_WM_ICON_NAME, str);
792#if ENABLE_EWMH 874#if ENABLE_EWMH
793 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 875 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
794#endif 876#endif
795} 877}
796 878
… …
868void 950void
869rxvt_term::set_colorfgbg () 951rxvt_term::set_colorfgbg ()
870{ 952{
871 unsigned int i; 953 unsigned int i;
872 const char *xpmb = ""; 954 const char *xpmb = "";
873 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
874 957
875 strcpy (fstr, "default");
876 strcpy (bstr, "default");
877 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
878 if (pix_colors[Color_fg] == pix_colors[i]) 959 if (pix_colors[Color_fg] == pix_colors[i])
879 { 960 {
880 sprintf (fstr, "%d", (i - Color_Black)); 961 sprintf (fstr, "%d", i - Color_Black);
881 break; 962 break;
882 } 963 }
883 964
884 for (i = Color_Black; i <= Color_White; i++) 965 for (i = Color_Black; i <= Color_White; i++)
885 if (pix_colors[Color_bg] == pix_colors[i]) 966 if (pix_colors[Color_bg] == pix_colors[i])
886 { 967 {
887 sprintf (bstr, "%d", (i - Color_Black)); 968 sprintf (bstr, "%d", i - Color_Black);
888#ifdef BG_IMAGE_FROM_FILE 969#ifdef BG_IMAGE_FROM_FILE
889 xpmb = "default;"; 970 xpmb = "default;";
890#endif 971#endif
891 break; 972 break;
892 } 973 }
… …
922 int old_width = szHint.width; 1003 int old_width = szHint.width;
923 int old_height = szHint.height; 1004 int old_height = szHint.height;
924 1005
925 window_calc (newwidth, newheight); 1006 window_calc (newwidth, newheight);
926 1007
927 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1008 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1009
1010 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1011 if (set_hint)
1012 {
1013 szHint.flags &= ~(PBaseSize | PResizeInc);
928 XSetWMNormalHints (dpy, parent[0], &szHint); 1014 XSetWMNormalHints (dpy, parent[0], &szHint);
1015 szHint.flags |= PBaseSize | PResizeInc;
1016 }
929 1017
930 if (!ignoreparent) 1018 if (!ignoreparent)
931 { 1019 {
932#ifdef SMART_RESIZE 1020#ifdef SMART_RESIZE
933 /* 1021 /*
… …
973#else 1061#else
974 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1062 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
975#endif 1063#endif
976 } 1064 }
977 1065
1066 if (set_hint)
1067 XSetWMNormalHints (dpy, parent[0], &szHint);
1068
978 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
979 1070
980 if (fix_screen || newwidth != old_width || newheight != old_height) 1071 if (fix_screen || newwidth != old_width || newheight != old_height)
981 { 1072 {
982 if (scrollBar.state) 1073 if (scrollBar.state)
983 resize_scrollbar (); 1074 scrollBar.resize ();
984 1075
985 XMoveResizeWindow (dpy, vt, 1076 XMoveResizeWindow (dpy, vt,
986 window_vt_x, window_vt_y, 1077 window_vt_x, window_vt_y,
987 width, height); 1078 width, height);
988 1079
989#ifdef HAVE_BG_PIXMAP 1080#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.window_size_sensitive ()) 1081 if (bg_window_size_sensitive ())
991 update_background (); 1082 update_background ();
992#endif 1083#endif
993
994 scr_clear ();
995 } 1084 }
996 1085
997 if (fix_screen || old_height == 0) 1086 if (fix_screen || old_height == 0)
998 scr_reset (); 1087 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
1003#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 ?
1005// if (bgPixmap.pixmap)
1006// scr_touch (false);
1007#endif
1008 1088
1009#ifdef USE_XIM 1089#ifdef USE_XIM
1010 IMSetPosition (); 1090 IMSetPosition ();
1011#endif 1091#endif
1012} 1092}
… …
1078 1158
1079/* Checking whether input method is running. */ 1159/* Checking whether input method is running. */
1080bool 1160bool
1081rxvt_term::IMisRunning () 1161rxvt_term::IMisRunning ()
1082{ 1162{
1083 char *p;
1084 Atom atom; 1163 Atom atom;
1085 Window win; 1164 Window win;
1086 char server[IMBUFSIZ]; 1165 char server[IMBUFSIZ];
1087 1166
1088 /* get current locale modifier */ 1167 /* get current locale modifier */
1089 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1168 if (char *p = XSetLocaleModifiers (0))
1090 { 1169 {
1091 strcpy (server, "@server="); 1170 strcpy (server, "@server=");
1092 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1171 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1093 1172
1094 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1173 if (p = strchr (server + 1, '@')) /* first one only */
1095 *p = '\0'; 1174 *p = '\0';
1096 1175
1097 atom = XInternAtom (dpy, server, False); 1176 atom = XInternAtom (dpy, server, False);
1098 win = XGetSelectionOwner (dpy, atom); 1177 win = XGetSelectionOwner (dpy, atom);
1099 1178
1100 if (win != None) 1179 if (win != None)
1101 return True; 1180 return true;
1102 } 1181 }
1103 1182
1104 return False; 1183 return false;
1105} 1184}
1106 1185
1107void 1186void
1108rxvt_term::IMSendSpot () 1187rxvt_term::IMSendSpot ()
1109{ 1188{
… …
1166 1245
1167 term->make_current (); 1246 term->make_current ();
1168 1247
1169 if (text) 1248 if (text)
1170 { 1249 {
1171 void *str; 1250 wchar_t *str;
1172 1251
1173 if (!text->encoding_is_wchar && text->string.multi_byte) 1252 if (!text->encoding_is_wchar && text->string.multi_byte)
1174 { 1253 {
1175 // of course, X makes it ugly again 1254 // of course, X makes it ugly again
1176 if (term->rs[Rs_imLocale]) 1255 if (term->rs[Rs_imLocale])
1177 SET_LOCALE (term->rs[Rs_imLocale]); 1256 SET_LOCALE (term->rs[Rs_imLocale]);
1178 1257
1179 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1258 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1180 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1259 mbstowcs (str, text->string.multi_byte, text->length + 1);
1181 1260
1182 if (term->rs[Rs_imLocale]) 1261 if (term->rs[Rs_imLocale])
1183 SET_LOCALE (term->locale); 1262 SET_LOCALE (term->locale);
1184 } 1263 }
1185 else 1264 else
1186 str = (void *)text->string.wide_char; 1265 str = text->string.wide_char;
1187 1266
1188 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1267 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1189 DT_INT, call_data->caret, 1268 DT_INT, call_data->caret,
1190 DT_INT, call_data->chg_first, 1269 DT_INT, call_data->chg_first,
1191 DT_INT, call_data->chg_length, 1270 DT_INT, call_data->chg_length,
… …
1262 p = pet[pi]; 1341 p = pet[pi];
1263 1342
1264 if (!p) 1343 if (!p)
1265 continue; 1344 continue;
1266 1345
1267 s = rxvt_splitcommastring (p); 1346 s = rxvt_strsplit (',', p);
1268 1347
1269 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1270 { 1349 {
1271 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1272 input_style = XIMPreeditPosition | XIMStatusNothing; 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1284 input_style = XIMPreeditNothing | XIMStatusNothing; 1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1285 1364
1286 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1287 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1288 { 1367 {
1289 rxvt_freecommastring (s); 1368 rxvt_free_strsplit (s);
1290 1369
1291 found = 1; 1370 found = 1;
1292 goto foundpet; 1371 goto foundpet;
1293 } 1372 }
1294 1373
1295 } 1374 }
1296 1375
1297 rxvt_freecommastring (s); 1376 rxvt_free_strsplit (s);
1298 } 1377 }
1299 1378
1300foundpet: 1379foundpet:
1301 1380
1302 XFree (xim_styles); 1381 XFree (xim_styles);
… …
1458 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1459 if (p && *p) 1538 if (p && *p)
1460 { 1539 {
1461 bool found = false; 1540 bool found = false;
1462 1541
1463 s = rxvt_splitcommastring (p); 1542 s = rxvt_strsplit (',', p);
1464 1543
1465 for (i = 0; s[i]; i++) 1544 for (i = 0; s[i]; i++)
1466 { 1545 {
1467 if (*s[i]) 1546 if (*s[i])
1468 { 1547 {
… …
1474 break; 1553 break;
1475 } 1554 }
1476 } 1555 }
1477 } 1556 }
1478 1557
1479 rxvt_freecommastring (s); 1558 rxvt_free_strsplit (s);
1480 1559
1481 if (found) 1560 if (found)
1482 goto done; 1561 goto done;
1483 } 1562 }
1484 1563
… …
1545void 1624void
1546rxvt_term::get_window_origin (int &x, int &y) 1625rxvt_term::get_window_origin (int &x, int &y)
1547{ 1626{
1548 Window cr; 1627 Window cr;
1549 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1550/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1551} 1629}
1552 1630
1553Pixmap 1631Pixmap
1554rxvt_term::get_pixmap_property (int prop_id) 1632rxvt_term::get_pixmap_property (Atom property)
1555{ 1633{
1556 if (prop_id > 0 && prop_id < NUM_XA) 1634 Pixmap pixmap = None;
1557 if (xa[prop_id]) 1635
1558 {
1559 int aformat; 1636 int aformat;
1560 unsigned long nitems, bytes_after; 1637 unsigned long nitems, bytes_after;
1561 Atom atype; 1638 Atom atype;
1562 unsigned char *prop = NULL; 1639 unsigned char *prop;
1563 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1640 int result = XGetWindowProperty (dpy, display->root, property,
1564 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1641 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1565 &nitems, &bytes_after, &prop); 1642 &nitems, &bytes_after, &prop);
1566 if (result == Success && prop && atype == XA_PIXMAP) 1643 if (result == Success)
1644 {
1645 if (atype == XA_PIXMAP)
1567 return *(Pixmap *)prop; 1646 pixmap = *(Pixmap *)prop;
1647 XFree (prop);
1568 } 1648 }
1569 1649
1570 return None; 1650 return pixmap;
1571} 1651}
1572 1652
1573#ifdef HAVE_BG_PIXMAP 1653#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 1654
1584void 1655void
1585rxvt_term::update_background () 1656rxvt_term::update_background ()
1586{ 1657{
1587 if (update_background_ev.is_active ()) 1658 if (update_background_ev.is_active ())
1588 return; 1659 return;
1589 1660
1590 bgPixmap.invalidate (); 1661 bg_invalidate ();
1591 1662
1592 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1663 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1593 1664
1594 if (to_wait <= 0.) 1665 if (to_wait <= 0.)
1595 bgPixmap.render (); 1666 bg_render ();
1596 else 1667 else
1597 update_background_ev.start (to_wait); 1668 update_background_ev.start (to_wait);
1598} 1669}
1599 1670
1600void 1671void
1601rxvt_term::update_background_cb (ev::timer &w, int revents) 1672rxvt_term::update_background_cb (ev::timer &w, int revents)
1602{ 1673{
1603 make_current (); 1674 make_current ();
1604 1675
1605 update_background_ev.stop (); 1676 update_background_ev.stop ();
1606 bgPixmap.render (); 1677 bg_render ();
1607 refresh_check (); 1678 refresh_check ();
1608} 1679}
1609 1680
1610#endif /* HAVE_BG_PIXMAP */ 1681#endif /* HAVE_BG_PIXMAP */
1611 1682

Diff Legend

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