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.320 by sf-exg, Sat Jan 30 20:43:56 2010 UTC vs.
Revision 1.360 by sf-exg, Fri Aug 19 16:01:37 2011 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
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.begin (); cc < v.end (); cc++)
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));
… …
186#endif 187#endif
187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 194
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 196
… …
225 delete fontset[i]; 225 delete fontset[i];
226#endif 226#endif
227 delete fontset[0]; 227 delete fontset[0];
228 228
229#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 230 bg_destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif 231#endif
238 232
239 if (display) 233 if (display)
240 { 234 {
241 selection_clear (); 235 selection_clear ();
… …
247 scrollBar.destroy (); 241 scrollBar.destroy ();
248 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
249 243
250 delete drawable; 244 delete drawable;
251 // destroy all windows 245 // destroy all windows
252 if (parent[0]) 246 if (parent)
253 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
254 248
255 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
256 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
257 { 251 {
258 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
278 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
279 free (env_display); 273 free (env_display);
280 free (env_term); 274 free (env_term);
281 free (locale); 275 free (locale);
282 free (v_buffer); 276 free (v_buffer);
283 free (incr_buf); 277
278 delete selection_req;
284 279
285 delete envv; 280 delete envv;
286 delete argv; 281 delete argv;
287 282
288#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
… …
324#endif 319#endif
325 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
326#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
327 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
328#endif 323#endif
329 incr_ev.stop ();
330 termwin_ev.stop (display); 324 termwin_ev.stop (display);
331 vt_ev.stop (display); 325 vt_ev.stop (display);
332 } 326 }
333 327
334 flush_ev.stop (); 328 flush_ev.stop ();
… …
356rxvt_term::destroy_cb (ev::idle &w, int revents) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
357{ 351{
358 make_current (); 352 make_current ();
359 353
360 delete this; 354 delete this;
355}
356
357void
358rxvt_term::set_option (uint8_t opt, bool set)
359{
360 if (!opt)
361 return;
362
363 uint8_t mask = 1 << (opt & 7);
364 uint8_t &val = options [opt >> 3];
365
366 val = val & ~mask | (set ? mask : 0);
361} 367}
362 368
363/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
364/* 370/*
365 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
379print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
380{ 386{
381 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
382 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
383 char number[32]; 389 char number[32];
384 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
385 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
386 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
387 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 393 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
388 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
389 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
390 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
391 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
392 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
393 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("(which is %s)\n", buffer);
394 if (event->request_code >= 128) { 400 if (event->request_code >= 128) {
395 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
396 mesg, BUFSIZ); 402 mesg, BUFSIZ);
397 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
398 } 404 }
399 if ((event->error_code == BadWindow) || 405 if ((event->error_code == BadWindow) ||
400 (event->error_code == BadPixmap) || 406 (event->error_code == BadPixmap) ||
401 (event->error_code == BadCursor) || 407 (event->error_code == BadCursor) ||
402 (event->error_code == BadFont) || 408 (event->error_code == BadFont) ||
403 (event->error_code == BadDrawable) || 409 (event->error_code == BadDrawable) ||
404 (event->error_code == BadColor) || 410 (event->error_code == BadColor) ||
405 (event->error_code == BadGC) || 411 (event->error_code == BadGC) ||
406 (event->error_code == BadIDChoice) || 412 (event->error_code == BadIDChoice) ||
407 (event->error_code == BadValue) || 413 (event->error_code == BadValue) ||
408 (event->error_code == BadAtom)) { 414 (event->error_code == BadAtom)) {
409 if (event->error_code == BadValue) 415 if (event->error_code == BadValue)
410 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
411 mesg, BUFSIZ); 417 mesg, BUFSIZ);
412 else if (event->error_code == BadAtom) 418 else if (event->error_code == BadAtom)
413 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
414 mesg, BUFSIZ); 420 mesg, BUFSIZ);
415 else 421 else
416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
417 mesg, BUFSIZ); 423 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
419 } 425 }
420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
421 mesg, BUFSIZ); 427 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
423} 429}
424#endif 430#endif
425 431
426int 432int
… …
473 rxvt_emergency_cleanup (); 479 rxvt_emergency_cleanup ();
474 w.stop (); 480 w.stop ();
475 kill (getpid (), w.signum); 481 kill (getpid (), w.signum);
476} 482}
477 483
484static void
485rxvt_get_ttymode (struct termios *tio)
486{
487 if (tcgetattr (STDIN_FILENO, tio) < 0)
488 memset (tio, 0, sizeof (struct termios));
489
490 for (int i = 0; i < NCCS; i++)
491 tio->c_cc[i] = VDISABLE;
492
493 tio->c_cc[VINTR] = CINTR;
494 tio->c_cc[VQUIT] = CQUIT;
495 tio->c_cc[VERASE] = CERASE;
496#ifdef VERASE2
497 tio->c_cc[VERASE2] = CERASE2;
498#endif
499 tio->c_cc[VKILL] = CKILL;
500 tio->c_cc[VEOF] = CEOF;
501 tio->c_cc[VSTART] = CSTART;
502 tio->c_cc[VSTOP] = CSTOP;
503 tio->c_cc[VSUSP] = CSUSP;
504# ifdef VDSUSP
505 tio->c_cc[VDSUSP] = CDSUSP;
506# endif
507# ifdef VREPRINT
508 tio->c_cc[VREPRINT] = CRPRNT;
509# endif
510# ifdef VDISCRD
511 tio->c_cc[VDISCRD] = CFLUSH;
512# endif
513# ifdef VWERSE
514 tio->c_cc[VWERSE] = CWERASE;
515# endif
516# ifdef VLNEXT
517 tio->c_cc[VLNEXT] = CLNEXT;
518# endif
519# ifdef VSTATUS
520 tio->c_cc[VSTATUS] = CSTATUS;
521# endif
522
523# if VMIN != VEOF
524 tio->c_cc[VMIN] = 1;
525# endif
526# if VTIME != VEOL
527 tio->c_cc[VTIME] = 0;
528# endif
529
530 /* input modes */
531 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
532# ifdef IMAXBEL
533 | IMAXBEL
534# endif
535 | IXON);
536
537 /* output modes */
538 tio->c_oflag = (OPOST | ONLCR);
539
540 /* control modes */
541 tio->c_cflag = (CS8 | CREAD);
542
543 /* local modes */
544 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
545# if defined (ECHOCTL) && defined (ECHOKE)
546 | ECHOCTL | ECHOKE
547# endif
548 | ECHOE | ECHOK);
549}
550
478char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
479 552
480void 553void
481rxvt_init () 554rxvt_init ()
482{ 555{
483 ptytty::init (); 556 assert (("fontMask must not overlap other RS masks",
557 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
484 558
559 rxvt_get_ttymode (&rxvt_term::def_tio);
560
561 // get rid of stdin/stdout as we don't need them, to free resources
562 dup2 (STDERR_FILENO, STDIN_FILENO);
563 dup2 (STDERR_FILENO, STDOUT_FILENO);
564
485 if (!ev_default_loop (0)) 565 if (!ev_default_loop ())
486 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
487 567
488 rxvt_environ = environ; 568 rxvt_environ = environ;
489 569
490 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
491 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
492 572
493 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
494 sig_handlers.sw_int.start (SIGINT); ev_unref (); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
495
496 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
497 /* signal (SIGURG, SIG_DFL); */
498 575
499 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
500 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
501 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
502 579
… …
629 if (recalc_y) 706 if (recalc_y)
630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
631 708
632 ncol = width / fwidth; 709 ncol = width / fwidth;
633 nrow = height / fheight; 710 nrow = height / fheight;
711
712 // When the size of the vt window is not a multiple of the cell
713 // size, i.e., when the wm does not honour our size hints, there are
714 // extra areas not covered by the terminal screen. Such gaps, when a
715 // bg pixmap is set, would have to be cleared manually to properly
716 // refresh the background. We take the simpler route and shrink the
717 // vt window so as to avoid creating gaps.
718 width = ncol * fwidth;
719 height = nrow * fheight;
634} 720}
635 721
636/*----------------------------------------------------------------------*/ 722/*----------------------------------------------------------------------*/
637/* 723/*
638 * Tell the teletype handler what size the window is. 724 * Tell the teletype handler what size the window is.
… …
658 kill (-cmd_pid, SIGWINCH); 744 kill (-cmd_pid, SIGWINCH);
659#endif 745#endif
660} 746}
661 747
662/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
663/* set_fonts () - load and set the various fonts 749/* load and set the various fonts */
664 *
665 * init = 1 - initialize
666 *
667 * fontname == FONT_UP - switch to bigger font
668 * fontname == FONT_DN - switch to smaller font
669 */
670bool 750bool
671rxvt_term::set_fonts () 751rxvt_term::set_fonts ()
672{ 752{
673 rxvt_fontset *fs = new rxvt_fontset (this); 753 rxvt_fontset *fs = new rxvt_fontset (this);
674 rxvt_fontprop prop; 754 rxvt_fontprop prop;
… …
688#endif 768#endif
689 769
690 delete fontset[0]; 770 delete fontset[0];
691 fontset[0] = fs; 771 fontset[0] = fs;
692 772
693 prop = (*fs)[1]->properties (); 773 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
694 prop.height += lineSpace; 774 prop.height += lineSpace;
695 prop.width += letterSpace; 775 prop.width += letterSpace;
696 776
697 fs->set_prop (prop, false); 777 fs->set_prop (prop, false);
698 778
… …
731#else 811#else
732 fontset[style] = fontset[0]; 812 fontset[style] = fontset[0];
733#endif 813#endif
734 } 814 }
735 815
736 if (parent[0]) 816 if (parent)
737 { 817 {
738 resize_all_windows (0, 0, 0); 818 resize_all_windows (0, 0, 0);
739 scr_remap_chars (); 819 scr_remap_chars ();
740 scr_touch (true); 820 scr_touch (true);
741 } 821 }
… …
744} 824}
745 825
746void 826void
747rxvt_term::set_string_property (Atom prop, const char *str, int len) 827rxvt_term::set_string_property (Atom prop, const char *str, int len)
748{ 828{
749 XChangeProperty (dpy, parent[0], 829 XChangeProperty (dpy, parent,
750 prop, XA_STRING, 8, PropModeReplace, 830 prop, XA_STRING, 8, PropModeReplace,
751 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 831 (const unsigned char *)str, len >= 0 ? len : strlen (str));
752} 832}
753 833
754void 834void
835rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
836{
837 XTextProperty ct;
838
839 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
840 {
841 XSetTextProperty (dpy, parent, &ct, prop);
842 XFree (ct.value);
843 }
844}
845
846void
755rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 847rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
756{ 848{
757 wchar_t *ws = rxvt_mbstowcs (str, len); 849 wchar_t *ws = rxvt_mbstowcs (str, len);
758 char *s = rxvt_wcstoutf8 (ws); 850 char *s = rxvt_wcstoutf8 (ws);
759 851
760 XChangeProperty (dpy, parent[0], 852 XChangeProperty (dpy, parent,
761 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
762 (const unsigned char *)s, strlen (s)); 854 (const unsigned char *)s, strlen (s));
763 855
764 free (s); 856 free (s);
765 free (ws); 857 free (ws);
… …
769/*----------------------------------------------------------------------*/ 861/*----------------------------------------------------------------------*/
770/* xterm sequences - title, iconName, color (exptl) */ 862/* xterm sequences - title, iconName, color (exptl) */
771void 863void
772rxvt_term::set_title (const char *str) 864rxvt_term::set_title (const char *str)
773{ 865{
774 set_string_property (XA_WM_NAME, str); 866 set_mbstring_property (XA_WM_NAME, str);
775#if ENABLE_EWMH 867#if ENABLE_EWMH
776 set_utf8_property (xa[XA_NET_WM_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_NAME], str);
777#endif 869#endif
778} 870}
779 871
780void 872void
781rxvt_term::set_icon_name (const char *str) 873rxvt_term::set_icon_name (const char *str)
782{ 874{
783 set_string_property (XA_WM_ICON_NAME, str); 875 set_mbstring_property (XA_WM_ICON_NAME, str);
784#if ENABLE_EWMH 876#if ENABLE_EWMH
785 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 877 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
786#endif 878#endif
787} 879}
788 880
… …
860void 952void
861rxvt_term::set_colorfgbg () 953rxvt_term::set_colorfgbg ()
862{ 954{
863 unsigned int i; 955 unsigned int i;
864 const char *xpmb = ""; 956 const char *xpmb = "";
865 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 957 char fstr[] = "default";
958 char bstr[] = "default";
866 959
867 strcpy (fstr, "default");
868 strcpy (bstr, "default");
869 for (i = Color_Black; i <= Color_White; i++) 960 for (i = Color_Black; i <= Color_White; i++)
870 if (pix_colors[Color_fg] == pix_colors[i]) 961 if (pix_colors[Color_fg] == pix_colors[i])
871 { 962 {
872 sprintf (fstr, "%d", (i - Color_Black)); 963 sprintf (fstr, "%d", i - Color_Black);
873 break; 964 break;
874 } 965 }
875 966
876 for (i = Color_Black; i <= Color_White; i++) 967 for (i = Color_Black; i <= Color_White; i++)
877 if (pix_colors[Color_bg] == pix_colors[i]) 968 if (pix_colors[Color_bg] == pix_colors[i])
878 { 969 {
879 sprintf (bstr, "%d", (i - Color_Black)); 970 sprintf (bstr, "%d", i - Color_Black);
880#ifdef BG_IMAGE_FROM_FILE 971#ifdef BG_IMAGE_FROM_FILE
881 xpmb = "default;"; 972 xpmb = "default;";
882#endif 973#endif
883 break; 974 break;
884 } 975 }
… …
920 1011
921 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1012 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
922 if (set_hint) 1013 if (set_hint)
923 { 1014 {
924 szHint.flags &= ~(PBaseSize | PResizeInc); 1015 szHint.flags &= ~(PBaseSize | PResizeInc);
925 XSetWMNormalHints (dpy, parent[0], &szHint); 1016 XSetWMNormalHints (dpy, parent, &szHint);
926 szHint.flags |= PBaseSize | PResizeInc; 1017 szHint.flags |= PBaseSize | PResizeInc;
927 } 1018 }
928 1019
929 if (!ignoreparent) 1020 if (!ignoreparent)
930 { 1021 {
… …
936 int x, y, x1, y1; 1027 int x, y, x1, y1;
937 int dx, dy; 1028 int dx, dy;
938 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1029 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
939 Window unused_cr; 1030 Window unused_cr;
940 1031
941 XTranslateCoordinates (dpy, parent[0], display->root, 1032 XTranslateCoordinates (dpy, parent, display->root,
942 0, 0, &x, &y, &unused_cr); 1033 0, 0, &x, &y, &unused_cr);
943 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1034 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
944 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1035 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
945 /* 1036 /*
946 * if display->root isn't the parent window, a WM will probably have offset 1037 * if display->root isn't the parent window, a WM will probably have offset
947 * our position for handles and decorations. Counter it 1038 * our position for handles and decorations. Counter it
948 */ 1039 */
… …
965 if (y < y1) /* top half */ 1056 if (y < y1) /* top half */
966 dy = 0; 1057 dy = 0;
967 else if (y == y1) /* exact center */ 1058 else if (y == y1) /* exact center */
968 dy /= 2; 1059 dy /= 2;
969 1060
970 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1061 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
971 szHint.width, szHint.height); 1062 szHint.width, szHint.height);
972#else 1063#else
973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1064 XResizeWindow (dpy, parent, szHint.width, szHint.height);
974#endif 1065#endif
975 } 1066 }
976 1067
977 if (set_hint) 1068 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint); 1069 XSetWMNormalHints (dpy, parent, &szHint);
979 1070
980 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1071 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
981 1072
982 if (fix_screen || newwidth != old_width || newheight != old_height) 1073 if (fix_screen || newwidth != old_width || newheight != old_height)
983 { 1074 {
… …
987 XMoveResizeWindow (dpy, vt, 1078 XMoveResizeWindow (dpy, vt,
988 window_vt_x, window_vt_y, 1079 window_vt_x, window_vt_y,
989 width, height); 1080 width, height);
990 1081
991#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
992 if (bgPixmap.window_size_sensitive ()) 1083 if (bg_window_size_sensitive ())
993 update_background (); 1084 update_background ();
994#endif 1085#endif
995 } 1086 }
996 1087
997 if (fix_screen || old_height == 0) 1088 if (fix_screen || old_height == 0)
998 scr_reset (); 1089 scr_reset ();
999 1090
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
1009#ifdef USE_XIM 1091#ifdef USE_XIM
1010 IMSetPosition (); 1092 im_set_position ();
1011#endif 1093#endif
1012} 1094}
1013 1095
1014/* 1096/*
1015 * Set the width/height of the vt window in characters. Units are pixels. 1097 * Set the width/height of the vt window in characters. Units are pixels.
… …
1076 status_rect.height = fheight; 1158 status_rect.height = fheight;
1077} 1159}
1078 1160
1079/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1080bool 1162bool
1081rxvt_term::IMisRunning () 1163rxvt_term::im_is_running ()
1082{ 1164{
1083 Atom atom; 1165 Atom atom;
1084 Window win; 1166 Window win;
1085 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1086 1168
… …
1095 1177
1096 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1097 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1098 1180
1099 if (win != None) 1181 if (win != None)
1100 return True; 1182 return true;
1101 } 1183 }
1102 1184
1103 return False; 1185 return false;
1104} 1186}
1105 1187
1106void 1188void
1107rxvt_term::IMSendSpot () 1189rxvt_term::im_send_spot ()
1108{ 1190{
1109 XPoint nspot; 1191 XPoint nspot;
1110 XVaNestedList preedit_attr; 1192 XVaNestedList preedit_attr;
1111 1193
1112 if (!Input_Context 1194 if (!Input_Context
… …
1218/* 1300/*
1219 * Try to open a XIM with the current modifiers, then see if we can 1301 * Try to open a XIM with the current modifiers, then see if we can
1220 * open a suitable preedit type 1302 * open a suitable preedit type
1221 */ 1303 */
1222bool 1304bool
1223rxvt_term::IM_get_IC (const char *modifiers) 1305rxvt_term::im_get_ic (const char *modifiers)
1224{ 1306{
1225 int i, j, found; 1307 int i, j, found;
1226 XIM xim; 1308 XIM xim;
1227 XPoint spot; 1309 XPoint spot;
1228 XRectangle rect, status_rect, needed_rect; 1310 XRectangle rect, status_rect, needed_rect;
1229 unsigned long fg, bg; 1311 unsigned long fg, bg;
1230 const char *p; 1312 const char *p;
1231 char **s; 1313 char **s;
1232 XIMStyles *xim_styles; 1314 XIMStyles *xim_styles;
1233#ifdef ENABLE_XIM_ONTHESPOT
1234 XIMCallback xcb[4];
1235#endif
1236 1315
1237 set_environ (envv); 1316 set_environ (envv);
1238 1317
1239 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1240 return false; 1319 return false;
… …
1261 p = pet[pi]; 1340 p = pet[pi];
1262 1341
1263 if (!p) 1342 if (!p)
1264 continue; 1343 continue;
1265 1344
1266 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1267 1346
1268 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1269 { 1348 {
1270 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1271 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1283 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1284 1363
1285 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1286 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1287 { 1366 {
1288 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1289 1368
1290 found = 1; 1369 found = 1;
1291 goto foundpet; 1370 goto foundpet;
1292 } 1371 }
1293 1372
1294 } 1373 }
1295 1374
1296 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1297 } 1376 }
1298 1377
1299foundpet: 1378foundpet:
1300 1379
1301 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1380 NULL); 1459 NULL);
1381 } 1460 }
1382#if ENABLE_XIM_ONTHESPOT 1461#if ENABLE_XIM_ONTHESPOT
1383 else if (input_style & XIMPreeditCallbacks) 1462 else if (input_style & XIMPreeditCallbacks)
1384 { 1463 {
1464 XIMCallback xcb[4];
1465
1385 im_set_position (spot); 1466 im_set_position (spot);
1386 1467
1387 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1468 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1388 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1469 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1389 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1470 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1404#endif 1485#endif
1405 1486
1406 Input_Context = XCreateIC (xim, 1487 Input_Context = XCreateIC (xim,
1407 XNInputStyle, input_style, 1488 XNInputStyle, input_style,
1408 XNClientWindow, vt, 1489 XNClientWindow, vt,
1409 XNFocusWindow, parent[0], 1490 XNFocusWindow, parent,
1410 preedit_attr ? XNPreeditAttributes : NULL, 1491 preedit_attr ? XNPreeditAttributes : NULL,
1411 preedit_attr, 1492 preedit_attr,
1412 status_attr ? XNStatusAttributes : NULL, 1493 status_attr ? XNStatusAttributes : NULL,
1413 status_attr, NULL); 1494 status_attr, NULL);
1414 1495
… …
1427 // unfortunately, only the focus window is used by XIM, hard to fix 1508 // unfortunately, only the focus window is used by XIM, hard to fix
1428 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1509 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1429 vt_select_input (); 1510 vt_select_input ();
1430#endif 1511#endif
1431 1512
1432 IMSetPosition (); 1513 im_set_position ();
1433 1514
1434 return true; 1515 return true;
1435} 1516}
1436 1517
1437void 1518void
… …
1457 p = rs[Rs_inputMethod]; 1538 p = rs[Rs_inputMethod];
1458 if (p && *p) 1539 if (p && *p)
1459 { 1540 {
1460 bool found = false; 1541 bool found = false;
1461 1542
1462 s = rxvt_splitcommastring (p); 1543 s = rxvt_strsplit (',', p);
1463 1544
1464 for (i = 0; s[i]; i++) 1545 for (i = 0; s[i]; i++)
1465 { 1546 {
1466 if (*s[i]) 1547 if (*s[i])
1467 { 1548 {
1468 strcpy (buf, "@im="); 1549 strcpy (buf, "@im=");
1469 strncat (buf, s[i], IMBUFSIZ - 5); 1550 strncat (buf, s[i], IMBUFSIZ - 5);
1470 if (IM_get_IC (buf)) 1551 if (im_get_ic (buf))
1471 { 1552 {
1472 found = true; 1553 found = true;
1473 break; 1554 break;
1474 } 1555 }
1475 } 1556 }
1476 } 1557 }
1477 1558
1478 rxvt_freecommastring (s); 1559 rxvt_free_strsplit (s);
1479 1560
1480 if (found) 1561 if (found)
1481 goto done; 1562 goto done;
1482 } 1563 }
1483 1564
1484 /* try with XMODIFIERS env. var. */ 1565 /* try with XMODIFIERS env. var. */
1485 if (IM_get_IC ("")) 1566 if (im_get_ic (""))
1486 goto done; 1567 goto done;
1487 1568
1488 /* try with no modifiers base IF the user didn't specify an IM */ 1569 /* try with no modifiers base IF the user didn't specify an IM */
1489 if (IM_get_IC ("@im=none")) 1570 if (im_get_ic ("@im=none"))
1490 goto done; 1571 goto done;
1491 1572
1492done: 1573done:
1493#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1494 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1495 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1496#endif 1577#endif
1497} 1578}
1498 1579
1499void 1580void
1500rxvt_term::IMSetPosition () 1581rxvt_term::im_set_position ()
1501{ 1582{
1502 XRectangle preedit_rect, status_rect, *needed_rect; 1583 XRectangle preedit_rect, status_rect, *needed_rect;
1503 XVaNestedList preedit_attr, status_attr; 1584 XVaNestedList preedit_attr, status_attr;
1504 1585
1505 if (!Input_Context 1586 if (!Input_Context
1506 || !focus 1587 || !focus
1507 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1588 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1508 || !IMisRunning ()) 1589 || !im_is_running ())
1509 return; 1590 return;
1510 1591
1511 if (input_style & XIMPreeditPosition) 1592 if (input_style & XIMPreeditPosition)
1512 { 1593 {
1513 im_set_size (preedit_rect); 1594 im_set_size (preedit_rect);
… …
1543 1624
1544void 1625void
1545rxvt_term::get_window_origin (int &x, int &y) 1626rxvt_term::get_window_origin (int &x, int &y)
1546{ 1627{
1547 Window cr; 1628 Window cr;
1548 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1549/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1550} 1630}
1551 1631
1552Pixmap 1632Pixmap
1553rxvt_term::get_pixmap_property (int prop_id) 1633rxvt_term::get_pixmap_property (Atom property)
1554{ 1634{
1555 if (prop_id > 0 && prop_id < NUM_XA) 1635 Pixmap pixmap = None;
1556 if (xa[prop_id]) 1636
1557 {
1558 int aformat; 1637 int aformat;
1559 unsigned long nitems, bytes_after; 1638 unsigned long nitems, bytes_after;
1560 Atom atype; 1639 Atom atype;
1561 unsigned char *prop = NULL; 1640 unsigned char *prop;
1562 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1641 int result = XGetWindowProperty (dpy, display->root, property,
1563 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1564 &nitems, &bytes_after, &prop); 1643 &nitems, &bytes_after, &prop);
1565 if (result == Success && prop && atype == XA_PIXMAP) 1644 if (result == Success)
1645 {
1646 if (atype == XA_PIXMAP)
1566 return *(Pixmap *)prop; 1647 pixmap = *(Pixmap *)prop;
1648 XFree (prop);
1567 } 1649 }
1568 1650
1569 return None; 1651 return pixmap;
1570} 1652}
1571 1653
1572#ifdef HAVE_BG_PIXMAP 1654#ifdef HAVE_BG_PIXMAP
1573# if TRACE_PIXMAPS
1574# undef update_background
1575void
1576rxvt_term::trace_update_background (const char *file, int line)
1577{
1578 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1579 update_background ();
1580}
1581# endif
1582 1655
1583void 1656void
1584rxvt_term::update_background () 1657rxvt_term::update_background ()
1585{ 1658{
1586 if (update_background_ev.is_active ()) 1659 if (update_background_ev.is_active ())
1587 return; 1660 return;
1588 1661
1589 bgPixmap.invalidate (); 1662 bg_invalidate ();
1590 1663
1591 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1592 1665
1593 if (to_wait <= 0.) 1666 if (to_wait <= 0.)
1594 bgPixmap.render (); 1667 bg_render ();
1595 else 1668 else
1596 update_background_ev.start (to_wait); 1669 update_background_ev.start (to_wait);
1597} 1670}
1598 1671
1599void 1672void
1600rxvt_term::update_background_cb (ev::timer &w, int revents) 1673rxvt_term::update_background_cb (ev::timer &w, int revents)
1601{ 1674{
1602 make_current (); 1675 make_current ();
1603 1676
1604 update_background_ev.stop (); 1677 update_background_ev.stop ();
1605 bgPixmap.render (); 1678 bg_render ();
1606 refresh_check (); 1679 refresh_check ();
1607} 1680}
1608 1681
1609#endif /* HAVE_BG_PIXMAP */ 1682#endif /* HAVE_BG_PIXMAP */
1610 1683

Diff Legend

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