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.333 by root, Fri Oct 22 05:57:59 2010 UTC vs.
Revision 1.380 by root, Tue Jun 5 11:35:58 2012 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.
… …
36#include "keyboard.h" 36#include "keyboard.h"
37#include "rxvtperl.h" 37#include "rxvtperl.h"
38 38
39#include <limits> 39#include <limits>
40 40
41#include <cassert> 41#include <assert.h>
42#include <csignal> 42#include <signal.h>
43#include <cstring> 43#include <string.h>
44 44
45#include <termios.h> 45#include <termios.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56struct termios rxvt_term::def_tio; 54struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
58 56
… …
96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97{ 95{
98 compose_char *cc; 96 compose_char *cc;
99 97
100 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
101 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
102 cc = (*this)[c1]; 100 cc = (*this)[c1];
103 while (cc) 101 while (cc)
104 { 102 {
105 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
107 } 105 }
108 106
109 // check to see whether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
111 {
112 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
113 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
114 }
115 111
116 // allocate a new combination 112 // allocate a new combination
117 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118 { 114 {
119 static int seen; 115 static int seen;
120 116
121 if (!seen++) 117 if (!seen++)
122 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123 119
124 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
125 } 121 }
126 122
127 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
176#endif 172#endif
177#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
179#endif 175#endif
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#ifdef USE_XIM 177#if USE_XIM
182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
183#endif 179#endif
184#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
186#endif 182#endif
… …
189#endif 185#endif
190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 192
198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199 194
… …
228 delete fontset[i]; 223 delete fontset[i];
229#endif 224#endif
230 delete fontset[0]; 225 delete fontset[0];
231 226
232#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy (); 228 bg_destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif 229#endif
241 230
242 if (display) 231 if (display)
243 { 232 {
244 selection_clear (); 233 selection_clear ();
245 selection_clear (true); 234 selection_clear (true);
246 235
247#ifdef USE_XIM 236#if USE_XIM
248 im_destroy (); 237 im_destroy ();
249#endif 238#endif
250 scrollBar.destroy (); 239 scrollBar.destroy ();
251 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
252 241
253 delete drawable; 242 delete drawable;
254 // destroy all windows 243 // destroy all windows
255 if (parent[0]) 244 if (parent)
256 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
257 246
258 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
260 { 249 {
261 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
276 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
277 free (allocated [i]); 266 free (allocated [i]);
278 267
279 free (selection.text); 268 free (selection.text);
280 free (selection.clip_text); 269 free (selection.clip_text);
281 // TODO: manage env vars in child only(!)
282 free (env_display);
283 free (env_term);
284 free (locale); 270 free (locale);
285 free (v_buffer); 271 free (v_buffer);
286 free (incr_buf); 272
273 delete selection_req;
287 274
288 delete envv; 275 delete envv;
289 delete argv; 276 delete argv;
290 277
291#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
327#endif 314#endif
328 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
329#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
330 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
331#endif 318#endif
332 incr_ev.stop ();
333 termwin_ev.stop (display); 319 termwin_ev.stop (display);
334 vt_ev.stop (display); 320 vt_ev.stop (display);
335 } 321 }
336 322
337 flush_ev.stop (); 323 flush_ev.stop ();
… …
361 make_current (); 347 make_current ();
362 348
363 delete this; 349 delete this;
364} 350}
365 351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
362}
363
366/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
367/* 365/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
369 * TODO: if debugging, this should free up any known resources if we can
370 */ 367 */
371static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
372 369
373static void 370static void
374rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
376 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
377 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
378} 375}
379 376
380#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
381static void 378static void ecb_cold
382print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
383{ 380{
384 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
386 char number[32]; 383 char number[32];
387 char *mtype = "XlibMessage"; 384
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 385 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386
387 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389
390 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
391 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
396
394 sprintf(number, "%d", event->request_code); 397 sprintf (number, "%d", event->request_code);
395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
396 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("+ (which is %s)\n", buffer);
400
397 if (event->request_code >= 128) { 401 if (event->request_code >= 128)
402 {
398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 403 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
399 mesg, BUFSIZ); 404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
401 } 405 }
406
402 if ((event->error_code == BadWindow) || 407 if (event->error_code == BadWindow
403 (event->error_code == BadPixmap) || 408 || event->error_code == BadPixmap
404 (event->error_code == BadCursor) || 409 || event->error_code == BadCursor
405 (event->error_code == BadFont) || 410 || event->error_code == BadFont
406 (event->error_code == BadDrawable) || 411 || event->error_code == BadDrawable
407 (event->error_code == BadColor) || 412 || event->error_code == BadColor
408 (event->error_code == BadGC) || 413 || event->error_code == BadGC
409 (event->error_code == BadIDChoice) || 414 || event->error_code == BadIDChoice
410 (event->error_code == BadValue) || 415 || event->error_code == BadValue
411 (event->error_code == BadAtom)) { 416 || event->error_code == BadAtom)
417 {
412 if (event->error_code == BadValue) 418 if (event->error_code == BadValue)
413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 419 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ);
415 else if (event->error_code == BadAtom) 420 else if (event->error_code == BadAtom)
416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 421 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else 422 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 423 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
422 }
423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
424 mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426}
427#endif
428 424
429int 425 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
426 }
427}
428#endif
429
430int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 431rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 432{
432 if (GET_R->allowedxerror == -1) 433 if (GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
434 else 435 else
… …
443 } 444 }
444 445
445 return 0; 446 return 0;
446} 447}
447 448
448int 449int ecb_cold
449rxvt_xioerror_handler (Display *display) 450rxvt_xioerror_handler (Display *display)
450{ 451{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 452 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display)); 453 DisplayString (display));
453 rxvt_emergency_cleanup (); 454 rxvt_emergency_cleanup ();
… …
511 tio->c_cc[VWERSE] = CWERASE; 512 tio->c_cc[VWERSE] = CWERASE;
512# endif 513# endif
513# ifdef VLNEXT 514# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT; 515 tio->c_cc[VLNEXT] = CLNEXT;
515# endif 516# endif
517# ifdef VSTATUS
518 tio->c_cc[VSTATUS] = CSTATUS;
519# endif
516 520
517# if VMIN != VEOF 521# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1; 522 tio->c_cc[VMIN] = 1;
519# endif 523# endif
520# if VTIME != VEOL 524# if VTIME != VEOL
… …
554 558
555 // get rid of stdin/stdout as we don't need them, to free resources 559 // get rid of stdin/stdout as we don't need them, to free resources
556 dup2 (STDERR_FILENO, STDIN_FILENO); 560 dup2 (STDERR_FILENO, STDIN_FILENO);
557 dup2 (STDERR_FILENO, STDOUT_FILENO); 561 dup2 (STDERR_FILENO, STDOUT_FILENO);
558 562
559 ptytty::init ();
560
561 if (!ev_default_loop ()) 563 if (!ev_default_loop ())
562 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 564 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
563 565
564 rxvt_environ = environ; 566 rxvt_environ = environ;
565 567
… …
572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
573 // TODO: handle this with exceptions and tolerate the memory loss 575 // TODO: handle this with exceptions and tolerate the memory loss
574 XSetIOErrorHandler (rxvt_xioerror_handler); 576 XSetIOErrorHandler (rxvt_xioerror_handler);
575 577
576 XrmInitialize (); 578 XrmInitialize ();
579
580#if HAVE_PIXBUF
581 g_type_init ();
582#endif
577} 583}
578 584
579/*----------------------------------------------------------------------*/ 585/*----------------------------------------------------------------------*/
580/* 586/*
581 * window size/position calculations for XSizeHint and other storage. 587 * window size/position calculations for XSizeHint and other storage.
… …
702 if (recalc_y) 708 if (recalc_y)
703 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 709 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
704 710
705 ncol = width / fwidth; 711 ncol = width / fwidth;
706 nrow = height / fheight; 712 nrow = height / fheight;
713
714 // When the size of the vt window is not a multiple of the cell
715 // size, i.e., when the wm does not honour our size hints, there are
716 // extra areas not covered by the terminal screen. Such gaps, when a
717 // bg pixmap is set, would have to be cleared manually to properly
718 // refresh the background. We take the simpler route and shrink the
719 // vt window so as to avoid creating gaps.
720 vt_width = ncol * fwidth;
721 vt_height = nrow * fheight;
707} 722}
708 723
709/*----------------------------------------------------------------------*/ 724/*----------------------------------------------------------------------*/
710/* 725/*
711 * Tell the teletype handler what size the window is. 726 * Tell the teletype handler what size the window is.
… …
719 734
720 struct winsize ws; 735 struct winsize ws;
721 736
722 ws.ws_col = ncol; 737 ws.ws_col = ncol;
723 ws.ws_row = nrow; 738 ws.ws_row = nrow;
724 ws.ws_xpixel = width; 739 ws.ws_xpixel = vt_width;
725 ws.ws_ypixel = height; 740 ws.ws_ypixel = vt_height;
726 ioctl (pty->pty, TIOCSWINSZ, &ws); 741 ioctl (pty->pty, TIOCSWINSZ, &ws);
727 742
728#if 0 743#if 0
729 // TIOCSWINSZ is supposed to do this automatically and correctly 744 // TIOCSWINSZ is supposed to do this automatically and correctly
730 if (cmd_pid) /* force through to the command */ 745 if (cmd_pid) /* force through to the command */
731 kill (-cmd_pid, SIGWINCH); 746 kill (-cmd_pid, SIGWINCH);
732#endif 747#endif
733} 748}
734 749
735/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
736/* set_fonts () - load and set the various fonts 751/* load and set the various fonts */
737 *
738 * init = 1 - initialize
739 *
740 * fontname == FONT_UP - switch to bigger font
741 * fontname == FONT_DN - switch to smaller font
742 */
743bool 752bool
744rxvt_term::set_fonts () 753rxvt_term::set_fonts ()
745{ 754{
746 rxvt_fontset *fs = new rxvt_fontset (this); 755 rxvt_fontset *fs = new rxvt_fontset (this);
747 rxvt_fontprop prop; 756 rxvt_fontprop prop;
… …
762 771
763 delete fontset[0]; 772 delete fontset[0];
764 fontset[0] = fs; 773 fontset[0] = fs;
765 774
766 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 775 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
767 prop.height += lineSpace;
768 prop.width += letterSpace; 776 prop.width += letterSpace;
769 777
770 fs->set_prop (prop, false); 778 fs->set_prop (prop, false);
771 779
772 fwidth = prop.width; 780 fwidth = prop.width;
773 fheight = prop.height; 781 fheight = prop.height + lineSpace;
774 fbase = prop.ascent; 782 fbase = prop.ascent;
775 783
776 for (int style = 1; style < 4; style++) 784 for (int style = 1; style < 4; style++)
777 { 785 {
778#if ENABLE_STYLES 786#if ENABLE_STYLES
… …
804#else 812#else
805 fontset[style] = fontset[0]; 813 fontset[style] = fontset[0];
806#endif 814#endif
807 } 815 }
808 816
809 if (parent[0]) 817 if (parent)
810 { 818 {
811 resize_all_windows (0, 0, 0); 819 resize_all_windows (0, 0, 0);
812 scr_remap_chars (); 820 scr_remap_chars ();
813 scr_touch (true); 821 scr_touch (true);
814 } 822 }
… …
817} 825}
818 826
819void 827void
820rxvt_term::set_string_property (Atom prop, const char *str, int len) 828rxvt_term::set_string_property (Atom prop, const char *str, int len)
821{ 829{
822 XChangeProperty (dpy, parent[0], 830 XChangeProperty (dpy, parent,
823 prop, XA_STRING, 8, PropModeReplace, 831 prop, XA_STRING, 8, PropModeReplace,
824 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 832 (const unsigned char *)str, len >= 0 ? len : strlen (str));
825} 833}
826 834
827void 835void
… …
829{ 837{
830 XTextProperty ct; 838 XTextProperty ct;
831 839
832 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 840 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
833 { 841 {
834 XSetTextProperty (dpy, parent[0], &ct, prop); 842 XSetTextProperty (dpy, parent, &ct, prop);
835 XFree (ct.value); 843 XFree (ct.value);
836 } 844 }
837} 845}
838 846
839void 847void
840rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 848rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
841{ 849{
842 wchar_t *ws = rxvt_mbstowcs (str, len); 850 wchar_t *ws = rxvt_mbstowcs (str, len);
843 char *s = rxvt_wcstoutf8 (ws); 851 char *s = rxvt_wcstoutf8 (ws);
844 852
845 XChangeProperty (dpy, parent[0], 853 XChangeProperty (dpy, parent,
846 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 854 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
847 (const unsigned char *)s, strlen (s)); 855 (const unsigned char *)s, strlen (s));
848 856
849 free (s); 857 free (s);
850 free (ws); 858 free (ws);
… …
940 948
941/*----------------------------------------------------------------------*/ 949/*----------------------------------------------------------------------*/
942/* 950/*
943 * find if fg/bg matches any of the normal (low-intensity) colors 951 * find if fg/bg matches any of the normal (low-intensity) colors
944 */ 952 */
945void 953char *
946rxvt_term::set_colorfgbg () 954rxvt_term::get_colorfgbg ()
947{ 955{
948 unsigned int i; 956 unsigned int i;
949 const char *xpmb = ""; 957 const char *xpmb = "";
950 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 958 char fstr[] = "default";
959 char bstr[] = "default";
960 char *env_colorfgbg;
951 961
952 strcpy (fstr, "default");
953 strcpy (bstr, "default");
954 for (i = Color_Black; i <= Color_White; i++) 962 for (i = Color_Black; i <= Color_White; i++)
955 if (pix_colors[Color_fg] == pix_colors[i]) 963 if (pix_colors[Color_fg] == pix_colors[i])
956 { 964 {
957 sprintf (fstr, "%d", (i - Color_Black)); 965 sprintf (fstr, "%d", i - Color_Black);
958 break; 966 break;
959 } 967 }
960 968
961 for (i = Color_Black; i <= Color_White; i++) 969 for (i = Color_Black; i <= Color_White; i++)
962 if (pix_colors[Color_bg] == pix_colors[i]) 970 if (pix_colors[Color_bg] == pix_colors[i])
963 { 971 {
964 sprintf (bstr, "%d", (i - Color_Black)); 972 sprintf (bstr, "%d", i - Color_Black);
965#ifdef BG_IMAGE_FROM_FILE 973#if BG_IMAGE_FROM_FILE
966 xpmb = "default;"; 974 xpmb = "default;";
967#endif 975#endif
968 break; 976 break;
969 } 977 }
970 978
979 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
971 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 980 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
981 return env_colorfgbg;
972} 982}
973 983
974/*----------------------------------------------------------------------*/ 984/*----------------------------------------------------------------------*/
975 985
976bool 986bool
… …
1005 1015
1006 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1007 if (set_hint) 1017 if (set_hint)
1008 { 1018 {
1009 szHint.flags &= ~(PBaseSize | PResizeInc); 1019 szHint.flags &= ~(PBaseSize | PResizeInc);
1010 XSetWMNormalHints (dpy, parent[0], &szHint); 1020 XSetWMNormalHints (dpy, parent, &szHint);
1011 szHint.flags |= PBaseSize | PResizeInc; 1021 szHint.flags |= PBaseSize | PResizeInc;
1012 } 1022 }
1013 1023
1014 if (!ignoreparent) 1024 if (!ignoreparent)
1015 { 1025 {
… …
1021 int x, y, x1, y1; 1031 int x, y, x1, y1;
1022 int dx, dy; 1032 int dx, dy;
1023 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1033 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1024 Window unused_cr; 1034 Window unused_cr;
1025 1035
1026 XTranslateCoordinates (dpy, parent[0], display->root, 1036 XTranslateCoordinates (dpy, parent, display->root,
1027 0, 0, &x, &y, &unused_cr); 1037 0, 0, &x, &y, &unused_cr);
1028 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1038 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1029 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1039 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1030 /* 1040 /*
1031 * if display->root isn't the parent window, a WM will probably have offset 1041 * if display->root isn't the parent window, a WM will probably have offset
1032 * our position for handles and decorations. Counter it 1042 * our position for handles and decorations. Counter it
1033 */ 1043 */
… …
1050 if (y < y1) /* top half */ 1060 if (y < y1) /* top half */
1051 dy = 0; 1061 dy = 0;
1052 else if (y == y1) /* exact center */ 1062 else if (y == y1) /* exact center */
1053 dy /= 2; 1063 dy /= 2;
1054 1064
1055 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1065 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1056 szHint.width, szHint.height); 1066 szHint.width, szHint.height);
1057#else 1067#else
1058 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1068 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1059#endif 1069#endif
1060 } 1070 }
1061 1071
1062 if (set_hint) 1072 if (set_hint)
1063 XSetWMNormalHints (dpy, parent[0], &szHint); 1073 XSetWMNormalHints (dpy, parent, &szHint);
1064 1074
1065 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1066 1076
1067 if (fix_screen || newwidth != old_width || newheight != old_height) 1077 if (fix_screen || newwidth != old_width || newheight != old_height)
1068 { 1078 {
1069 if (scrollBar.state) 1079 if (scrollBar.state)
1070 scrollBar.resize (); 1080 scrollBar.resize ();
1071 1081
1072 XMoveResizeWindow (dpy, vt, 1082 XMoveResizeWindow (dpy, vt,
1073 window_vt_x, window_vt_y, 1083 window_vt_x, window_vt_y,
1074 width, height); 1084 vt_width, vt_height);
1085
1086 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1075 1087
1076#ifdef HAVE_BG_PIXMAP 1088#ifdef HAVE_BG_PIXMAP
1077 if (bgPixmap.window_size_sensitive ()) 1089 if (bg_window_size_sensitive ())
1078 update_background (); 1090 update_background ();
1079#endif 1091#endif
1080 } 1092 }
1081 1093
1082 if (fix_screen || old_height == 0) 1094 if (fix_screen || old_height == 0)
1083 scr_reset (); 1095 scr_reset ();
1084 1096
1085#ifdef HAVE_BG_PIXMAP
1086// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1087// if (bgPixmap.pixmap)
1088// scr_touch (false);
1089#endif
1090
1091#ifdef USE_XIM 1097#if USE_XIM
1092 IMSetPosition (); 1098 im_set_position ();
1093#endif 1099#endif
1094} 1100}
1095 1101
1096/* 1102/*
1097 * Set the width/height of the vt window in characters. Units are pixels. 1103 * Set the width/height of the vt window in characters. Units are pixels.
… …
1110 newwidth = wattr.width - szHint.base_width; 1116 newwidth = wattr.width - szHint.base_width;
1111 if (newheight == 0) 1117 if (newheight == 0)
1112 newheight = wattr.height - szHint.base_height; 1118 newheight = wattr.height - szHint.base_height;
1113 } 1119 }
1114 1120
1115 if (newwidth != width || newheight != height) 1121 if (newwidth != vt_width || newheight != vt_height)
1116 { 1122 {
1117 newwidth += szHint.base_width; 1123 newwidth += szHint.base_width;
1118 newheight += szHint.base_height; 1124 newheight += szHint.base_height;
1119 resize_all_windows (newwidth, newheight, 0); 1125 resize_all_windows (newwidth, newheight, 0);
1120 } 1126 }
1121} 1127}
1122 1128
1123/* -------------------------------------------------------------------- * 1129/* -------------------------------------------------------------------- *
1124 * - X INPUT METHOD ROUTINES - * 1130 * - X INPUT METHOD ROUTINES - *
1125 * -------------------------------------------------------------------- */ 1131 * -------------------------------------------------------------------- */
1126#ifdef USE_XIM 1132#if USE_XIM
1127 1133
1128void 1134void
1129rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1135rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1130{ 1136{
1131 fg = pix_colors [Color_fg]; 1137 fg = pix_colors [Color_fg];
… …
1158 status_rect.height = fheight; 1164 status_rect.height = fheight;
1159} 1165}
1160 1166
1161/* Checking whether input method is running. */ 1167/* Checking whether input method is running. */
1162bool 1168bool
1163rxvt_term::IMisRunning () 1169rxvt_term::im_is_running ()
1164{ 1170{
1165 Atom atom; 1171 Atom atom;
1166 Window win; 1172 Window win;
1167 char server[IMBUFSIZ]; 1173 char server[IMBUFSIZ];
1168 1174
… …
1177 1183
1178 atom = XInternAtom (dpy, server, False); 1184 atom = XInternAtom (dpy, server, False);
1179 win = XGetSelectionOwner (dpy, atom); 1185 win = XGetSelectionOwner (dpy, atom);
1180 1186
1181 if (win != None) 1187 if (win != None)
1182 return True; 1188 return true;
1183 } 1189 }
1184 1190
1185 return False; 1191 return false;
1186} 1192}
1187 1193
1188void 1194void
1189rxvt_term::IMSendSpot () 1195rxvt_term::im_send_spot ()
1190{ 1196{
1191 XPoint nspot; 1197 XPoint nspot;
1192 XVaNestedList preedit_attr; 1198 XVaNestedList preedit_attr;
1193 1199
1194 if (!Input_Context 1200 if (!Input_Context
… …
1300/* 1306/*
1301 * Try to open a XIM with the current modifiers, then see if we can 1307 * Try to open a XIM with the current modifiers, then see if we can
1302 * open a suitable preedit type 1308 * open a suitable preedit type
1303 */ 1309 */
1304bool 1310bool
1305rxvt_term::IM_get_IC (const char *modifiers) 1311rxvt_term::im_get_ic (const char *modifiers)
1306{ 1312{
1307 int i, j, found; 1313 int i, j, found;
1308 XIM xim; 1314 XIM xim;
1309 XPoint spot; 1315 XPoint spot;
1310 XRectangle rect, status_rect, needed_rect; 1316 XRectangle rect, status_rect, needed_rect;
1311 unsigned long fg, bg; 1317 unsigned long fg, bg;
1312 const char *p; 1318 const char *p;
1313 char **s; 1319 char **s;
1314 XIMStyles *xim_styles; 1320 XIMStyles *xim_styles;
1315#ifdef ENABLE_XIM_ONTHESPOT
1316 XIMCallback xcb[4];
1317#endif
1318 1321
1319 set_environ (envv); 1322 set_environ (envv);
1320 1323
1321 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1322 return false; 1325 return false;
… …
1343 p = pet[pi]; 1346 p = pet[pi];
1344 1347
1345 if (!p) 1348 if (!p)
1346 continue; 1349 continue;
1347 1350
1348 s = rxvt_splitcommastring (p); 1351 s = rxvt_strsplit (',', p);
1349 1352
1350 for (i = found = 0; !found && s[i]; i++) 1353 for (i = found = 0; !found && s[i]; i++)
1351 { 1354 {
1352 if (!strcmp (s[i], "OverTheSpot")) 1355 if (!strcmp (s[i], "OverTheSpot"))
1353 input_style = XIMPreeditPosition | XIMStatusNothing; 1356 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1365 input_style = XIMPreeditNothing | XIMStatusNothing; 1368 input_style = XIMPreeditNothing | XIMStatusNothing;
1366 1369
1367 for (j = 0; j < xim_styles->count_styles; j++) 1370 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1371 if (input_style == xim_styles->supported_styles[j])
1369 { 1372 {
1370 rxvt_freecommastring (s); 1373 rxvt_free_strsplit (s);
1371 1374
1372 found = 1; 1375 found = 1;
1373 goto foundpet; 1376 goto foundpet;
1374 } 1377 }
1375 1378
1376 } 1379 }
1377 1380
1378 rxvt_freecommastring (s); 1381 rxvt_free_strsplit (s);
1379 } 1382 }
1380 1383
1381foundpet: 1384foundpet:
1382 1385
1383 XFree (xim_styles); 1386 XFree (xim_styles);
… …
1462 NULL); 1465 NULL);
1463 } 1466 }
1464#if ENABLE_XIM_ONTHESPOT 1467#if ENABLE_XIM_ONTHESPOT
1465 else if (input_style & XIMPreeditCallbacks) 1468 else if (input_style & XIMPreeditCallbacks)
1466 { 1469 {
1470 XIMCallback xcb[4];
1471
1467 im_set_position (spot); 1472 im_set_position (spot);
1468 1473
1469 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1474 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1470 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1475 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1471 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1476 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1486#endif 1491#endif
1487 1492
1488 Input_Context = XCreateIC (xim, 1493 Input_Context = XCreateIC (xim,
1489 XNInputStyle, input_style, 1494 XNInputStyle, input_style,
1490 XNClientWindow, vt, 1495 XNClientWindow, vt,
1491 XNFocusWindow, parent[0], 1496 XNFocusWindow, parent,
1492 preedit_attr ? XNPreeditAttributes : NULL, 1497 preedit_attr ? XNPreeditAttributes : NULL,
1493 preedit_attr, 1498 preedit_attr,
1494 status_attr ? XNStatusAttributes : NULL, 1499 status_attr ? XNStatusAttributes : NULL,
1495 status_attr, NULL); 1500 status_attr, NULL);
1496 1501
… …
1509 // unfortunately, only the focus window is used by XIM, hard to fix 1514 // unfortunately, only the focus window is used by XIM, hard to fix
1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1515 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1511 vt_select_input (); 1516 vt_select_input ();
1512#endif 1517#endif
1513 1518
1514 IMSetPosition (); 1519 im_set_position ();
1515 1520
1516 return true; 1521 return true;
1517} 1522}
1518 1523
1519void 1524void
… …
1529 im_destroy (); 1534 im_destroy ();
1530 1535
1531 if (Input_Context) 1536 if (Input_Context)
1532 return; 1537 return;
1533 1538
1534#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1535 if (rs[Rs_imLocale]) 1539 if (rs[Rs_imLocale])
1536 SET_LOCALE (rs[Rs_imLocale]); 1540 SET_LOCALE (rs[Rs_imLocale]);
1537#endif
1538 1541
1539 p = rs[Rs_inputMethod]; 1542 p = rs[Rs_inputMethod];
1540 if (p && *p) 1543 if (p && *p)
1541 { 1544 {
1542 bool found = false; 1545 bool found = false;
1543 1546
1544 s = rxvt_splitcommastring (p); 1547 s = rxvt_strsplit (',', p);
1545 1548
1546 for (i = 0; s[i]; i++) 1549 for (i = 0; s[i]; i++)
1547 { 1550 {
1548 if (*s[i]) 1551 if (*s[i])
1549 { 1552 {
1550 strcpy (buf, "@im="); 1553 strcpy (buf, "@im=");
1551 strncat (buf, s[i], IMBUFSIZ - 5); 1554 strncat (buf, s[i], IMBUFSIZ - 5);
1552 if (IM_get_IC (buf)) 1555 if (im_get_ic (buf))
1553 { 1556 {
1554 found = true; 1557 found = true;
1555 break; 1558 break;
1556 } 1559 }
1557 } 1560 }
1558 } 1561 }
1559 1562
1560 rxvt_freecommastring (s); 1563 rxvt_free_strsplit (s);
1561 1564
1562 if (found) 1565 if (found)
1563 goto done; 1566 goto done;
1564 } 1567 }
1565 1568
1566 /* try with XMODIFIERS env. var. */ 1569 /* try with XMODIFIERS env. var. */
1567 if (IM_get_IC ("")) 1570 if (im_get_ic (""))
1568 goto done; 1571 goto done;
1569 1572
1570 /* try with no modifiers base IF the user didn't specify an IM */ 1573 /* try with no modifiers base IF the user didn't specify an IM */
1571 if (IM_get_IC ("@im=none")) 1574 if (im_get_ic ("@im=none"))
1572 goto done; 1575 goto done;
1573 1576
1574done: 1577done:
1575#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1576 if (rs[Rs_imLocale]) 1578 if (rs[Rs_imLocale])
1577 SET_LOCALE (locale); 1579 SET_LOCALE (locale);
1578#endif
1579} 1580}
1580 1581
1581void 1582void
1582rxvt_term::IMSetPosition () 1583rxvt_term::im_set_position ()
1583{ 1584{
1584 XRectangle preedit_rect, status_rect, *needed_rect; 1585 XRectangle preedit_rect, status_rect, *needed_rect;
1585 XVaNestedList preedit_attr, status_attr; 1586 XVaNestedList preedit_attr, status_attr;
1586 1587
1587 if (!Input_Context 1588 if (!Input_Context
1588 || !focus 1589 || !focus
1589 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1590 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1590 || !IMisRunning ()) 1591 || !im_is_running ())
1591 return; 1592 return;
1592 1593
1593 if (input_style & XIMPreeditPosition) 1594 if (input_style & XIMPreeditPosition)
1594 { 1595 {
1595 im_set_size (preedit_rect); 1596 im_set_size (preedit_rect);
… …
1625 1626
1626void 1627void
1627rxvt_term::get_window_origin (int &x, int &y) 1628rxvt_term::get_window_origin (int &x, int &y)
1628{ 1629{
1629 Window cr; 1630 Window cr;
1630 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1631 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1631/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1632}
1633
1634Pixmap
1635rxvt_term::get_pixmap_property (int prop_id)
1636{
1637 if (prop_id > 0 && prop_id < NUM_XA)
1638 if (xa[prop_id])
1639 {
1640 int aformat;
1641 unsigned long nitems, bytes_after;
1642 Atom atype;
1643 unsigned char *prop = NULL;
1644 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1645 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1646 &nitems, &bytes_after, &prop);
1647 if (result == Success && prop && atype == XA_PIXMAP)
1648 return *(Pixmap *)prop;
1649 }
1650
1651 return None;
1652} 1632}
1653 1633
1654#ifdef HAVE_BG_PIXMAP 1634#ifdef HAVE_BG_PIXMAP
1655# if TRACE_PIXMAPS
1656# undef update_background
1657void
1658rxvt_term::trace_update_background (const char *file, int line)
1659{
1660 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1661 update_background ();
1662}
1663# endif
1664 1635
1665void 1636void
1666rxvt_term::update_background () 1637rxvt_term::update_background ()
1667{ 1638{
1668 if (update_background_ev.is_active ()) 1639 if (update_background_ev.is_active ())
1669 return; 1640 return;
1670 1641
1671 bgPixmap.invalidate (); 1642 bg_invalidate ();
1672 1643
1644 if (!mapped)
1645 return;
1646
1673 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1647 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1674 1648
1675 if (to_wait <= 0.) 1649 if (to_wait <= 0.)
1676 bgPixmap.render (); 1650 bg_render ();
1677 else 1651 else
1678 update_background_ev.start (to_wait); 1652 update_background_ev.start (to_wait);
1679} 1653}
1680 1654
1681void 1655void
1682rxvt_term::update_background_cb (ev::timer &w, int revents) 1656rxvt_term::update_background_cb (ev::timer &w, int revents)
1683{ 1657{
1684 make_current (); 1658 make_current ();
1685 1659
1686 update_background_ev.stop (); 1660 update_background_ev.stop ();
1687 bgPixmap.render (); 1661 bg_render ();
1688 refresh_check (); 1662 refresh_check ();
1689} 1663}
1690 1664
1691#endif /* HAVE_BG_PIXMAP */ 1665#endif /* HAVE_BG_PIXMAP */
1692 1666

Diff Legend

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