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.354 by root, Mon Feb 21 07:41:02 2011 UTC vs.
Revision 1.398 by sf-exg, Tue Sep 8 07:54:58 2015 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 <schmorp@schmorp.de> 16 * Copyright (c) 2003-2014 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
… …
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bg_destroy (); 228 bg_destroy ();
231#endif 229#endif
232 230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
233 if (display) 235 if (display)
234 { 236 {
235 selection_clear (); 237 selection_clear ();
236 selection_clear (true); 238 selection_clear (true);
237 239
238#ifdef USE_XIM 240#if USE_XIM
239 im_destroy (); 241 im_destroy ();
240#endif 242#endif
241 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
242 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
243 247
244 delete drawable; 248 delete drawable;
249
245 // destroy all windows 250 // destroy all windows
246 if (parent[0]) 251 if (parent)
247 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
248 253
249 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
250 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
251 { 256 {
252 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
253#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
259 if (rs[Rs_fade])
254 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
255#endif 261#endif
256 } 262 }
257 263
258 clear (); 264 clear ();
259 265
… …
267 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
268 free (allocated [i]); 274 free (allocated [i]);
269 275
270 free (selection.text); 276 free (selection.text);
271 free (selection.clip_text); 277 free (selection.clip_text);
272 // TODO: manage env vars in child only(!)
273 free (env_display);
274 free (env_term);
275 free (locale); 278 free (locale);
276 free (v_buffer); 279 free (v_buffer);
277 280
278 delete selection_req; 281 delete selection_req;
279 282
283 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
284 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
285
286 delete [] env;
287
280 delete envv; 288 delete envv;
281 delete argv; 289 delete argv;
282 290
283#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
284 delete keyboard; 292 delete keyboard;
285#endif 293#endif
286#ifndef NO_RESOURCES 294#ifndef NO_RESOURCES
287 XrmDestroyDatabase (option_db); 295 XrmDestroyDatabase (option_db);
288#endif 296#endif
297
298 SET_R ((rxvt_term *)0);
289} 299}
290 300
291// child has exited, usually destroys 301// child has exited, usually destroys
292void 302void
293rxvt_term::child_cb (ev::child &w, int status) 303rxvt_term::child_cb (ev::child &w, int status)
… …
316 { 326 {
317#if USE_XIM 327#if USE_XIM
318 im_ev.stop (display); 328 im_ev.stop (display);
319#endif 329#endif
320 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
321#if ENABLE_TRANSPARENCY || ENABLE_PERL 331#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
322 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
323#endif 333#endif
324 termwin_ev.stop (display); 334 termwin_ev.stop (display);
325 vt_ev.stop (display); 335 vt_ev.stop (display);
326 } 336 }
… …
353 363
354 delete this; 364 delete this;
355} 365}
356 366
357void 367void
358rxvt_term::set_option (uint8_t opt, bool set) 368rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
359{ 369{
360 if (!opt) 370 if (!opt)
361 return; 371 return;
362 372
363 uint8_t mask = 1 << (opt & 7); 373 uint8_t mask = 1 << (opt & 7);
… …
367} 377}
368 378
369/*----------------------------------------------------------------------*/ 379/*----------------------------------------------------------------------*/
370/* 380/*
371 * Exit gracefully, clearing the utmp entry and restoring tty attributes 381 * Exit gracefully, clearing the utmp entry and restoring tty attributes
372 * TODO: if debugging, this should free up any known resources if we can
373 */ 382 */
374static XErrorHandler old_xerror_handler; 383static XErrorHandler old_xerror_handler;
375 384
376static void 385static void
377rxvt_emergency_cleanup () 386rxvt_emergency_cleanup ()
… …
379 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
381} 390}
382 391
383#if !ENABLE_MINIMAL 392#if !ENABLE_MINIMAL
384static void 393static void ecb_cold
385print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
386{ 395{
387 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
389 char number[32]; 398 char number[32];
390 const char mtype[] = "XlibMessage"; 399
391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
393 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
401
402 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
403 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
404
405 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
406 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
394 rxvt_warn ("%s: %s\n", mesg, buffer); 407 rxvt_warn ("+ %s: %s\n", mesg, buffer);
408
395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 409 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 410 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
411
412 if (event->request_code >= 128)
413 {
414#if 0
415 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
416 int nexts;
417 char **exts = XListExtensions (dpy, &nexts);
418
419 while (nexts)
420 {
421 char *extname = exts [nexts - 1];
422 int major, first_event, first_error;
423
424 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
425 {
426 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
427 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
428
429 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
430 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
431 rxvt_warn ("+ (which is %s)\n", buffer);
432
433 break;
434 }
435
436 printf ("nextss %d %s\n", nexts, extname);//D
437 --nexts;
438 ++exts;
439 }
440#else
441 int nexts = 0;
442 char **exts = 0;
443#endif
444
445 if (!nexts)
446 {
447 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
448
449 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
450 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
451
452#if 0
453 sprintf (number, "RENDER.%d", event->minor_code);
454 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
455 rxvt_warn ("+ (which is %s)\n", buffer);
456#endif
457 }
458
459 XFreeExtensionList (exts);
460 }
461 else
462 {
397 sprintf(number, "%d", event->request_code); 463 sprintf (number, "%d", event->request_code);
398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 464 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
399 rxvt_warn ("(which is %s)\n", buffer); 465 rxvt_warn ("+ (which is %s)\n", buffer);
400 if (event->request_code >= 128) {
401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
402 mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
404 } 466 }
467
405 if ((event->error_code == BadWindow) || 468 if (event->error_code == BadWindow
406 (event->error_code == BadPixmap) || 469 || event->error_code == BadPixmap
407 (event->error_code == BadCursor) || 470 || event->error_code == BadCursor
408 (event->error_code == BadFont) || 471 || event->error_code == BadFont
409 (event->error_code == BadDrawable) || 472 || event->error_code == BadDrawable
410 (event->error_code == BadColor) || 473 || event->error_code == BadColor
411 (event->error_code == BadGC) || 474 || event->error_code == BadGC
412 (event->error_code == BadIDChoice) || 475 || event->error_code == BadIDChoice
413 (event->error_code == BadValue) || 476 || event->error_code == BadValue
414 (event->error_code == BadAtom)) { 477 || event->error_code == BadAtom)
478 {
415 if (event->error_code == BadValue) 479 if (event->error_code == BadValue)
416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 480 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else if (event->error_code == BadAtom) 481 else if (event->error_code == BadAtom)
419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 482 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 else 483 else
422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 484 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
423 mesg, BUFSIZ);
424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
425 }
426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
427 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
429}
430#endif
431 485
432int 486 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
487 }
488}
489#endif
490
491int ecb_cold
433rxvt_xerror_handler (Display *display, XErrorEvent *event) 492rxvt_xerror_handler (Display *display, XErrorEvent *event)
434{ 493{
435 if (GET_R->allowedxerror == -1) 494 if (GET_R && GET_R->allowedxerror == -1)
436 GET_R->allowedxerror = event->error_code; 495 GET_R->allowedxerror = event->error_code;
437 else 496 else
438 { 497 {
439 // GET_R is most likely not the terminal which caused the error, 498 // GET_R is most likely not the terminal which caused the error,
440 // so just output the error and continue 499 // so just output the error and continue
… …
446 } 505 }
447 506
448 return 0; 507 return 0;
449} 508}
450 509
451int 510int ecb_cold
452rxvt_xioerror_handler (Display *display) 511rxvt_xioerror_handler (Display *display)
453{ 512{
454 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 513 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
455 DisplayString (display)); 514 DisplayString (display));
456 rxvt_emergency_cleanup (); 515 rxvt_emergency_cleanup ();
… …
576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
577 // TODO: handle this with exceptions and tolerate the memory loss 636 // TODO: handle this with exceptions and tolerate the memory loss
578 XSetIOErrorHandler (rxvt_xioerror_handler); 637 XSetIOErrorHandler (rxvt_xioerror_handler);
579 638
580 XrmInitialize (); 639 XrmInitialize ();
640
641#if HAVE_PIXBUF
642 g_type_init ();
643#endif
581} 644}
582 645
583/*----------------------------------------------------------------------*/ 646/*----------------------------------------------------------------------*/
584/* 647/*
585 * window size/position calculations for XSizeHint and other storage. 648 * window size/position calculations for XSizeHint and other storage.
… …
706 if (recalc_y) 769 if (recalc_y)
707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 770 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
708 771
709 ncol = width / fwidth; 772 ncol = width / fwidth;
710 nrow = height / fheight; 773 nrow = height / fheight;
774
775 // When the size of the vt window is not a multiple of the cell
776 // size, i.e., when the wm does not honour our size hints, there are
777 // extra areas not covered by the terminal screen. Such gaps, when a
778 // bg pixmap is set, would have to be cleared manually to properly
779 // refresh the background. We take the simpler route and shrink the
780 // vt window so as to avoid creating gaps.
781 vt_width = ncol * fwidth;
782 vt_height = nrow * fheight;
711} 783}
712 784
713/*----------------------------------------------------------------------*/ 785/*----------------------------------------------------------------------*/
714/* 786/*
715 * Tell the teletype handler what size the window is. 787 * Tell the teletype handler what size the window is.
… …
723 795
724 struct winsize ws; 796 struct winsize ws;
725 797
726 ws.ws_col = ncol; 798 ws.ws_col = ncol;
727 ws.ws_row = nrow; 799 ws.ws_row = nrow;
728 ws.ws_xpixel = width; 800 ws.ws_xpixel = vt_width;
729 ws.ws_ypixel = height; 801 ws.ws_ypixel = vt_height;
730 ioctl (pty->pty, TIOCSWINSZ, &ws); 802 ioctl (pty->pty, TIOCSWINSZ, &ws);
731 803
732#if 0 804#if 0
733 // TIOCSWINSZ is supposed to do this automatically and correctly 805 // TIOCSWINSZ is supposed to do this automatically and correctly
734 if (cmd_pid) /* force through to the command */ 806 if (cmd_pid) /* force through to the command */
735 kill (-cmd_pid, SIGWINCH); 807 kill (-cmd_pid, SIGWINCH);
736#endif 808#endif
737} 809}
738 810
739/*----------------------------------------------------------------------*/ 811/*----------------------------------------------------------------------*/
740/* set_fonts () - load and set the various fonts 812/* load and set the various fonts */
741 *
742 * init = 1 - initialize
743 *
744 * fontname == FONT_UP - switch to bigger font
745 * fontname == FONT_DN - switch to smaller font
746 */
747bool 813bool
748rxvt_term::set_fonts () 814rxvt_term::set_fonts ()
749{ 815{
750 rxvt_fontset *fs = new rxvt_fontset (this); 816 rxvt_fontset *fs = new rxvt_fontset (this);
751 rxvt_fontprop prop; 817 rxvt_fontprop prop;
… …
766 832
767 delete fontset[0]; 833 delete fontset[0];
768 fontset[0] = fs; 834 fontset[0] = fs;
769 835
770 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 836 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace; 837 prop.width = max (prop.width + letterSpace, 1);
772 prop.width += letterSpace;
773 838
774 fs->set_prop (prop, false); 839 fs->set_prop (prop, false);
775 840
776 fwidth = prop.width; 841 fwidth = prop.width;
777 fheight = prop.height; 842 fheight = prop.height + lineSpace;
778 fbase = prop.ascent; 843 fbase = prop.ascent;
779 844
780 for (int style = 1; style < 4; style++) 845 for (int style = 1; style < 4; style++)
781 { 846 {
782#if ENABLE_STYLES 847#if ENABLE_STYLES
… …
808#else 873#else
809 fontset[style] = fontset[0]; 874 fontset[style] = fontset[0];
810#endif 875#endif
811 } 876 }
812 877
813 if (parent[0]) 878 if (parent)
814 { 879 {
815 resize_all_windows (0, 0, 0); 880 resize_all_windows (0, 0, 0);
816 scr_remap_chars (); 881 scr_remap_chars ();
817 scr_touch (true); 882 scr_touch (true);
818 } 883 }
… …
821} 886}
822 887
823void 888void
824rxvt_term::set_string_property (Atom prop, const char *str, int len) 889rxvt_term::set_string_property (Atom prop, const char *str, int len)
825{ 890{
826 XChangeProperty (dpy, parent[0], 891 XChangeProperty (dpy, parent,
827 prop, XA_STRING, 8, PropModeReplace, 892 prop, XA_STRING, 8, PropModeReplace,
828 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 893 (const unsigned char *)str, len >= 0 ? len : strlen (str));
829} 894}
830 895
831void 896void
… …
833{ 898{
834 XTextProperty ct; 899 XTextProperty ct;
835 900
836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 901 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
837 { 902 {
838 XSetTextProperty (dpy, parent[0], &ct, prop); 903 XSetTextProperty (dpy, parent, &ct, prop);
839 XFree (ct.value); 904 XFree (ct.value);
840 } 905 }
841} 906}
842 907
843void 908void
844rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 909rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
845{ 910{
846 wchar_t *ws = rxvt_mbstowcs (str, len); 911 wchar_t *ws = rxvt_mbstowcs (str, len);
847 char *s = rxvt_wcstoutf8 (ws); 912 char *s = rxvt_wcstoutf8 (ws);
848 913
849 XChangeProperty (dpy, parent[0], 914 XChangeProperty (dpy, parent,
850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 915 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
851 (const unsigned char *)s, strlen (s)); 916 (const unsigned char *)s, strlen (s));
852 917
853 free (s); 918 free (s);
854 free (ws); 919 free (ws);
… …
877 942
878void 943void
879rxvt_term::set_window_color (int idx, const char *color) 944rxvt_term::set_window_color (int idx, const char *color)
880{ 945{
881#ifdef XTERM_COLOR_CHANGE 946#ifdef XTERM_COLOR_CHANGE
882 rxvt_color xcol;
883
884 if (color == NULL || *color == '\0') 947 if (color == NULL || *color == '\0')
885 return; 948 return;
886 949
887 color = strdup (color); 950 color = strdup (color);
888 allocated.push_back ((void *)color); 951 allocated.push_back ((void *)color);
… …
894 int i = atoi (color); 957 int i = atoi (color);
895 958
896 if (i >= 8 && i <= 15) 959 if (i >= 8 && i <= 15)
897 { 960 {
898 /* bright colors */ 961 /* bright colors */
899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 962 alias_color (idx, minBrightCOLOR + i - 8);
900 goto done; 963 goto done;
901 } 964 }
902 965
903 if (i >= 0 && i <= 7) 966 if (i >= 0 && i <= 7)
904 { 967 {
905 /* normal colors */ 968 /* normal colors */
906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 969 alias_color (idx, minCOLOR + i);
907 goto done; 970 goto done;
908 } 971 }
909 } 972 }
910 973
911 set_color (xcol, color); 974 pix_colors_focused[idx].free (this);
912 975 set_color (pix_colors_focused[idx], color);
913 /*
914 * FIXME: should free colors here, but no idea how to do it so instead,
915 * so just keep gobbling up the colormap
916 */
917
918 pix_colors_focused[idx] = xcol;
919 976
920done: 977done:
921 /*TODO: handle Color_BD, scrollbar background, etc. */ 978 /*TODO: handle Color_BD, scrollbar background, etc. */
922 979
923 update_fade_color (idx); 980 update_fade_color (idx);
924 recolour_cursor (); 981 recolor_cursor ();
925 scr_recolour (); 982 scr_recolor ();
926#endif /* XTERM_COLOR_CHANGE */ 983#endif /* XTERM_COLOR_CHANGE */
927} 984}
928 985
929void 986void
930rxvt_term::recolour_cursor () 987rxvt_term::recolor_cursor ()
931{ 988{
932 XColor fg, bg; 989 XColor fg, bg;
933 990
934 (ISSET_PIXCOLOR (Color_pointer_fg) 991 (ISSET_PIXCOLOR (Color_pointer_fg)
935 ? pix_colors_focused[Color_pointer_fg] 992 ? pix_colors_focused[Color_pointer_fg]
… …
944 1001
945/*----------------------------------------------------------------------*/ 1002/*----------------------------------------------------------------------*/
946/* 1003/*
947 * find if fg/bg matches any of the normal (low-intensity) colors 1004 * find if fg/bg matches any of the normal (low-intensity) colors
948 */ 1005 */
949void 1006char *
950rxvt_term::set_colorfgbg () 1007rxvt_term::get_colorfgbg ()
951{ 1008{
952 unsigned int i; 1009 unsigned int i;
953 const char *xpmb = ""; 1010 const char *xpmb = "";
954 char fstr[] = "default"; 1011 char fstr[] = "default";
955 char bstr[] = "default"; 1012 char bstr[] = "default";
1013 char *env_colorfgbg;
956 1014
957 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
958 if (pix_colors[Color_fg] == pix_colors[i]) 1016 if (pix_colors[Color_fg] == pix_colors[i])
959 { 1017 {
960 sprintf (fstr, "%d", i - Color_Black); 1018 sprintf (fstr, "%d", i - Color_Black);
… …
963 1021
964 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_bg] == pix_colors[i]) 1023 if (pix_colors[Color_bg] == pix_colors[i])
966 { 1024 {
967 sprintf (bstr, "%d", i - Color_Black); 1025 sprintf (bstr, "%d", i - Color_Black);
968#ifdef BG_IMAGE_FROM_FILE 1026#if BG_IMAGE_FROM_FILE
969 xpmb = "default;"; 1027 xpmb = "default;";
970#endif 1028#endif
971 break; 1029 break;
972 } 1030 }
973 1031
1032 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1033 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1034 return env_colorfgbg;
975} 1035}
976 1036
977/*----------------------------------------------------------------------*/ 1037/*----------------------------------------------------------------------*/
978 1038
979bool 1039bool
… …
987} 1047}
988 1048
989void 1049void
990rxvt_term::alias_color (int dst, int src) 1050rxvt_term::alias_color (int dst, int src)
991{ 1051{
1052 pix_colors[dst].free (this);
992 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1053 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
993} 1054}
994 1055
995/* -------------------------------------------------------------------- * 1056/* -------------------------------------------------------------------- *
996 * - WINDOW RESIZING - * 1057 * - WINDOW RESIZING - *
… …
1008 1069
1009 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1070 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1010 if (set_hint) 1071 if (set_hint)
1011 { 1072 {
1012 szHint.flags &= ~(PBaseSize | PResizeInc); 1073 szHint.flags &= ~(PBaseSize | PResizeInc);
1013 XSetWMNormalHints (dpy, parent[0], &szHint); 1074 XSetWMNormalHints (dpy, parent, &szHint);
1014 szHint.flags |= PBaseSize | PResizeInc; 1075 szHint.flags |= PBaseSize | PResizeInc;
1015 } 1076 }
1016 1077
1017 if (!ignoreparent) 1078 if (!ignoreparent)
1018 { 1079 {
… …
1024 int x, y, x1, y1; 1085 int x, y, x1, y1;
1025 int dx, dy; 1086 int dx, dy;
1026 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1087 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1027 Window unused_cr; 1088 Window unused_cr;
1028 1089
1029 XTranslateCoordinates (dpy, parent[0], display->root, 1090 XTranslateCoordinates (dpy, parent, display->root,
1030 0, 0, &x, &y, &unused_cr); 1091 0, 0, &x, &y, &unused_cr);
1031 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1092 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1032 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1093 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1033 /* 1094 /*
1034 * if display->root isn't the parent window, a WM will probably have offset 1095 * if display->root isn't the parent window, a WM will probably have offset
1035 * our position for handles and decorations. Counter it 1096 * our position for handles and decorations. Counter it
1036 */ 1097 */
… …
1053 if (y < y1) /* top half */ 1114 if (y < y1) /* top half */
1054 dy = 0; 1115 dy = 0;
1055 else if (y == y1) /* exact center */ 1116 else if (y == y1) /* exact center */
1056 dy /= 2; 1117 dy /= 2;
1057 1118
1058 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1119 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1059 szHint.width, szHint.height); 1120 szHint.width, szHint.height);
1060#else 1121#else
1061 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1122 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1062#endif 1123#endif
1063 } 1124 }
1064 1125
1065 if (set_hint) 1126 if (set_hint)
1066 XSetWMNormalHints (dpy, parent[0], &szHint); 1127 XSetWMNormalHints (dpy, parent, &szHint);
1067 1128
1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1129 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1069 1130
1070 if (fix_screen || newwidth != old_width || newheight != old_height) 1131 if (fix_screen || newwidth != old_width || newheight != old_height)
1071 { 1132 {
1072 if (scrollBar.state) 1133 if (scrollBar.state)
1073 scrollBar.resize (); 1134 scrollBar.resize ();
1074 1135
1075 XMoveResizeWindow (dpy, vt, 1136 XMoveResizeWindow (dpy, vt,
1076 window_vt_x, window_vt_y, 1137 window_vt_x, window_vt_y,
1077 width, height); 1138 vt_width, vt_height);
1139
1140 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1078 1141
1079#ifdef HAVE_BG_PIXMAP 1142#ifdef HAVE_BG_PIXMAP
1080 if (bg_window_size_sensitive ()) 1143 if (bg_window_size_sensitive ())
1081 update_background (); 1144 update_background ();
1082#endif 1145#endif
1083 } 1146 }
1084 1147
1085 if (fix_screen || old_height == 0) 1148 if (fix_screen || old_height == 0)
1086 scr_reset (); 1149 scr_reset ();
1087 1150
1088#ifdef USE_XIM 1151#if USE_XIM
1089 IMSetPosition (); 1152 im_set_position ();
1090#endif 1153#endif
1091} 1154}
1092 1155
1093/* 1156/*
1094 * Set the width/height of the vt window in characters. Units are pixels. 1157 * Set the width/height of the vt window in characters. Units are pixels.
… …
1107 newwidth = wattr.width - szHint.base_width; 1170 newwidth = wattr.width - szHint.base_width;
1108 if (newheight == 0) 1171 if (newheight == 0)
1109 newheight = wattr.height - szHint.base_height; 1172 newheight = wattr.height - szHint.base_height;
1110 } 1173 }
1111 1174
1112 if (newwidth != width || newheight != height) 1175 if (newwidth != vt_width || newheight != vt_height)
1113 { 1176 {
1114 newwidth += szHint.base_width; 1177 newwidth += szHint.base_width;
1115 newheight += szHint.base_height; 1178 newheight += szHint.base_height;
1116 resize_all_windows (newwidth, newheight, 0); 1179 resize_all_windows (newwidth, newheight, 0);
1117 } 1180 }
1118} 1181}
1119 1182
1120/* -------------------------------------------------------------------- * 1183/* -------------------------------------------------------------------- *
1121 * - X INPUT METHOD ROUTINES - * 1184 * - X INPUT METHOD ROUTINES - *
1122 * -------------------------------------------------------------------- */ 1185 * -------------------------------------------------------------------- */
1123#ifdef USE_XIM 1186#if USE_XIM
1124 1187
1125void 1188void
1126rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1189rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1127{ 1190{
1128 fg = pix_colors [Color_fg]; 1191 fg = pix_colors [Color_fg];
… …
1155 status_rect.height = fheight; 1218 status_rect.height = fheight;
1156} 1219}
1157 1220
1158/* Checking whether input method is running. */ 1221/* Checking whether input method is running. */
1159bool 1222bool
1160rxvt_term::IMisRunning () 1223rxvt_term::im_is_running ()
1161{ 1224{
1162 Atom atom; 1225 Atom atom;
1163 Window win; 1226 Window win;
1164 char server[IMBUFSIZ]; 1227 char server[IMBUFSIZ];
1165 1228
… …
1181 1244
1182 return false; 1245 return false;
1183} 1246}
1184 1247
1185void 1248void
1186rxvt_term::IMSendSpot () 1249rxvt_term::im_send_spot ()
1187{ 1250{
1188 XPoint nspot; 1251 XPoint nspot;
1189 XVaNestedList preedit_attr; 1252 XVaNestedList preedit_attr;
1190 1253
1191 if (!Input_Context 1254 if (!Input_Context
… …
1297/* 1360/*
1298 * Try to open a XIM with the current modifiers, then see if we can 1361 * Try to open a XIM with the current modifiers, then see if we can
1299 * open a suitable preedit type 1362 * open a suitable preedit type
1300 */ 1363 */
1301bool 1364bool
1302rxvt_term::IM_get_IC (const char *modifiers) 1365rxvt_term::im_get_ic (const char *modifiers)
1303{ 1366{
1304 int i, j, found; 1367 int i, j, found;
1305 XIM xim; 1368 XIM xim;
1306 XPoint spot; 1369 XPoint spot;
1307 XRectangle rect, status_rect, needed_rect; 1370 XRectangle rect, status_rect, needed_rect;
1308 unsigned long fg, bg; 1371 unsigned long fg, bg;
1309 const char *p; 1372 const char *p;
1310 char **s; 1373 char **s;
1311 XIMStyles *xim_styles; 1374 XIMStyles *xim_styles;
1312#ifdef ENABLE_XIM_ONTHESPOT
1313 XIMCallback xcb[4];
1314#endif
1315 1375
1316 set_environ (envv); 1376 set_environ (env);
1317 1377
1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1378 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1319 return false; 1379 return false;
1320 1380
1321 input_method = display->get_xim (locale, modifiers); 1381 input_method = display->get_xim (locale, modifiers);
1322 if (input_method == NULL) 1382 if (input_method == NULL)
1323 return false; 1383 return false;
… …
1459 NULL); 1519 NULL);
1460 } 1520 }
1461#if ENABLE_XIM_ONTHESPOT 1521#if ENABLE_XIM_ONTHESPOT
1462 else if (input_style & XIMPreeditCallbacks) 1522 else if (input_style & XIMPreeditCallbacks)
1463 { 1523 {
1524 XIMCallback xcb[4];
1525
1464 im_set_position (spot); 1526 im_set_position (spot);
1465 1527
1466 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1528 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1467 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1529 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1468 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1530 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1483#endif 1545#endif
1484 1546
1485 Input_Context = XCreateIC (xim, 1547 Input_Context = XCreateIC (xim,
1486 XNInputStyle, input_style, 1548 XNInputStyle, input_style,
1487 XNClientWindow, vt, 1549 XNClientWindow, vt,
1488 XNFocusWindow, parent[0], 1550 XNFocusWindow, parent,
1489 preedit_attr ? XNPreeditAttributes : NULL, 1551 preedit_attr ? XNPreeditAttributes : NULL,
1490 preedit_attr, 1552 preedit_attr,
1491 status_attr ? XNStatusAttributes : NULL, 1553 status_attr ? XNStatusAttributes : NULL,
1492 status_attr, NULL); 1554 status_attr, NULL);
1493 1555
… …
1506 // unfortunately, only the focus window is used by XIM, hard to fix 1568 // unfortunately, only the focus window is used by XIM, hard to fix
1507 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1569 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1508 vt_select_input (); 1570 vt_select_input ();
1509#endif 1571#endif
1510 1572
1511 IMSetPosition (); 1573 im_set_position ();
1512 1574
1513 return true; 1575 return true;
1514} 1576}
1515 1577
1516void 1578void
… …
1526 im_destroy (); 1588 im_destroy ();
1527 1589
1528 if (Input_Context) 1590 if (Input_Context)
1529 return; 1591 return;
1530 1592
1531#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1532 if (rs[Rs_imLocale]) 1593 if (rs[Rs_imLocale])
1533 SET_LOCALE (rs[Rs_imLocale]); 1594 SET_LOCALE (rs[Rs_imLocale]);
1534#endif
1535 1595
1536 p = rs[Rs_inputMethod]; 1596 p = rs[Rs_inputMethod];
1537 if (p && *p) 1597 if (p && *p)
1538 { 1598 {
1539 bool found = false; 1599 bool found = false;
… …
1544 { 1604 {
1545 if (*s[i]) 1605 if (*s[i])
1546 { 1606 {
1547 strcpy (buf, "@im="); 1607 strcpy (buf, "@im=");
1548 strncat (buf, s[i], IMBUFSIZ - 5); 1608 strncat (buf, s[i], IMBUFSIZ - 5);
1549 if (IM_get_IC (buf)) 1609 if (im_get_ic (buf))
1550 { 1610 {
1551 found = true; 1611 found = true;
1552 break; 1612 break;
1553 } 1613 }
1554 } 1614 }
… …
1559 if (found) 1619 if (found)
1560 goto done; 1620 goto done;
1561 } 1621 }
1562 1622
1563 /* try with XMODIFIERS env. var. */ 1623 /* try with XMODIFIERS env. var. */
1564 if (IM_get_IC ("")) 1624 if (im_get_ic (""))
1565 goto done; 1625 goto done;
1566 1626
1567 /* try with no modifiers base IF the user didn't specify an IM */ 1627 /* try with no modifiers base IF the user didn't specify an IM */
1568 if (IM_get_IC ("@im=none")) 1628 if (im_get_ic ("@im=none"))
1569 goto done; 1629 goto done;
1570 1630
1571done: 1631done:
1572#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1573 if (rs[Rs_imLocale]) 1632 if (rs[Rs_imLocale])
1574 SET_LOCALE (locale); 1633 SET_LOCALE (locale);
1575#endif
1576} 1634}
1577 1635
1578void 1636void
1579rxvt_term::IMSetPosition () 1637rxvt_term::im_set_position ()
1580{ 1638{
1581 XRectangle preedit_rect, status_rect, *needed_rect; 1639 XRectangle preedit_rect, status_rect, *needed_rect;
1582 XVaNestedList preedit_attr, status_attr; 1640 XVaNestedList preedit_attr, status_attr;
1583 1641
1584 if (!Input_Context 1642 if (!Input_Context
1585 || !focus 1643 || !focus
1586 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1644 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1587 || !IMisRunning ()) 1645 || !im_is_running ())
1588 return; 1646 return;
1589 1647
1590 if (input_style & XIMPreeditPosition) 1648 if (input_style & XIMPreeditPosition)
1591 { 1649 {
1592 im_set_size (preedit_rect); 1650 im_set_size (preedit_rect);
… …
1622 1680
1623void 1681void
1624rxvt_term::get_window_origin (int &x, int &y) 1682rxvt_term::get_window_origin (int &x, int &y)
1625{ 1683{
1626 Window cr; 1684 Window cr;
1627 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1685 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1628}
1629
1630Pixmap
1631rxvt_term::get_pixmap_property (Atom property)
1632{
1633 Pixmap pixmap = None;
1634
1635 int aformat;
1636 unsigned long nitems, bytes_after;
1637 Atom atype;
1638 unsigned char *prop;
1639 int result = XGetWindowProperty (dpy, display->root, property,
1640 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1641 &nitems, &bytes_after, &prop);
1642 if (result == Success)
1643 {
1644 if (atype == XA_PIXMAP)
1645 pixmap = *(Pixmap *)prop;
1646 XFree (prop);
1647 }
1648
1649 return pixmap;
1650} 1686}
1651 1687
1652#ifdef HAVE_BG_PIXMAP 1688#ifdef HAVE_BG_PIXMAP
1653 1689
1654void 1690void
1655rxvt_term::update_background () 1691rxvt_term::update_background ()
1656{ 1692{
1657 if (update_background_ev.is_active ()) 1693 if (update_background_ev.is_active ())
1658 return; 1694 return;
1659
1660 bg_invalidate ();
1661 1695
1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1696 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1663 1697
1664 if (to_wait <= 0.) 1698 if (to_wait <= 0.)
1665 bg_render (); 1699 bg_render ();

Diff Legend

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