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.345 by root, Sat Jan 8 10:17:43 2011 UTC vs.
Revision 1.392 by sf-exg, Mon Nov 3 09:40:26 2014 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-2010 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 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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
… …
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 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
113 111
114 // allocate a new combination 112 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
… …
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 169#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
… …
187#endif 185#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 192
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 194
… …
226 delete fontset[i]; 223 delete fontset[i];
227#endif 224#endif
228 delete fontset[0]; 225 delete fontset[0];
229 226
230#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 228 bg_destroy ();
232#endif 229#endif
233#ifdef HAVE_AFTERIMAGE 230
234 if (asv) 231#if HAVE_IMG
235 destroy_asvisual (asv, 0); 232 delete bg_img;
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 233#endif
239 234
240 if (display) 235 if (display)
241 { 236 {
242 selection_clear (); 237 selection_clear ();
243 selection_clear (true); 238 selection_clear (true);
244 239
245#ifdef USE_XIM 240#if USE_XIM
246 im_destroy (); 241 im_destroy ();
247#endif 242#endif
248 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
249 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
250 247
251 delete drawable; 248 delete drawable;
249
252 // destroy all windows 250 // destroy all windows
253 if (parent[0]) 251 if (parent)
254 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
255 253
256 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
258 { 256 {
259 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
… …
274 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 273 free (allocated [i]);
276 274
277 free (selection.text); 275 free (selection.text);
278 free (selection.clip_text); 276 free (selection.clip_text);
279 // TODO: manage env vars in child only(!)
280 free (env_display);
281 free (env_term);
282 free (locale); 277 free (locale);
283 free (v_buffer); 278 free (v_buffer);
284 free (incr_buf); 279
280 delete selection_req;
281
282 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
283 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
284
285 delete env;
285 286
286 delete envv; 287 delete envv;
287 delete argv; 288 delete argv;
288 289
289#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
… …
322 { 323 {
323#if USE_XIM 324#if USE_XIM
324 im_ev.stop (display); 325 im_ev.stop (display);
325#endif 326#endif
326 scrollbar_ev.stop (display); 327 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 328#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
328 rootwin_ev.stop (display); 329 rootwin_ev.stop (display);
329#endif 330#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 331 termwin_ev.stop (display);
332 vt_ev.stop (display); 332 vt_ev.stop (display);
333 } 333 }
334 334
335 flush_ev.stop (); 335 flush_ev.stop ();
… …
360 360
361 delete this; 361 delete this;
362} 362}
363 363
364void 364void
365rxvt_term::set_option (uint8_t opt, bool set) 365rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
366{ 366{
367 if (!opt) 367 if (!opt)
368 return; 368 return;
369 369
370 uint8_t mask = 1 << (opt & 7); 370 uint8_t mask = 1 << (opt & 7);
… …
374} 374}
375 375
376/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
377/* 377/*
378 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
379 * TODO: if debugging, this should free up any known resources if we can
380 */ 379 */
381static XErrorHandler old_xerror_handler; 380static XErrorHandler old_xerror_handler;
382 381
383static void 382static void
384rxvt_emergency_cleanup () 383rxvt_emergency_cleanup ()
… …
386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 385 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
387 (*t)->emergency_cleanup (); 386 (*t)->emergency_cleanup ();
388} 387}
389 388
390#if !ENABLE_MINIMAL 389#if !ENABLE_MINIMAL
391static void 390static void ecb_cold
392print_x_error (Display *dpy, XErrorEvent *event) 391print_x_error (Display *dpy, XErrorEvent *event)
393{ 392{
394 char buffer[BUFSIZ]; 393 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 394 char mesg[BUFSIZ];
396 char number[32]; 395 char number[32];
397 const char mtype[] = "XlibMessage"; 396
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 397 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
398
399 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
400 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
401
402 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
403 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
401 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 407 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
404 sprintf(number, "%d", event->request_code); 408
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer);
407 if (event->request_code >= 128) { 409 if (event->request_code >= 128)
410 {
411#if 0
412 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
413 int nexts;
414 char **exts = XListExtensions (dpy, &nexts);
415
416 while (nexts)
417 {
418 char *extname = exts [nexts - 1];
419 int major, first_event, first_error;
420
421 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
422 {
423 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
424 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
425
426 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
427 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
428 rxvt_warn ("+ (which is %s)\n", buffer);
429
430 break;
431 }
432
433 printf ("nextss %d %s\n", nexts, extname);//D
434 --nexts;
435 ++exts;
436 }
437#else
438 int nexts = 0;
439 char **exts = 0;
440#endif
441
442 if (!nexts)
443 {
444 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
445
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 446 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
409 mesg, BUFSIZ); 447 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 448
449#if 0
450 sprintf (number, "RENDER.%d", event->minor_code);
451 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
452 rxvt_warn ("+ (which is %s)\n", buffer);
453#endif
454 }
455
456 XFreeExtensionList (exts);
411 } 457 }
458 else
459 {
460 sprintf (number, "%d", event->request_code);
461 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
462 rxvt_warn ("+ (which is %s)\n", buffer);
463 }
464
412 if ((event->error_code == BadWindow) || 465 if (event->error_code == BadWindow
413 (event->error_code == BadPixmap) || 466 || event->error_code == BadPixmap
414 (event->error_code == BadCursor) || 467 || event->error_code == BadCursor
415 (event->error_code == BadFont) || 468 || event->error_code == BadFont
416 (event->error_code == BadDrawable) || 469 || event->error_code == BadDrawable
417 (event->error_code == BadColor) || 470 || event->error_code == BadColor
418 (event->error_code == BadGC) || 471 || event->error_code == BadGC
419 (event->error_code == BadIDChoice) || 472 || event->error_code == BadIDChoice
420 (event->error_code == BadValue) || 473 || event->error_code == BadValue
421 (event->error_code == BadAtom)) { 474 || event->error_code == BadAtom)
475 {
422 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
424 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
427 mesg, BUFSIZ);
428 else 480 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
430 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436}
437#endif
438 482
439int 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
484 }
485}
486#endif
487
488int ecb_cold
440rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{ 490{
442 if (GET_R->allowedxerror == -1) 491 if (GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code; 492 GET_R->allowedxerror = event->error_code;
444 else 493 else
… …
453 } 502 }
454 503
455 return 0; 504 return 0;
456} 505}
457 506
458int 507int ecb_cold
459rxvt_xioerror_handler (Display *display) 508rxvt_xioerror_handler (Display *display)
460{ 509{
461 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 510 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
462 DisplayString (display)); 511 DisplayString (display));
463 rxvt_emergency_cleanup (); 512 rxvt_emergency_cleanup ();
… …
583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
584 // TODO: handle this with exceptions and tolerate the memory loss 633 // TODO: handle this with exceptions and tolerate the memory loss
585 XSetIOErrorHandler (rxvt_xioerror_handler); 634 XSetIOErrorHandler (rxvt_xioerror_handler);
586 635
587 XrmInitialize (); 636 XrmInitialize ();
637
638#if HAVE_PIXBUF
639 g_type_init ();
640#endif
588} 641}
589 642
590/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
591/* 644/*
592 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
713 if (recalc_y) 766 if (recalc_y)
714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
715 768
716 ncol = width / fwidth; 769 ncol = width / fwidth;
717 nrow = height / fheight; 770 nrow = height / fheight;
771
772 // When the size of the vt window is not a multiple of the cell
773 // size, i.e., when the wm does not honour our size hints, there are
774 // extra areas not covered by the terminal screen. Such gaps, when a
775 // bg pixmap is set, would have to be cleared manually to properly
776 // refresh the background. We take the simpler route and shrink the
777 // vt window so as to avoid creating gaps.
778 vt_width = ncol * fwidth;
779 vt_height = nrow * fheight;
718} 780}
719 781
720/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
721/* 783/*
722 * Tell the teletype handler what size the window is. 784 * Tell the teletype handler what size the window is.
… …
730 792
731 struct winsize ws; 793 struct winsize ws;
732 794
733 ws.ws_col = ncol; 795 ws.ws_col = ncol;
734 ws.ws_row = nrow; 796 ws.ws_row = nrow;
735 ws.ws_xpixel = width; 797 ws.ws_xpixel = vt_width;
736 ws.ws_ypixel = height; 798 ws.ws_ypixel = vt_height;
737 ioctl (pty->pty, TIOCSWINSZ, &ws); 799 ioctl (pty->pty, TIOCSWINSZ, &ws);
738 800
739#if 0 801#if 0
740 // TIOCSWINSZ is supposed to do this automatically and correctly 802 // TIOCSWINSZ is supposed to do this automatically and correctly
741 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
742 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
743#endif 805#endif
744} 806}
745 807
746/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
747/* set_fonts () - load and set the various fonts 809/* load and set the various fonts */
748 *
749 * init = 1 - initialize
750 *
751 * fontname == FONT_UP - switch to bigger font
752 * fontname == FONT_DN - switch to smaller font
753 */
754bool 810bool
755rxvt_term::set_fonts () 811rxvt_term::set_fonts ()
756{ 812{
757 rxvt_fontset *fs = new rxvt_fontset (this); 813 rxvt_fontset *fs = new rxvt_fontset (this);
758 rxvt_fontprop prop; 814 rxvt_fontprop prop;
… …
773 829
774 delete fontset[0]; 830 delete fontset[0];
775 fontset[0] = fs; 831 fontset[0] = fs;
776 832
777 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
778 prop.height += lineSpace; 834 prop.width = max (prop.width + letterSpace, 1);
779 prop.width += letterSpace;
780 835
781 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
782 837
783 fwidth = prop.width; 838 fwidth = prop.width;
784 fheight = prop.height; 839 fheight = prop.height + lineSpace;
785 fbase = prop.ascent; 840 fbase = prop.ascent;
786 841
787 for (int style = 1; style < 4; style++) 842 for (int style = 1; style < 4; style++)
788 { 843 {
789#if ENABLE_STYLES 844#if ENABLE_STYLES
… …
815#else 870#else
816 fontset[style] = fontset[0]; 871 fontset[style] = fontset[0];
817#endif 872#endif
818 } 873 }
819 874
820 if (parent[0]) 875 if (parent)
821 { 876 {
822 resize_all_windows (0, 0, 0); 877 resize_all_windows (0, 0, 0);
823 scr_remap_chars (); 878 scr_remap_chars ();
824 scr_touch (true); 879 scr_touch (true);
825 } 880 }
… …
828} 883}
829 884
830void 885void
831rxvt_term::set_string_property (Atom prop, const char *str, int len) 886rxvt_term::set_string_property (Atom prop, const char *str, int len)
832{ 887{
833 XChangeProperty (dpy, parent[0], 888 XChangeProperty (dpy, parent,
834 prop, XA_STRING, 8, PropModeReplace, 889 prop, XA_STRING, 8, PropModeReplace,
835 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 890 (const unsigned char *)str, len >= 0 ? len : strlen (str));
836} 891}
837 892
838void 893void
… …
840{ 895{
841 XTextProperty ct; 896 XTextProperty ct;
842 897
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 898 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 { 899 {
845 XSetTextProperty (dpy, parent[0], &ct, prop); 900 XSetTextProperty (dpy, parent, &ct, prop);
846 XFree (ct.value); 901 XFree (ct.value);
847 } 902 }
848} 903}
849 904
850void 905void
851rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 906rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852{ 907{
853 wchar_t *ws = rxvt_mbstowcs (str, len); 908 wchar_t *ws = rxvt_mbstowcs (str, len);
854 char *s = rxvt_wcstoutf8 (ws); 909 char *s = rxvt_wcstoutf8 (ws);
855 910
856 XChangeProperty (dpy, parent[0], 911 XChangeProperty (dpy, parent,
857 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858 (const unsigned char *)s, strlen (s)); 913 (const unsigned char *)s, strlen (s));
859 914
860 free (s); 915 free (s);
861 free (ws); 916 free (ws);
… …
951 1006
952/*----------------------------------------------------------------------*/ 1007/*----------------------------------------------------------------------*/
953/* 1008/*
954 * find if fg/bg matches any of the normal (low-intensity) colors 1009 * find if fg/bg matches any of the normal (low-intensity) colors
955 */ 1010 */
956void 1011char *
957rxvt_term::set_colorfgbg () 1012rxvt_term::get_colorfgbg ()
958{ 1013{
959 unsigned int i; 1014 unsigned int i;
960 const char *xpmb = ""; 1015 const char *xpmb = "";
961 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1016 char fstr[] = "default";
1017 char bstr[] = "default";
1018 char *env_colorfgbg;
962 1019
963 strcpy (fstr, "default");
964 strcpy (bstr, "default");
965 for (i = Color_Black; i <= Color_White; i++) 1020 for (i = Color_Black; i <= Color_White; i++)
966 if (pix_colors[Color_fg] == pix_colors[i]) 1021 if (pix_colors[Color_fg] == pix_colors[i])
967 { 1022 {
968 sprintf (fstr, "%d", i - Color_Black); 1023 sprintf (fstr, "%d", i - Color_Black);
969 break; 1024 break;
… …
971 1026
972 for (i = Color_Black; i <= Color_White; i++) 1027 for (i = Color_Black; i <= Color_White; i++)
973 if (pix_colors[Color_bg] == pix_colors[i]) 1028 if (pix_colors[Color_bg] == pix_colors[i])
974 { 1029 {
975 sprintf (bstr, "%d", i - Color_Black); 1030 sprintf (bstr, "%d", i - Color_Black);
976#ifdef BG_IMAGE_FROM_FILE 1031#if BG_IMAGE_FROM_FILE
977 xpmb = "default;"; 1032 xpmb = "default;";
978#endif 1033#endif
979 break; 1034 break;
980 } 1035 }
981 1036
1037 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
982 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1038 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1039 return env_colorfgbg;
983} 1040}
984 1041
985/*----------------------------------------------------------------------*/ 1042/*----------------------------------------------------------------------*/
986 1043
987bool 1044bool
… …
1016 1073
1017 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1074 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1018 if (set_hint) 1075 if (set_hint)
1019 { 1076 {
1020 szHint.flags &= ~(PBaseSize | PResizeInc); 1077 szHint.flags &= ~(PBaseSize | PResizeInc);
1021 XSetWMNormalHints (dpy, parent[0], &szHint); 1078 XSetWMNormalHints (dpy, parent, &szHint);
1022 szHint.flags |= PBaseSize | PResizeInc; 1079 szHint.flags |= PBaseSize | PResizeInc;
1023 } 1080 }
1024 1081
1025 if (!ignoreparent) 1082 if (!ignoreparent)
1026 { 1083 {
… …
1032 int x, y, x1, y1; 1089 int x, y, x1, y1;
1033 int dx, dy; 1090 int dx, dy;
1034 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1091 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1035 Window unused_cr; 1092 Window unused_cr;
1036 1093
1037 XTranslateCoordinates (dpy, parent[0], display->root, 1094 XTranslateCoordinates (dpy, parent, display->root,
1038 0, 0, &x, &y, &unused_cr); 1095 0, 0, &x, &y, &unused_cr);
1039 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1096 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1040 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1097 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1041 /* 1098 /*
1042 * if display->root isn't the parent window, a WM will probably have offset 1099 * if display->root isn't the parent window, a WM will probably have offset
1043 * our position for handles and decorations. Counter it 1100 * our position for handles and decorations. Counter it
1044 */ 1101 */
… …
1061 if (y < y1) /* top half */ 1118 if (y < y1) /* top half */
1062 dy = 0; 1119 dy = 0;
1063 else if (y == y1) /* exact center */ 1120 else if (y == y1) /* exact center */
1064 dy /= 2; 1121 dy /= 2;
1065 1122
1066 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1123 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1067 szHint.width, szHint.height); 1124 szHint.width, szHint.height);
1068#else 1125#else
1069 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1126 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1070#endif 1127#endif
1071 } 1128 }
1072 1129
1073 if (set_hint) 1130 if (set_hint)
1074 XSetWMNormalHints (dpy, parent[0], &szHint); 1131 XSetWMNormalHints (dpy, parent, &szHint);
1075 1132
1076 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1077 1134
1078 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
1079 { 1136 {
1080 if (scrollBar.state) 1137 if (scrollBar.state)
1081 scrollBar.resize (); 1138 scrollBar.resize ();
1082 1139
1083 XMoveResizeWindow (dpy, vt, 1140 XMoveResizeWindow (dpy, vt,
1084 window_vt_x, window_vt_y, 1141 window_vt_x, window_vt_y,
1085 width, height); 1142 vt_width, vt_height);
1143
1144 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1086 1145
1087#ifdef HAVE_BG_PIXMAP 1146#ifdef HAVE_BG_PIXMAP
1088 if (bgPixmap.window_size_sensitive ()) 1147 if (bg_window_size_sensitive ())
1089 update_background (); 1148 update_background ();
1090#endif 1149#endif
1091 } 1150 }
1092 1151
1093 if (fix_screen || old_height == 0) 1152 if (fix_screen || old_height == 0)
1094 scr_reset (); 1153 scr_reset ();
1095 1154
1096#ifdef HAVE_BG_PIXMAP
1097// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1098// if (bgPixmap.pixmap)
1099// scr_touch (false);
1100#endif
1101
1102#ifdef USE_XIM 1155#if USE_XIM
1103 IMSetPosition (); 1156 im_set_position ();
1104#endif 1157#endif
1105} 1158}
1106 1159
1107/* 1160/*
1108 * Set the width/height of the vt window in characters. Units are pixels. 1161 * Set the width/height of the vt window in characters. Units are pixels.
… …
1121 newwidth = wattr.width - szHint.base_width; 1174 newwidth = wattr.width - szHint.base_width;
1122 if (newheight == 0) 1175 if (newheight == 0)
1123 newheight = wattr.height - szHint.base_height; 1176 newheight = wattr.height - szHint.base_height;
1124 } 1177 }
1125 1178
1126 if (newwidth != width || newheight != height) 1179 if (newwidth != vt_width || newheight != vt_height)
1127 { 1180 {
1128 newwidth += szHint.base_width; 1181 newwidth += szHint.base_width;
1129 newheight += szHint.base_height; 1182 newheight += szHint.base_height;
1130 resize_all_windows (newwidth, newheight, 0); 1183 resize_all_windows (newwidth, newheight, 0);
1131 } 1184 }
1132} 1185}
1133 1186
1134/* -------------------------------------------------------------------- * 1187/* -------------------------------------------------------------------- *
1135 * - X INPUT METHOD ROUTINES - * 1188 * - X INPUT METHOD ROUTINES - *
1136 * -------------------------------------------------------------------- */ 1189 * -------------------------------------------------------------------- */
1137#ifdef USE_XIM 1190#if USE_XIM
1138 1191
1139void 1192void
1140rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1193rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1141{ 1194{
1142 fg = pix_colors [Color_fg]; 1195 fg = pix_colors [Color_fg];
… …
1169 status_rect.height = fheight; 1222 status_rect.height = fheight;
1170} 1223}
1171 1224
1172/* Checking whether input method is running. */ 1225/* Checking whether input method is running. */
1173bool 1226bool
1174rxvt_term::IMisRunning () 1227rxvt_term::im_is_running ()
1175{ 1228{
1176 Atom atom; 1229 Atom atom;
1177 Window win; 1230 Window win;
1178 char server[IMBUFSIZ]; 1231 char server[IMBUFSIZ];
1179 1232
… …
1188 1241
1189 atom = XInternAtom (dpy, server, False); 1242 atom = XInternAtom (dpy, server, False);
1190 win = XGetSelectionOwner (dpy, atom); 1243 win = XGetSelectionOwner (dpy, atom);
1191 1244
1192 if (win != None) 1245 if (win != None)
1193 return True; 1246 return true;
1194 } 1247 }
1195 1248
1196 return False; 1249 return false;
1197} 1250}
1198 1251
1199void 1252void
1200rxvt_term::IMSendSpot () 1253rxvt_term::im_send_spot ()
1201{ 1254{
1202 XPoint nspot; 1255 XPoint nspot;
1203 XVaNestedList preedit_attr; 1256 XVaNestedList preedit_attr;
1204 1257
1205 if (!Input_Context 1258 if (!Input_Context
… …
1311/* 1364/*
1312 * Try to open a XIM with the current modifiers, then see if we can 1365 * Try to open a XIM with the current modifiers, then see if we can
1313 * open a suitable preedit type 1366 * open a suitable preedit type
1314 */ 1367 */
1315bool 1368bool
1316rxvt_term::IM_get_IC (const char *modifiers) 1369rxvt_term::im_get_ic (const char *modifiers)
1317{ 1370{
1318 int i, j, found; 1371 int i, j, found;
1319 XIM xim; 1372 XIM xim;
1320 XPoint spot; 1373 XPoint spot;
1321 XRectangle rect, status_rect, needed_rect; 1374 XRectangle rect, status_rect, needed_rect;
1322 unsigned long fg, bg; 1375 unsigned long fg, bg;
1323 const char *p; 1376 const char *p;
1324 char **s; 1377 char **s;
1325 XIMStyles *xim_styles; 1378 XIMStyles *xim_styles;
1326#ifdef ENABLE_XIM_ONTHESPOT
1327 XIMCallback xcb[4];
1328#endif
1329 1379
1330 set_environ (envv); 1380 set_environ (env);
1331 1381
1332 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1382 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1333 return false; 1383 return false;
1334 1384
1335 input_method = display->get_xim (locale, modifiers); 1385 input_method = display->get_xim (locale, modifiers);
1336 if (input_method == NULL) 1386 if (input_method == NULL)
1337 return false; 1387 return false;
… …
1354 p = pet[pi]; 1404 p = pet[pi];
1355 1405
1356 if (!p) 1406 if (!p)
1357 continue; 1407 continue;
1358 1408
1359 s = rxvt_splitcommastring (p); 1409 s = rxvt_strsplit (',', p);
1360 1410
1361 for (i = found = 0; !found && s[i]; i++) 1411 for (i = found = 0; !found && s[i]; i++)
1362 { 1412 {
1363 if (!strcmp (s[i], "OverTheSpot")) 1413 if (!strcmp (s[i], "OverTheSpot"))
1364 input_style = XIMPreeditPosition | XIMStatusNothing; 1414 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1376 input_style = XIMPreeditNothing | XIMStatusNothing; 1426 input_style = XIMPreeditNothing | XIMStatusNothing;
1377 1427
1378 for (j = 0; j < xim_styles->count_styles; j++) 1428 for (j = 0; j < xim_styles->count_styles; j++)
1379 if (input_style == xim_styles->supported_styles[j]) 1429 if (input_style == xim_styles->supported_styles[j])
1380 { 1430 {
1381 rxvt_freecommastring (s); 1431 rxvt_free_strsplit (s);
1382 1432
1383 found = 1; 1433 found = 1;
1384 goto foundpet; 1434 goto foundpet;
1385 } 1435 }
1386 1436
1387 } 1437 }
1388 1438
1389 rxvt_freecommastring (s); 1439 rxvt_free_strsplit (s);
1390 } 1440 }
1391 1441
1392foundpet: 1442foundpet:
1393 1443
1394 XFree (xim_styles); 1444 XFree (xim_styles);
… …
1473 NULL); 1523 NULL);
1474 } 1524 }
1475#if ENABLE_XIM_ONTHESPOT 1525#if ENABLE_XIM_ONTHESPOT
1476 else if (input_style & XIMPreeditCallbacks) 1526 else if (input_style & XIMPreeditCallbacks)
1477 { 1527 {
1528 XIMCallback xcb[4];
1529
1478 im_set_position (spot); 1530 im_set_position (spot);
1479 1531
1480 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1532 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1481 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1533 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1482 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1534 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1497#endif 1549#endif
1498 1550
1499 Input_Context = XCreateIC (xim, 1551 Input_Context = XCreateIC (xim,
1500 XNInputStyle, input_style, 1552 XNInputStyle, input_style,
1501 XNClientWindow, vt, 1553 XNClientWindow, vt,
1502 XNFocusWindow, parent[0], 1554 XNFocusWindow, parent,
1503 preedit_attr ? XNPreeditAttributes : NULL, 1555 preedit_attr ? XNPreeditAttributes : NULL,
1504 preedit_attr, 1556 preedit_attr,
1505 status_attr ? XNStatusAttributes : NULL, 1557 status_attr ? XNStatusAttributes : NULL,
1506 status_attr, NULL); 1558 status_attr, NULL);
1507 1559
… …
1520 // unfortunately, only the focus window is used by XIM, hard to fix 1572 // unfortunately, only the focus window is used by XIM, hard to fix
1521 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1573 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1522 vt_select_input (); 1574 vt_select_input ();
1523#endif 1575#endif
1524 1576
1525 IMSetPosition (); 1577 im_set_position ();
1526 1578
1527 return true; 1579 return true;
1528} 1580}
1529 1581
1530void 1582void
… …
1540 im_destroy (); 1592 im_destroy ();
1541 1593
1542 if (Input_Context) 1594 if (Input_Context)
1543 return; 1595 return;
1544 1596
1545#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1546 if (rs[Rs_imLocale]) 1597 if (rs[Rs_imLocale])
1547 SET_LOCALE (rs[Rs_imLocale]); 1598 SET_LOCALE (rs[Rs_imLocale]);
1548#endif
1549 1599
1550 p = rs[Rs_inputMethod]; 1600 p = rs[Rs_inputMethod];
1551 if (p && *p) 1601 if (p && *p)
1552 { 1602 {
1553 bool found = false; 1603 bool found = false;
1554 1604
1555 s = rxvt_splitcommastring (p); 1605 s = rxvt_strsplit (',', p);
1556 1606
1557 for (i = 0; s[i]; i++) 1607 for (i = 0; s[i]; i++)
1558 { 1608 {
1559 if (*s[i]) 1609 if (*s[i])
1560 { 1610 {
1561 strcpy (buf, "@im="); 1611 strcpy (buf, "@im=");
1562 strncat (buf, s[i], IMBUFSIZ - 5); 1612 strncat (buf, s[i], IMBUFSIZ - 5);
1563 if (IM_get_IC (buf)) 1613 if (im_get_ic (buf))
1564 { 1614 {
1565 found = true; 1615 found = true;
1566 break; 1616 break;
1567 } 1617 }
1568 } 1618 }
1569 } 1619 }
1570 1620
1571 rxvt_freecommastring (s); 1621 rxvt_free_strsplit (s);
1572 1622
1573 if (found) 1623 if (found)
1574 goto done; 1624 goto done;
1575 } 1625 }
1576 1626
1577 /* try with XMODIFIERS env. var. */ 1627 /* try with XMODIFIERS env. var. */
1578 if (IM_get_IC ("")) 1628 if (im_get_ic (""))
1579 goto done; 1629 goto done;
1580 1630
1581 /* try with no modifiers base IF the user didn't specify an IM */ 1631 /* try with no modifiers base IF the user didn't specify an IM */
1582 if (IM_get_IC ("@im=none")) 1632 if (im_get_ic ("@im=none"))
1583 goto done; 1633 goto done;
1584 1634
1585done: 1635done:
1586#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1587 if (rs[Rs_imLocale]) 1636 if (rs[Rs_imLocale])
1588 SET_LOCALE (locale); 1637 SET_LOCALE (locale);
1589#endif
1590} 1638}
1591 1639
1592void 1640void
1593rxvt_term::IMSetPosition () 1641rxvt_term::im_set_position ()
1594{ 1642{
1595 XRectangle preedit_rect, status_rect, *needed_rect; 1643 XRectangle preedit_rect, status_rect, *needed_rect;
1596 XVaNestedList preedit_attr, status_attr; 1644 XVaNestedList preedit_attr, status_attr;
1597 1645
1598 if (!Input_Context 1646 if (!Input_Context
1599 || !focus 1647 || !focus
1600 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1648 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1601 || !IMisRunning ()) 1649 || !im_is_running ())
1602 return; 1650 return;
1603 1651
1604 if (input_style & XIMPreeditPosition) 1652 if (input_style & XIMPreeditPosition)
1605 { 1653 {
1606 im_set_size (preedit_rect); 1654 im_set_size (preedit_rect);
… …
1636 1684
1637void 1685void
1638rxvt_term::get_window_origin (int &x, int &y) 1686rxvt_term::get_window_origin (int &x, int &y)
1639{ 1687{
1640 Window cr; 1688 Window cr;
1641 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1689 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1642}
1643
1644Pixmap
1645rxvt_term::get_pixmap_property (Atom property)
1646{
1647 Pixmap pixmap = None;
1648
1649 int aformat;
1650 unsigned long nitems, bytes_after;
1651 Atom atype;
1652 unsigned char *prop;
1653 int result = XGetWindowProperty (dpy, display->root, property,
1654 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1655 &nitems, &bytes_after, &prop);
1656 if (result == Success)
1657 {
1658 if (atype == XA_PIXMAP)
1659 pixmap = *(Pixmap *)prop;
1660 XFree (prop);
1661 }
1662
1663 return pixmap;
1664} 1690}
1665 1691
1666#ifdef HAVE_BG_PIXMAP 1692#ifdef HAVE_BG_PIXMAP
1667 1693
1668void 1694void
1669rxvt_term::update_background () 1695rxvt_term::update_background ()
1670{ 1696{
1671 if (update_background_ev.is_active ()) 1697 if (update_background_ev.is_active ())
1672 return; 1698 return;
1673 1699
1674 bgPixmap.invalidate ();
1675
1676 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1700 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1677 1701
1678 if (to_wait <= 0.) 1702 if (to_wait <= 0.)
1679 bgPixmap.render (); 1703 bg_render ();
1680 else 1704 else
1681 update_background_ev.start (to_wait); 1705 update_background_ev.start (to_wait);
1682} 1706}
1683 1707
1684void 1708void
1685rxvt_term::update_background_cb (ev::timer &w, int revents) 1709rxvt_term::update_background_cb (ev::timer &w, int revents)
1686{ 1710{
1687 make_current (); 1711 make_current ();
1688 1712
1689 update_background_ev.stop (); 1713 update_background_ev.stop ();
1690 bgPixmap.render (); 1714 bg_render ();
1691 refresh_check (); 1715 refresh_check ();
1692} 1716}
1693 1717
1694#endif /* HAVE_BG_PIXMAP */ 1718#endif /* HAVE_BG_PIXMAP */
1695 1719

Diff Legend

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