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.356 by sf-exg, Fri Apr 29 10:10:20 2011 UTC vs.
Revision 1.401 by sf-exg, Thu Jul 14 05:33:26 2016 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 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
17 * 18 *
18 * This program is free software; you can redistribute it and/or modify 19 * 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 20 * 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 21 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 22 * (at your option) any later version.
22 * 23 *
23 * This program is distributed in the hope that it will be useful, 24 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 25 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
36#include "keyboard.h" 37#include "keyboard.h"
37#include "rxvtperl.h" 38#include "rxvtperl.h"
38 39
39#include <limits> 40#include <limits>
40 41
41#include <cassert> 42#include <assert.h>
42#include <csignal> 43#include <signal.h>
43#include <cstring> 44#include <string.h>
44 45
45#include <termios.h> 46#include <termios.h>
46 47
47#ifdef HAVE_XSETLOCALE 48#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 49# define X_LOCALE
49# include <X11/Xlocale.h> 50# include <X11/Xlocale.h>
50#else 51#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 52# include <locale.h>
53# endif
54#endif 53#endif
55 54
56struct termios rxvt_term::def_tio; 55struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
58 57
… …
105 if (cc->c2 == c2) return c1; 104 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 105 cc = (*this)[cc->c1];
107 } 106 }
108 107
109 // check to see whether this combination already exists otherwise 108 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 109 for (cc = v.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
113 112
114 // allocate a new combination 113 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
… …
152} 151}
153#endif 152#endif
154 153
155rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
156{ 155{
157#if HAVE_BG_PIXMAP
158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
159#endif
160#ifdef CURSOR_BLINK 156#ifdef CURSOR_BLINK
161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL); 157 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
162#endif 158#endif
163#ifdef TEXT_BLINK 159#ifdef TEXT_BLINK
164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL); 160 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
… …
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 166 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 167#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 169 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif 170#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 171#if ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 172 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 173#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 174 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 175#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 176 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 177#endif
182#ifdef POINTER_BLANK 178#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 179 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 180#endif
… …
224 if (fontset[i] != fontset[0]) 220 if (fontset[i] != fontset[0])
225 delete fontset[i]; 221 delete fontset[i];
226#endif 222#endif
227 delete fontset[0]; 223 delete fontset[0];
228 224
229#ifdef HAVE_BG_PIXMAP 225#if HAVE_IMG
230 bg_destroy (); 226 delete bg_img;
231#endif 227#endif
232 228
233 if (display) 229 if (display)
234 { 230 {
235 selection_clear (); 231 selection_clear ();
236 selection_clear (true); 232 selection_clear (true);
237 233
238#ifdef USE_XIM 234#if USE_XIM
239 im_destroy (); 235 im_destroy ();
240#endif 236#endif
241 scrollBar.destroy (); 237 scrollBar.destroy ();
238
239 if (gc)
242 if (gc) XFreeGC (dpy, gc); 240 XFreeGC (dpy, gc);
243 241
244 delete drawable; 242 delete drawable;
243
245 // destroy all windows 244 // destroy all windows
246 if (parent) 245 if (parent)
247 XDestroyWindow (dpy, parent); 246 XDestroyWindow (dpy, parent);
248 247
249 for (int i = 0; i < TOTAL_COLORS; i++) 248 for (int i = 0; i < TOTAL_COLORS; i++)
250 if (ISSET_PIXCOLOR (i)) 249 if (ISSET_PIXCOLOR (i))
251 { 250 {
252 pix_colors_focused [i].free (this); 251 pix_colors_focused [i].free (this);
253#if OFF_FOCUS_FADING 252#if OFF_FOCUS_FADING
253 if (rs[Rs_fade])
254 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
255#endif 255#endif
256 } 256 }
257 257
258 clear (); 258 clear ();
259 259
… …
267 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
268 free (allocated [i]); 268 free (allocated [i]);
269 269
270 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text); 271 free (selection.clip_text);
272 // TODO: manage env vars in child only(!)
273 free (env_display);
274 free (env_term);
275 free (locale); 272 free (locale);
276 free (v_buffer); 273 free (v_buffer);
277 274
278 delete selection_req; 275 delete selection_req;
279 276
277 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
278 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
279
280 delete [] env;
281
280 delete envv; 282 delete envv;
281 delete argv; 283 delete argv;
282 284
283#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
284 delete keyboard; 286 delete keyboard;
285#endif 287#endif
286#ifndef NO_RESOURCES 288#ifndef NO_RESOURCES
287 XrmDestroyDatabase (option_db); 289 XrmDestroyDatabase (option_db);
288#endif 290#endif
291
292 SET_R ((rxvt_term *)0);
289} 293}
290 294
291// child has exited, usually destroys 295// child has exited, usually destroys
292void 296void
293rxvt_term::child_cb (ev::child &w, int status) 297rxvt_term::child_cb (ev::child &w, int status)
… …
316 { 320 {
317#if USE_XIM 321#if USE_XIM
318 im_ev.stop (display); 322 im_ev.stop (display);
319#endif 323#endif
320 scrollbar_ev.stop (display); 324 scrollbar_ev.stop (display);
321#if ENABLE_TRANSPARENCY || ENABLE_PERL 325#if ENABLE_PERL
322 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
323#endif 327#endif
324 termwin_ev.stop (display); 328 termwin_ev.stop (display);
325 vt_ev.stop (display); 329 vt_ev.stop (display);
326 } 330 }
… …
353 357
354 delete this; 358 delete this;
355} 359}
356 360
357void 361void
358rxvt_term::set_option (uint8_t opt, bool set) 362rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
359{ 363{
360 if (!opt) 364 if (!opt)
361 return; 365 return;
362 366
363 uint8_t mask = 1 << (opt & 7); 367 uint8_t mask = 1 << (opt & 7);
… …
367} 371}
368 372
369/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
370/* 374/*
371 * Exit gracefully, clearing the utmp entry and restoring tty attributes 375 * 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 */ 376 */
374static XErrorHandler old_xerror_handler; 377static XErrorHandler old_xerror_handler;
375 378
376static void 379static void
377rxvt_emergency_cleanup () 380rxvt_emergency_cleanup ()
… …
379 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 382 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380 (*t)->emergency_cleanup (); 383 (*t)->emergency_cleanup ();
381} 384}
382 385
383#if !ENABLE_MINIMAL 386#if !ENABLE_MINIMAL
384static void 387static void ecb_cold
385print_x_error (Display *dpy, XErrorEvent *event) 388print_x_error (Display *dpy, XErrorEvent *event)
386{ 389{
387 char buffer[BUFSIZ]; 390 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 391 char mesg[BUFSIZ];
389 char number[32]; 392 char number[32];
390 const char mtype[] = "XlibMessage"; 393
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"); 394 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
395
396 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
397 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
398
399 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
400 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
394 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("+ %s: %s\n", mesg, buffer);
402
395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 403 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
405
406 if (event->request_code >= 128)
407 {
408#if 0
409 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
410 int nexts;
411 char **exts = XListExtensions (dpy, &nexts);
412
413 while (nexts)
414 {
415 char *extname = exts [nexts - 1];
416 int major, first_event, first_error;
417
418 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
419 {
420 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
421 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
422
423 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
424 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
425 rxvt_warn ("+ (which is %s)\n", buffer);
426
427 break;
428 }
429
430 printf ("nextss %d %s\n", nexts, extname);//D
431 --nexts;
432 ++exts;
433 }
434#else
435 int nexts = 0;
436 char **exts = 0;
437#endif
438
439 if (!nexts)
440 {
441 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
442
443 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
444 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
445
446#if 0
447 sprintf (number, "RENDER.%d", event->minor_code);
448 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
449 rxvt_warn ("+ (which is %s)\n", buffer);
450#endif
451 }
452
453 XFreeExtensionList (exts);
454 }
455 else
456 {
397 sprintf(number, "%d", event->request_code); 457 sprintf (number, "%d", event->request_code);
398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 458 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
399 rxvt_warn ("(which is %s)\n", buffer); 459 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 } 460 }
461
405 if ((event->error_code == BadWindow) || 462 if (event->error_code == BadWindow
406 (event->error_code == BadPixmap) || 463 || event->error_code == BadPixmap
407 (event->error_code == BadCursor) || 464 || event->error_code == BadCursor
408 (event->error_code == BadFont) || 465 || event->error_code == BadFont
409 (event->error_code == BadDrawable) || 466 || event->error_code == BadDrawable
410 (event->error_code == BadColor) || 467 || event->error_code == BadColor
411 (event->error_code == BadGC) || 468 || event->error_code == BadGC
412 (event->error_code == BadIDChoice) || 469 || event->error_code == BadIDChoice
413 (event->error_code == BadValue) || 470 || event->error_code == BadValue
414 (event->error_code == BadAtom)) { 471 || event->error_code == BadAtom)
472 {
415 if (event->error_code == BadValue) 473 if (event->error_code == BadValue)
416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 474 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else if (event->error_code == BadAtom) 475 else if (event->error_code == BadAtom)
419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 476 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 else 477 else
422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 478 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 479
432int 480 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
481 }
482}
483#endif
484
485int ecb_cold
433rxvt_xerror_handler (Display *display, XErrorEvent *event) 486rxvt_xerror_handler (Display *display, XErrorEvent *event)
434{ 487{
435 if (GET_R->allowedxerror == -1) 488 if (GET_R && GET_R->allowedxerror == -1)
436 GET_R->allowedxerror = event->error_code; 489 GET_R->allowedxerror = event->error_code;
437 else 490 else
438 { 491 {
439 // GET_R is most likely not the terminal which caused the error, 492 // GET_R is most likely not the terminal which caused the error,
440 // so just output the error and continue 493 // so just output the error and continue
… …
446 } 499 }
447 500
448 return 0; 501 return 0;
449} 502}
450 503
451int 504int ecb_cold
452rxvt_xioerror_handler (Display *display) 505rxvt_xioerror_handler (Display *display)
453{ 506{
454 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 507 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
455 DisplayString (display)); 508 DisplayString (display));
456 rxvt_emergency_cleanup (); 509 rxvt_emergency_cleanup ();
… …
576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 629 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
577 // TODO: handle this with exceptions and tolerate the memory loss 630 // TODO: handle this with exceptions and tolerate the memory loss
578 XSetIOErrorHandler (rxvt_xioerror_handler); 631 XSetIOErrorHandler (rxvt_xioerror_handler);
579 632
580 XrmInitialize (); 633 XrmInitialize ();
634
635#if HAVE_PIXBUF
636 g_type_init ();
637#endif
581} 638}
582 639
583/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
584/* 641/*
585 * window size/position calculations for XSizeHint and other storage. 642 * window size/position calculations for XSizeHint and other storage.
… …
706 if (recalc_y) 763 if (recalc_y)
707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 764 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
708 765
709 ncol = width / fwidth; 766 ncol = width / fwidth;
710 nrow = height / fheight; 767 nrow = height / fheight;
768
769 // When the size of the vt window is not a multiple of the cell
770 // size, i.e., when the wm does not honour our size hints, there are
771 // extra areas not covered by the terminal screen. Such gaps, when a
772 // bg pixmap is set, would have to be cleared manually to properly
773 // refresh the background. We take the simpler route and shrink the
774 // vt window so as to avoid creating gaps.
775 vt_width = ncol * fwidth;
776 vt_height = nrow * fheight;
711} 777}
712 778
713/*----------------------------------------------------------------------*/ 779/*----------------------------------------------------------------------*/
714/* 780/*
715 * Tell the teletype handler what size the window is. 781 * Tell the teletype handler what size the window is.
… …
723 789
724 struct winsize ws; 790 struct winsize ws;
725 791
726 ws.ws_col = ncol; 792 ws.ws_col = ncol;
727 ws.ws_row = nrow; 793 ws.ws_row = nrow;
728 ws.ws_xpixel = width; 794 ws.ws_xpixel = vt_width;
729 ws.ws_ypixel = height; 795 ws.ws_ypixel = vt_height;
730 ioctl (pty->pty, TIOCSWINSZ, &ws); 796 ioctl (pty->pty, TIOCSWINSZ, &ws);
731 797
732#if 0 798#if 0
733 // TIOCSWINSZ is supposed to do this automatically and correctly 799 // TIOCSWINSZ is supposed to do this automatically and correctly
734 if (cmd_pid) /* force through to the command */ 800 if (cmd_pid) /* force through to the command */
… …
760 826
761 delete fontset[0]; 827 delete fontset[0];
762 fontset[0] = fs; 828 fontset[0] = fs;
763 829
764 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 830 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
765 prop.height += lineSpace; 831 prop.width = max (prop.width + letterSpace, 1);
766 prop.width += letterSpace;
767 832
768 fs->set_prop (prop, false); 833 fs->set_prop (prop, false);
769 834
770 fwidth = prop.width; 835 fwidth = prop.width;
771 fheight = prop.height; 836 fheight = prop.height + lineSpace;
772 fbase = prop.ascent; 837 fbase = prop.ascent;
773 838
774 for (int style = 1; style < 4; style++) 839 for (int style = 1; style < 4; style++)
775 { 840 {
776#if ENABLE_STYLES 841#if ENABLE_STYLES
… …
871 936
872void 937void
873rxvt_term::set_window_color (int idx, const char *color) 938rxvt_term::set_window_color (int idx, const char *color)
874{ 939{
875#ifdef XTERM_COLOR_CHANGE 940#ifdef XTERM_COLOR_CHANGE
876 rxvt_color xcol;
877
878 if (color == NULL || *color == '\0') 941 if (color == NULL || *color == '\0')
879 return; 942 return;
880 943
881 color = strdup (color); 944 color = strdup (color);
882 allocated.push_back ((void *)color); 945 allocated.push_back ((void *)color);
… …
888 int i = atoi (color); 951 int i = atoi (color);
889 952
890 if (i >= 8 && i <= 15) 953 if (i >= 8 && i <= 15)
891 { 954 {
892 /* bright colors */ 955 /* bright colors */
893 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 956 alias_color (idx, minBrightCOLOR + i - 8);
894 goto done; 957 goto done;
895 } 958 }
896 959
897 if (i >= 0 && i <= 7) 960 if (i >= 0 && i <= 7)
898 { 961 {
899 /* normal colors */ 962 /* normal colors */
900 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 963 alias_color (idx, minCOLOR + i);
901 goto done; 964 goto done;
902 } 965 }
903 } 966 }
904 967
905 set_color (xcol, color); 968 pix_colors_focused[idx].free (this);
906 969 set_color (pix_colors_focused[idx], color);
907 /*
908 * FIXME: should free colors here, but no idea how to do it so instead,
909 * so just keep gobbling up the colormap
910 */
911
912 pix_colors_focused[idx] = xcol;
913 970
914done: 971done:
915 /*TODO: handle Color_BD, scrollbar background, etc. */ 972 /*TODO: handle Color_BD, scrollbar background, etc. */
916 973
917 update_fade_color (idx); 974 update_fade_color (idx);
918 recolour_cursor (); 975 recolor_cursor ();
919 scr_recolour (); 976 scr_recolor ();
920#endif /* XTERM_COLOR_CHANGE */ 977#endif /* XTERM_COLOR_CHANGE */
921} 978}
922 979
923void 980void
924rxvt_term::recolour_cursor () 981rxvt_term::recolor_cursor ()
925{ 982{
926 XColor fg, bg; 983 XColor fg, bg;
927 984
928 (ISSET_PIXCOLOR (Color_pointer_fg) 985 (ISSET_PIXCOLOR (Color_pointer_fg)
929 ? pix_colors_focused[Color_pointer_fg] 986 ? pix_colors_focused[Color_pointer_fg]
… …
938 995
939/*----------------------------------------------------------------------*/ 996/*----------------------------------------------------------------------*/
940/* 997/*
941 * find if fg/bg matches any of the normal (low-intensity) colors 998 * find if fg/bg matches any of the normal (low-intensity) colors
942 */ 999 */
943void 1000char *
944rxvt_term::set_colorfgbg () 1001rxvt_term::get_colorfgbg ()
945{ 1002{
946 unsigned int i; 1003 unsigned int i;
947 const char *xpmb = ""; 1004 const char *xpmb = "";
948 char fstr[] = "default"; 1005 char fstr[] = "default";
949 char bstr[] = "default"; 1006 char bstr[] = "default";
1007 char *env_colorfgbg;
950 1008
951 for (i = Color_Black; i <= Color_White; i++) 1009 for (i = Color_Black; i <= Color_White; i++)
952 if (pix_colors[Color_fg] == pix_colors[i]) 1010 if (pix_colors[Color_fg] == pix_colors[i])
953 { 1011 {
954 sprintf (fstr, "%d", i - Color_Black); 1012 sprintf (fstr, "%d", i - Color_Black);
… …
957 1015
958 for (i = Color_Black; i <= Color_White; i++) 1016 for (i = Color_Black; i <= Color_White; i++)
959 if (pix_colors[Color_bg] == pix_colors[i]) 1017 if (pix_colors[Color_bg] == pix_colors[i])
960 { 1018 {
961 sprintf (bstr, "%d", i - Color_Black); 1019 sprintf (bstr, "%d", i - Color_Black);
962#ifdef BG_IMAGE_FROM_FILE 1020#if HAVE_IMG
963 xpmb = "default;"; 1021 xpmb = "default;";
964#endif 1022#endif
965 break; 1023 break;
966 } 1024 }
967 1025
1026 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
968 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1027 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1028 return env_colorfgbg;
969} 1029}
970 1030
971/*----------------------------------------------------------------------*/ 1031/*----------------------------------------------------------------------*/
972 1032
973bool 1033bool
… …
981} 1041}
982 1042
983void 1043void
984rxvt_term::alias_color (int dst, int src) 1044rxvt_term::alias_color (int dst, int src)
985{ 1045{
1046 pix_colors[dst].free (this);
986 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1047 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
987} 1048}
1049
1050#ifdef SMART_RESIZE
1051static unsigned int
1052get_parent_bw (Display *dpy, Window w)
1053{
1054 int idummy;
1055 unsigned int udummy;
1056 Window wdummy, parent;
1057 Window *children;
1058 unsigned int nchildren, border_width;
1059
1060 XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
1061 XFree (children);
1062 XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
1063 &udummy, &udummy, &border_width, &udummy);
1064
1065 return border_width;
1066}
1067#endif
988 1068
989/* -------------------------------------------------------------------- * 1069/* -------------------------------------------------------------------- *
990 * - WINDOW RESIZING - * 1070 * - WINDOW RESIZING - *
991 * -------------------------------------------------------------------- */ 1071 * -------------------------------------------------------------------- */
992void 1072void
… …
1028 * if display->root isn't the parent window, a WM will probably have offset 1108 * if display->root isn't the parent window, a WM will probably have offset
1029 * our position for handles and decorations. Counter it 1109 * our position for handles and decorations. Counter it
1030 */ 1110 */
1031 if (x1 != x || y1 != y) 1111 if (x1 != x || y1 != y)
1032 { 1112 {
1033 x -= x1; 1113 unsigned int border_width = get_parent_bw (dpy, parent);
1034 y -= y1; 1114
1115 x -= x1 + border_width;
1116 y -= y1 + border_width;
1035 } 1117 }
1036 1118
1037 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; 1119 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1038 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; 1120 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1039 dx = old_width - szHint.width; 1121 dx = old_width - szHint.width;
… …
1066 if (scrollBar.state) 1148 if (scrollBar.state)
1067 scrollBar.resize (); 1149 scrollBar.resize ();
1068 1150
1069 XMoveResizeWindow (dpy, vt, 1151 XMoveResizeWindow (dpy, vt,
1070 window_vt_x, window_vt_y, 1152 window_vt_x, window_vt_y,
1071 width, height); 1153 vt_width, vt_height);
1072 1154
1073#ifdef HAVE_BG_PIXMAP 1155 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1074 if (bg_window_size_sensitive ())
1075 update_background ();
1076#endif
1077 } 1156 }
1078 1157
1079 if (fix_screen || old_height == 0) 1158 if (fix_screen || old_height == 0)
1080 scr_reset (); 1159 scr_reset ();
1081 1160
1082#ifdef USE_XIM 1161#if USE_XIM
1083 IMSetPosition (); 1162 im_set_position ();
1084#endif 1163#endif
1085} 1164}
1086 1165
1087/* 1166/*
1088 * Set the width/height of the vt window in characters. Units are pixels. 1167 * Set the width/height of the vt window in characters. Units are pixels.
… …
1101 newwidth = wattr.width - szHint.base_width; 1180 newwidth = wattr.width - szHint.base_width;
1102 if (newheight == 0) 1181 if (newheight == 0)
1103 newheight = wattr.height - szHint.base_height; 1182 newheight = wattr.height - szHint.base_height;
1104 } 1183 }
1105 1184
1106 if (newwidth != width || newheight != height) 1185 if (newwidth != vt_width || newheight != vt_height)
1107 { 1186 {
1108 newwidth += szHint.base_width; 1187 newwidth += szHint.base_width;
1109 newheight += szHint.base_height; 1188 newheight += szHint.base_height;
1110 resize_all_windows (newwidth, newheight, 0); 1189 resize_all_windows (newwidth, newheight, 0);
1111 } 1190 }
1112} 1191}
1113 1192
1114/* -------------------------------------------------------------------- * 1193/* -------------------------------------------------------------------- *
1115 * - X INPUT METHOD ROUTINES - * 1194 * - X INPUT METHOD ROUTINES - *
1116 * -------------------------------------------------------------------- */ 1195 * -------------------------------------------------------------------- */
1117#ifdef USE_XIM 1196#if USE_XIM
1118 1197
1119void 1198void
1120rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1199rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1121{ 1200{
1122 fg = pix_colors [Color_fg]; 1201 fg = pix_colors [Color_fg];
… …
1149 status_rect.height = fheight; 1228 status_rect.height = fheight;
1150} 1229}
1151 1230
1152/* Checking whether input method is running. */ 1231/* Checking whether input method is running. */
1153bool 1232bool
1154rxvt_term::IMisRunning () 1233rxvt_term::im_is_running ()
1155{ 1234{
1156 Atom atom; 1235 Atom atom;
1157 Window win; 1236 Window win;
1158 char server[IMBUFSIZ]; 1237 char server[IMBUFSIZ];
1159 1238
… …
1175 1254
1176 return false; 1255 return false;
1177} 1256}
1178 1257
1179void 1258void
1180rxvt_term::IMSendSpot () 1259rxvt_term::im_send_spot ()
1181{ 1260{
1182 XPoint nspot; 1261 XPoint nspot;
1183 XVaNestedList preedit_attr; 1262 XVaNestedList preedit_attr;
1184 1263
1185 if (!Input_Context 1264 if (!Input_Context
… …
1291/* 1370/*
1292 * Try to open a XIM with the current modifiers, then see if we can 1371 * Try to open a XIM with the current modifiers, then see if we can
1293 * open a suitable preedit type 1372 * open a suitable preedit type
1294 */ 1373 */
1295bool 1374bool
1296rxvt_term::IM_get_IC (const char *modifiers) 1375rxvt_term::im_get_ic (const char *modifiers)
1297{ 1376{
1298 int i, j, found; 1377 int i, j, found;
1299 XIM xim; 1378 XIM xim;
1300 XPoint spot; 1379 XPoint spot;
1301 XRectangle rect, status_rect, needed_rect; 1380 XRectangle rect, status_rect, needed_rect;
1302 unsigned long fg, bg; 1381 unsigned long fg, bg;
1303 const char *p; 1382 const char *p;
1304 char **s; 1383 char **s;
1305 XIMStyles *xim_styles; 1384 XIMStyles *xim_styles;
1306#ifdef ENABLE_XIM_ONTHESPOT
1307 XIMCallback xcb[4];
1308#endif
1309 1385
1310 set_environ (envv); 1386 set_environ (env);
1311 1387
1312 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1388 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1313 return false; 1389 return false;
1314 1390
1315 input_method = display->get_xim (locale, modifiers); 1391 input_method = display->get_xim (locale, modifiers);
1316 if (input_method == NULL) 1392 if (input_method == NULL)
1317 return false; 1393 return false;
… …
1453 NULL); 1529 NULL);
1454 } 1530 }
1455#if ENABLE_XIM_ONTHESPOT 1531#if ENABLE_XIM_ONTHESPOT
1456 else if (input_style & XIMPreeditCallbacks) 1532 else if (input_style & XIMPreeditCallbacks)
1457 { 1533 {
1534 XIMCallback xcb[4];
1535
1458 im_set_position (spot); 1536 im_set_position (spot);
1459 1537
1460 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1538 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1461 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1539 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1462 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1540 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1500 // unfortunately, only the focus window is used by XIM, hard to fix 1578 // unfortunately, only the focus window is used by XIM, hard to fix
1501 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1579 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1502 vt_select_input (); 1580 vt_select_input ();
1503#endif 1581#endif
1504 1582
1505 IMSetPosition (); 1583 im_set_position ();
1506 1584
1507 return true; 1585 return true;
1508} 1586}
1509 1587
1510void 1588void
… …
1520 im_destroy (); 1598 im_destroy ();
1521 1599
1522 if (Input_Context) 1600 if (Input_Context)
1523 return; 1601 return;
1524 1602
1525#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1526 if (rs[Rs_imLocale]) 1603 if (rs[Rs_imLocale])
1527 SET_LOCALE (rs[Rs_imLocale]); 1604 SET_LOCALE (rs[Rs_imLocale]);
1528#endif
1529 1605
1530 p = rs[Rs_inputMethod]; 1606 p = rs[Rs_inputMethod];
1531 if (p && *p) 1607 if (p && *p)
1532 { 1608 {
1533 bool found = false; 1609 bool found = false;
… …
1538 { 1614 {
1539 if (*s[i]) 1615 if (*s[i])
1540 { 1616 {
1541 strcpy (buf, "@im="); 1617 strcpy (buf, "@im=");
1542 strncat (buf, s[i], IMBUFSIZ - 5); 1618 strncat (buf, s[i], IMBUFSIZ - 5);
1543 if (IM_get_IC (buf)) 1619 if (im_get_ic (buf))
1544 { 1620 {
1545 found = true; 1621 found = true;
1546 break; 1622 break;
1547 } 1623 }
1548 } 1624 }
… …
1553 if (found) 1629 if (found)
1554 goto done; 1630 goto done;
1555 } 1631 }
1556 1632
1557 /* try with XMODIFIERS env. var. */ 1633 /* try with XMODIFIERS env. var. */
1558 if (IM_get_IC ("")) 1634 if (im_get_ic (""))
1559 goto done; 1635 goto done;
1560 1636
1561 /* try with no modifiers base IF the user didn't specify an IM */ 1637 /* try with no modifiers base IF the user didn't specify an IM */
1562 if (IM_get_IC ("@im=none")) 1638 if (im_get_ic ("@im=none"))
1563 goto done; 1639 goto done;
1564 1640
1565done: 1641done:
1566#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1567 if (rs[Rs_imLocale]) 1642 if (rs[Rs_imLocale])
1568 SET_LOCALE (locale); 1643 SET_LOCALE (locale);
1569#endif
1570} 1644}
1571 1645
1572void 1646void
1573rxvt_term::IMSetPosition () 1647rxvt_term::im_set_position ()
1574{ 1648{
1575 XRectangle preedit_rect, status_rect, *needed_rect; 1649 XRectangle preedit_rect, status_rect, *needed_rect;
1576 XVaNestedList preedit_attr, status_attr; 1650 XVaNestedList preedit_attr, status_attr;
1577 1651
1578 if (!Input_Context 1652 if (!Input_Context
1579 || !focus 1653 || !focus
1580 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1654 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1581 || !IMisRunning ()) 1655 || !im_is_running ())
1582 return; 1656 return;
1583 1657
1584 if (input_style & XIMPreeditPosition) 1658 if (input_style & XIMPreeditPosition)
1585 { 1659 {
1586 im_set_size (preedit_rect); 1660 im_set_size (preedit_rect);
… …
1619{ 1693{
1620 Window cr; 1694 Window cr;
1621 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1695 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1622} 1696}
1623 1697
1624Pixmap
1625rxvt_term::get_pixmap_property (Atom property)
1626{
1627 Pixmap pixmap = None;
1628
1629 int aformat;
1630 unsigned long nitems, bytes_after;
1631 Atom atype;
1632 unsigned char *prop;
1633 int result = XGetWindowProperty (dpy, display->root, property,
1634 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1635 &nitems, &bytes_after, &prop);
1636 if (result == Success)
1637 {
1638 if (atype == XA_PIXMAP)
1639 pixmap = *(Pixmap *)prop;
1640 XFree (prop);
1641 }
1642
1643 return pixmap;
1644}
1645
1646#ifdef HAVE_BG_PIXMAP
1647
1648void
1649rxvt_term::update_background ()
1650{
1651 if (update_background_ev.is_active ())
1652 return;
1653
1654 bg_invalidate ();
1655
1656 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1657
1658 if (to_wait <= 0.)
1659 bg_render ();
1660 else
1661 update_background_ev.start (to_wait);
1662}
1663
1664void
1665rxvt_term::update_background_cb (ev::timer &w, int revents)
1666{
1667 make_current ();
1668
1669 update_background_ev.stop ();
1670 bg_render ();
1671 refresh_check ();
1672}
1673
1674#endif /* HAVE_BG_PIXMAP */
1675
1676/*----------------------- end-of-file (C source) -----------------------*/ 1698/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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