ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.333 by root, Fri Oct 22 05:57:59 2010 UTC vs.
Revision 1.394 by root, Sat Dec 13 10:07:30 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-2008 Marc Lehmann <pcg@goof.com> 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
… …
96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97{ 95{
98 compose_char *cc; 96 compose_char *cc;
99 97
100 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
101 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
102 cc = (*this)[c1]; 100 cc = (*this)[c1];
103 while (cc) 101 while (cc)
104 { 102 {
105 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
107 } 105 }
108 106
109 // check to see whether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
111 {
112 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
113 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
114 }
115 111
116 // allocate a new combination 112 // allocate a new combination
117 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118 { 114 {
119 static int seen; 115 static int seen;
120 116
121 if (!seen++) 117 if (!seen++)
122 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123 119
124 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
125 } 121 }
126 122
127 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
172 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);
173#endif 169#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 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);
176#endif 172#endif
177#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
179#endif 175#endif
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#ifdef USE_XIM 177#if USE_XIM
182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
183#endif 179#endif
184#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
186#endif 182#endif
… …
189#endif 185#endif
190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 192
198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199 194
… …
228 delete fontset[i]; 223 delete fontset[i];
229#endif 224#endif
230 delete fontset[0]; 225 delete fontset[0];
231 226
232#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy (); 228 bg_destroy ();
234#endif 229#endif
235#ifdef HAVE_AFTERIMAGE 230
236 if (asv) 231#if HAVE_IMG
237 destroy_asvisual (asv, 0); 232 delete bg_img;
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif 233#endif
241 234
242 if (display) 235 if (display)
243 { 236 {
244 selection_clear (); 237 selection_clear ();
245 selection_clear (true); 238 selection_clear (true);
246 239
247#ifdef USE_XIM 240#if USE_XIM
248 im_destroy (); 241 im_destroy ();
249#endif 242#endif
250 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
251 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
252 247
253 delete drawable; 248 delete drawable;
249
254 // destroy all windows 250 // destroy all windows
255 if (parent[0]) 251 if (parent)
256 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
257 253
258 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
260 { 256 {
261 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
… …
276 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
277 free (allocated [i]); 273 free (allocated [i]);
278 274
279 free (selection.text); 275 free (selection.text);
280 free (selection.clip_text); 276 free (selection.clip_text);
281 // TODO: manage env vars in child only(!)
282 free (env_display);
283 free (env_term);
284 free (locale); 277 free (locale);
285 free (v_buffer); 278 free (v_buffer);
286 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;
287 286
288 delete envv; 287 delete envv;
289 delete argv; 288 delete argv;
290 289
291#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
292 delete keyboard; 291 delete keyboard;
293#endif 292#endif
294#ifndef NO_RESOURCES 293#ifndef NO_RESOURCES
295 XrmDestroyDatabase (option_db); 294 XrmDestroyDatabase (option_db);
296#endif 295#endif
296
297 SET_R ((rxvt_term *)0);
297} 298}
298 299
299// child has exited, usually destroys 300// child has exited, usually destroys
300void 301void
301rxvt_term::child_cb (ev::child &w, int status) 302rxvt_term::child_cb (ev::child &w, int status)
… …
324 { 325 {
325#if USE_XIM 326#if USE_XIM
326 im_ev.stop (display); 327 im_ev.stop (display);
327#endif 328#endif
328 scrollbar_ev.stop (display); 329 scrollbar_ev.stop (display);
329#if ENABLE_TRANSPARENCY || ENABLE_PERL 330#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
330 rootwin_ev.stop (display); 331 rootwin_ev.stop (display);
331#endif 332#endif
332 incr_ev.stop ();
333 termwin_ev.stop (display); 333 termwin_ev.stop (display);
334 vt_ev.stop (display); 334 vt_ev.stop (display);
335 } 335 }
336 336
337 flush_ev.stop (); 337 flush_ev.stop ();
… …
361 make_current (); 361 make_current ();
362 362
363 delete this; 363 delete this;
364} 364}
365 365
366void
367rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
368{
369 if (!opt)
370 return;
371
372 uint8_t mask = 1 << (opt & 7);
373 uint8_t &val = options [opt >> 3];
374
375 val = val & ~mask | (set ? mask : 0);
376}
377
366/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
367/* 379/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
369 * TODO: if debugging, this should free up any known resources if we can
370 */ 381 */
371static XErrorHandler old_xerror_handler; 382static XErrorHandler old_xerror_handler;
372 383
373static void 384static void
374rxvt_emergency_cleanup () 385rxvt_emergency_cleanup ()
… …
376 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 387 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
377 (*t)->emergency_cleanup (); 388 (*t)->emergency_cleanup ();
378} 389}
379 390
380#if !ENABLE_MINIMAL 391#if !ENABLE_MINIMAL
381static void 392static void ecb_cold
382print_x_error (Display *dpy, XErrorEvent *event) 393print_x_error (Display *dpy, XErrorEvent *event)
383{ 394{
384 char buffer[BUFSIZ]; 395 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 396 char mesg[BUFSIZ];
386 char number[32]; 397 char number[32];
387 char *mtype = "XlibMessage"; 398
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 399 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
400
401 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
402 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
403
404 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
391 rxvt_warn ("%s: %s\n", mesg, buffer); 406 rxvt_warn ("+ %s: %s\n", mesg, buffer);
407
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 408 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 409 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
410
411 if (event->request_code >= 128)
412 {
413#if 0
414 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
415 int nexts;
416 char **exts = XListExtensions (dpy, &nexts);
417
418 while (nexts)
419 {
420 char *extname = exts [nexts - 1];
421 int major, first_event, first_error;
422
423 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
424 {
425 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
426 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
427
428 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
429 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
430 rxvt_warn ("+ (which is %s)\n", buffer);
431
432 break;
433 }
434
435 printf ("nextss %d %s\n", nexts, extname);//D
436 --nexts;
437 ++exts;
438 }
439#else
440 int nexts = 0;
441 char **exts = 0;
442#endif
443
444 if (!nexts)
445 {
446 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
447
448 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
449 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
450
451#if 0
452 sprintf (number, "RENDER.%d", event->minor_code);
453 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
454 rxvt_warn ("+ (which is %s)\n", buffer);
455#endif
456 }
457
458 XFreeExtensionList (exts);
459 }
460 else
461 {
394 sprintf(number, "%d", event->request_code); 462 sprintf (number, "%d", event->request_code);
395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 463 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
396 rxvt_warn ("(which is %s)\n", buffer); 464 rxvt_warn ("+ (which is %s)\n", buffer);
397 if (event->request_code >= 128) {
398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
399 mesg, BUFSIZ);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
401 } 465 }
466
402 if ((event->error_code == BadWindow) || 467 if (event->error_code == BadWindow
403 (event->error_code == BadPixmap) || 468 || event->error_code == BadPixmap
404 (event->error_code == BadCursor) || 469 || event->error_code == BadCursor
405 (event->error_code == BadFont) || 470 || event->error_code == BadFont
406 (event->error_code == BadDrawable) || 471 || event->error_code == BadDrawable
407 (event->error_code == BadColor) || 472 || event->error_code == BadColor
408 (event->error_code == BadGC) || 473 || event->error_code == BadGC
409 (event->error_code == BadIDChoice) || 474 || event->error_code == BadIDChoice
410 (event->error_code == BadValue) || 475 || event->error_code == BadValue
411 (event->error_code == BadAtom)) { 476 || event->error_code == BadAtom)
477 {
412 if (event->error_code == BadValue) 478 if (event->error_code == BadValue)
413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ);
415 else if (event->error_code == BadAtom) 480 else if (event->error_code == BadAtom)
416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else 482 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
422 }
423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
424 mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426}
427#endif
428 484
429int 485 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
486 }
487}
488#endif
489
490int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 491rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 492{
432 if (GET_R->allowedxerror == -1) 493 if (GET_R && GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 494 GET_R->allowedxerror = event->error_code;
434 else 495 else
435 { 496 {
436 // GET_R is most likely not the terminal which caused the error, 497 // GET_R is most likely not the terminal which caused the error,
437 // so just output the error and continue 498 // so just output the error and continue
… …
443 } 504 }
444 505
445 return 0; 506 return 0;
446} 507}
447 508
448int 509int ecb_cold
449rxvt_xioerror_handler (Display *display) 510rxvt_xioerror_handler (Display *display)
450{ 511{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 512 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display)); 513 DisplayString (display));
453 rxvt_emergency_cleanup (); 514 rxvt_emergency_cleanup ();
… …
511 tio->c_cc[VWERSE] = CWERASE; 572 tio->c_cc[VWERSE] = CWERASE;
512# endif 573# endif
513# ifdef VLNEXT 574# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT; 575 tio->c_cc[VLNEXT] = CLNEXT;
515# endif 576# endif
577# ifdef VSTATUS
578 tio->c_cc[VSTATUS] = CSTATUS;
579# endif
516 580
517# if VMIN != VEOF 581# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1; 582 tio->c_cc[VMIN] = 1;
519# endif 583# endif
520# if VTIME != VEOL 584# if VTIME != VEOL
… …
554 618
555 // get rid of stdin/stdout as we don't need them, to free resources 619 // get rid of stdin/stdout as we don't need them, to free resources
556 dup2 (STDERR_FILENO, STDIN_FILENO); 620 dup2 (STDERR_FILENO, STDIN_FILENO);
557 dup2 (STDERR_FILENO, STDOUT_FILENO); 621 dup2 (STDERR_FILENO, STDOUT_FILENO);
558 622
559 ptytty::init ();
560
561 if (!ev_default_loop ()) 623 if (!ev_default_loop ())
562 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 624 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
563 625
564 rxvt_environ = environ; 626 rxvt_environ = environ;
565 627
… …
572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 634 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
573 // TODO: handle this with exceptions and tolerate the memory loss 635 // TODO: handle this with exceptions and tolerate the memory loss
574 XSetIOErrorHandler (rxvt_xioerror_handler); 636 XSetIOErrorHandler (rxvt_xioerror_handler);
575 637
576 XrmInitialize (); 638 XrmInitialize ();
639
640#if HAVE_PIXBUF
641 g_type_init ();
642#endif
577} 643}
578 644
579/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
580/* 646/*
581 * window size/position calculations for XSizeHint and other storage. 647 * window size/position calculations for XSizeHint and other storage.
… …
702 if (recalc_y) 768 if (recalc_y)
703 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 769 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
704 770
705 ncol = width / fwidth; 771 ncol = width / fwidth;
706 nrow = height / fheight; 772 nrow = height / fheight;
773
774 // When the size of the vt window is not a multiple of the cell
775 // size, i.e., when the wm does not honour our size hints, there are
776 // extra areas not covered by the terminal screen. Such gaps, when a
777 // bg pixmap is set, would have to be cleared manually to properly
778 // refresh the background. We take the simpler route and shrink the
779 // vt window so as to avoid creating gaps.
780 vt_width = ncol * fwidth;
781 vt_height = nrow * fheight;
707} 782}
708 783
709/*----------------------------------------------------------------------*/ 784/*----------------------------------------------------------------------*/
710/* 785/*
711 * Tell the teletype handler what size the window is. 786 * Tell the teletype handler what size the window is.
… …
719 794
720 struct winsize ws; 795 struct winsize ws;
721 796
722 ws.ws_col = ncol; 797 ws.ws_col = ncol;
723 ws.ws_row = nrow; 798 ws.ws_row = nrow;
724 ws.ws_xpixel = width; 799 ws.ws_xpixel = vt_width;
725 ws.ws_ypixel = height; 800 ws.ws_ypixel = vt_height;
726 ioctl (pty->pty, TIOCSWINSZ, &ws); 801 ioctl (pty->pty, TIOCSWINSZ, &ws);
727 802
728#if 0 803#if 0
729 // TIOCSWINSZ is supposed to do this automatically and correctly 804 // TIOCSWINSZ is supposed to do this automatically and correctly
730 if (cmd_pid) /* force through to the command */ 805 if (cmd_pid) /* force through to the command */
731 kill (-cmd_pid, SIGWINCH); 806 kill (-cmd_pid, SIGWINCH);
732#endif 807#endif
733} 808}
734 809
735/*----------------------------------------------------------------------*/ 810/*----------------------------------------------------------------------*/
736/* set_fonts () - load and set the various fonts 811/* load and set the various fonts */
737 *
738 * init = 1 - initialize
739 *
740 * fontname == FONT_UP - switch to bigger font
741 * fontname == FONT_DN - switch to smaller font
742 */
743bool 812bool
744rxvt_term::set_fonts () 813rxvt_term::set_fonts ()
745{ 814{
746 rxvt_fontset *fs = new rxvt_fontset (this); 815 rxvt_fontset *fs = new rxvt_fontset (this);
747 rxvt_fontprop prop; 816 rxvt_fontprop prop;
… …
762 831
763 delete fontset[0]; 832 delete fontset[0];
764 fontset[0] = fs; 833 fontset[0] = fs;
765 834
766 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 835 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
767 prop.height += lineSpace; 836 prop.width = max (prop.width + letterSpace, 1);
768 prop.width += letterSpace;
769 837
770 fs->set_prop (prop, false); 838 fs->set_prop (prop, false);
771 839
772 fwidth = prop.width; 840 fwidth = prop.width;
773 fheight = prop.height; 841 fheight = prop.height + lineSpace;
774 fbase = prop.ascent; 842 fbase = prop.ascent;
775 843
776 for (int style = 1; style < 4; style++) 844 for (int style = 1; style < 4; style++)
777 { 845 {
778#if ENABLE_STYLES 846#if ENABLE_STYLES
… …
804#else 872#else
805 fontset[style] = fontset[0]; 873 fontset[style] = fontset[0];
806#endif 874#endif
807 } 875 }
808 876
809 if (parent[0]) 877 if (parent)
810 { 878 {
811 resize_all_windows (0, 0, 0); 879 resize_all_windows (0, 0, 0);
812 scr_remap_chars (); 880 scr_remap_chars ();
813 scr_touch (true); 881 scr_touch (true);
814 } 882 }
… …
817} 885}
818 886
819void 887void
820rxvt_term::set_string_property (Atom prop, const char *str, int len) 888rxvt_term::set_string_property (Atom prop, const char *str, int len)
821{ 889{
822 XChangeProperty (dpy, parent[0], 890 XChangeProperty (dpy, parent,
823 prop, XA_STRING, 8, PropModeReplace, 891 prop, XA_STRING, 8, PropModeReplace,
824 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 892 (const unsigned char *)str, len >= 0 ? len : strlen (str));
825} 893}
826 894
827void 895void
… …
829{ 897{
830 XTextProperty ct; 898 XTextProperty ct;
831 899
832 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 900 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
833 { 901 {
834 XSetTextProperty (dpy, parent[0], &ct, prop); 902 XSetTextProperty (dpy, parent, &ct, prop);
835 XFree (ct.value); 903 XFree (ct.value);
836 } 904 }
837} 905}
838 906
839void 907void
840rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 908rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
841{ 909{
842 wchar_t *ws = rxvt_mbstowcs (str, len); 910 wchar_t *ws = rxvt_mbstowcs (str, len);
843 char *s = rxvt_wcstoutf8 (ws); 911 char *s = rxvt_wcstoutf8 (ws);
844 912
845 XChangeProperty (dpy, parent[0], 913 XChangeProperty (dpy, parent,
846 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 914 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
847 (const unsigned char *)s, strlen (s)); 915 (const unsigned char *)s, strlen (s));
848 916
849 free (s); 917 free (s);
850 free (ws); 918 free (ws);
… …
940 1008
941/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
942/* 1010/*
943 * find if fg/bg matches any of the normal (low-intensity) colors 1011 * find if fg/bg matches any of the normal (low-intensity) colors
944 */ 1012 */
945void 1013char *
946rxvt_term::set_colorfgbg () 1014rxvt_term::get_colorfgbg ()
947{ 1015{
948 unsigned int i; 1016 unsigned int i;
949 const char *xpmb = ""; 1017 const char *xpmb = "";
950 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1018 char fstr[] = "default";
1019 char bstr[] = "default";
1020 char *env_colorfgbg;
951 1021
952 strcpy (fstr, "default");
953 strcpy (bstr, "default");
954 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
955 if (pix_colors[Color_fg] == pix_colors[i]) 1023 if (pix_colors[Color_fg] == pix_colors[i])
956 { 1024 {
957 sprintf (fstr, "%d", (i - Color_Black)); 1025 sprintf (fstr, "%d", i - Color_Black);
958 break; 1026 break;
959 } 1027 }
960 1028
961 for (i = Color_Black; i <= Color_White; i++) 1029 for (i = Color_Black; i <= Color_White; i++)
962 if (pix_colors[Color_bg] == pix_colors[i]) 1030 if (pix_colors[Color_bg] == pix_colors[i])
963 { 1031 {
964 sprintf (bstr, "%d", (i - Color_Black)); 1032 sprintf (bstr, "%d", i - Color_Black);
965#ifdef BG_IMAGE_FROM_FILE 1033#if BG_IMAGE_FROM_FILE
966 xpmb = "default;"; 1034 xpmb = "default;";
967#endif 1035#endif
968 break; 1036 break;
969 } 1037 }
970 1038
1039 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
971 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1040 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1041 return env_colorfgbg;
972} 1042}
973 1043
974/*----------------------------------------------------------------------*/ 1044/*----------------------------------------------------------------------*/
975 1045
976bool 1046bool
… …
1005 1075
1006 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1076 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1007 if (set_hint) 1077 if (set_hint)
1008 { 1078 {
1009 szHint.flags &= ~(PBaseSize | PResizeInc); 1079 szHint.flags &= ~(PBaseSize | PResizeInc);
1010 XSetWMNormalHints (dpy, parent[0], &szHint); 1080 XSetWMNormalHints (dpy, parent, &szHint);
1011 szHint.flags |= PBaseSize | PResizeInc; 1081 szHint.flags |= PBaseSize | PResizeInc;
1012 } 1082 }
1013 1083
1014 if (!ignoreparent) 1084 if (!ignoreparent)
1015 { 1085 {
… …
1021 int x, y, x1, y1; 1091 int x, y, x1, y1;
1022 int dx, dy; 1092 int dx, dy;
1023 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1093 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1024 Window unused_cr; 1094 Window unused_cr;
1025 1095
1026 XTranslateCoordinates (dpy, parent[0], display->root, 1096 XTranslateCoordinates (dpy, parent, display->root,
1027 0, 0, &x, &y, &unused_cr); 1097 0, 0, &x, &y, &unused_cr);
1028 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1098 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1029 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1099 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1030 /* 1100 /*
1031 * if display->root isn't the parent window, a WM will probably have offset 1101 * if display->root isn't the parent window, a WM will probably have offset
1032 * our position for handles and decorations. Counter it 1102 * our position for handles and decorations. Counter it
1033 */ 1103 */
… …
1050 if (y < y1) /* top half */ 1120 if (y < y1) /* top half */
1051 dy = 0; 1121 dy = 0;
1052 else if (y == y1) /* exact center */ 1122 else if (y == y1) /* exact center */
1053 dy /= 2; 1123 dy /= 2;
1054 1124
1055 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1125 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1056 szHint.width, szHint.height); 1126 szHint.width, szHint.height);
1057#else 1127#else
1058 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1128 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1059#endif 1129#endif
1060 } 1130 }
1061 1131
1062 if (set_hint) 1132 if (set_hint)
1063 XSetWMNormalHints (dpy, parent[0], &szHint); 1133 XSetWMNormalHints (dpy, parent, &szHint);
1064 1134
1065 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1135 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1066 1136
1067 if (fix_screen || newwidth != old_width || newheight != old_height) 1137 if (fix_screen || newwidth != old_width || newheight != old_height)
1068 { 1138 {
1069 if (scrollBar.state) 1139 if (scrollBar.state)
1070 scrollBar.resize (); 1140 scrollBar.resize ();
1071 1141
1072 XMoveResizeWindow (dpy, vt, 1142 XMoveResizeWindow (dpy, vt,
1073 window_vt_x, window_vt_y, 1143 window_vt_x, window_vt_y,
1074 width, height); 1144 vt_width, vt_height);
1145
1146 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1075 1147
1076#ifdef HAVE_BG_PIXMAP 1148#ifdef HAVE_BG_PIXMAP
1077 if (bgPixmap.window_size_sensitive ()) 1149 if (bg_window_size_sensitive ())
1078 update_background (); 1150 update_background ();
1079#endif 1151#endif
1080 } 1152 }
1081 1153
1082 if (fix_screen || old_height == 0) 1154 if (fix_screen || old_height == 0)
1083 scr_reset (); 1155 scr_reset ();
1084 1156
1085#ifdef HAVE_BG_PIXMAP
1086// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1087// if (bgPixmap.pixmap)
1088// scr_touch (false);
1089#endif
1090
1091#ifdef USE_XIM 1157#if USE_XIM
1092 IMSetPosition (); 1158 im_set_position ();
1093#endif 1159#endif
1094} 1160}
1095 1161
1096/* 1162/*
1097 * Set the width/height of the vt window in characters. Units are pixels. 1163 * Set the width/height of the vt window in characters. Units are pixels.
… …
1110 newwidth = wattr.width - szHint.base_width; 1176 newwidth = wattr.width - szHint.base_width;
1111 if (newheight == 0) 1177 if (newheight == 0)
1112 newheight = wattr.height - szHint.base_height; 1178 newheight = wattr.height - szHint.base_height;
1113 } 1179 }
1114 1180
1115 if (newwidth != width || newheight != height) 1181 if (newwidth != vt_width || newheight != vt_height)
1116 { 1182 {
1117 newwidth += szHint.base_width; 1183 newwidth += szHint.base_width;
1118 newheight += szHint.base_height; 1184 newheight += szHint.base_height;
1119 resize_all_windows (newwidth, newheight, 0); 1185 resize_all_windows (newwidth, newheight, 0);
1120 } 1186 }
1121} 1187}
1122 1188
1123/* -------------------------------------------------------------------- * 1189/* -------------------------------------------------------------------- *
1124 * - X INPUT METHOD ROUTINES - * 1190 * - X INPUT METHOD ROUTINES - *
1125 * -------------------------------------------------------------------- */ 1191 * -------------------------------------------------------------------- */
1126#ifdef USE_XIM 1192#if USE_XIM
1127 1193
1128void 1194void
1129rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1195rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1130{ 1196{
1131 fg = pix_colors [Color_fg]; 1197 fg = pix_colors [Color_fg];
… …
1158 status_rect.height = fheight; 1224 status_rect.height = fheight;
1159} 1225}
1160 1226
1161/* Checking whether input method is running. */ 1227/* Checking whether input method is running. */
1162bool 1228bool
1163rxvt_term::IMisRunning () 1229rxvt_term::im_is_running ()
1164{ 1230{
1165 Atom atom; 1231 Atom atom;
1166 Window win; 1232 Window win;
1167 char server[IMBUFSIZ]; 1233 char server[IMBUFSIZ];
1168 1234
… …
1177 1243
1178 atom = XInternAtom (dpy, server, False); 1244 atom = XInternAtom (dpy, server, False);
1179 win = XGetSelectionOwner (dpy, atom); 1245 win = XGetSelectionOwner (dpy, atom);
1180 1246
1181 if (win != None) 1247 if (win != None)
1182 return True; 1248 return true;
1183 } 1249 }
1184 1250
1185 return False; 1251 return false;
1186} 1252}
1187 1253
1188void 1254void
1189rxvt_term::IMSendSpot () 1255rxvt_term::im_send_spot ()
1190{ 1256{
1191 XPoint nspot; 1257 XPoint nspot;
1192 XVaNestedList preedit_attr; 1258 XVaNestedList preedit_attr;
1193 1259
1194 if (!Input_Context 1260 if (!Input_Context
… …
1300/* 1366/*
1301 * Try to open a XIM with the current modifiers, then see if we can 1367 * Try to open a XIM with the current modifiers, then see if we can
1302 * open a suitable preedit type 1368 * open a suitable preedit type
1303 */ 1369 */
1304bool 1370bool
1305rxvt_term::IM_get_IC (const char *modifiers) 1371rxvt_term::im_get_ic (const char *modifiers)
1306{ 1372{
1307 int i, j, found; 1373 int i, j, found;
1308 XIM xim; 1374 XIM xim;
1309 XPoint spot; 1375 XPoint spot;
1310 XRectangle rect, status_rect, needed_rect; 1376 XRectangle rect, status_rect, needed_rect;
1311 unsigned long fg, bg; 1377 unsigned long fg, bg;
1312 const char *p; 1378 const char *p;
1313 char **s; 1379 char **s;
1314 XIMStyles *xim_styles; 1380 XIMStyles *xim_styles;
1315#ifdef ENABLE_XIM_ONTHESPOT
1316 XIMCallback xcb[4];
1317#endif
1318 1381
1319 set_environ (envv); 1382 set_environ (env);
1320 1383
1321 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1384 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1322 return false; 1385 return false;
1323 1386
1324 input_method = display->get_xim (locale, modifiers); 1387 input_method = display->get_xim (locale, modifiers);
1325 if (input_method == NULL) 1388 if (input_method == NULL)
1326 return false; 1389 return false;
… …
1343 p = pet[pi]; 1406 p = pet[pi];
1344 1407
1345 if (!p) 1408 if (!p)
1346 continue; 1409 continue;
1347 1410
1348 s = rxvt_splitcommastring (p); 1411 s = rxvt_strsplit (',', p);
1349 1412
1350 for (i = found = 0; !found && s[i]; i++) 1413 for (i = found = 0; !found && s[i]; i++)
1351 { 1414 {
1352 if (!strcmp (s[i], "OverTheSpot")) 1415 if (!strcmp (s[i], "OverTheSpot"))
1353 input_style = XIMPreeditPosition | XIMStatusNothing; 1416 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1365 input_style = XIMPreeditNothing | XIMStatusNothing; 1428 input_style = XIMPreeditNothing | XIMStatusNothing;
1366 1429
1367 for (j = 0; j < xim_styles->count_styles; j++) 1430 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1431 if (input_style == xim_styles->supported_styles[j])
1369 { 1432 {
1370 rxvt_freecommastring (s); 1433 rxvt_free_strsplit (s);
1371 1434
1372 found = 1; 1435 found = 1;
1373 goto foundpet; 1436 goto foundpet;
1374 } 1437 }
1375 1438
1376 } 1439 }
1377 1440
1378 rxvt_freecommastring (s); 1441 rxvt_free_strsplit (s);
1379 } 1442 }
1380 1443
1381foundpet: 1444foundpet:
1382 1445
1383 XFree (xim_styles); 1446 XFree (xim_styles);
… …
1462 NULL); 1525 NULL);
1463 } 1526 }
1464#if ENABLE_XIM_ONTHESPOT 1527#if ENABLE_XIM_ONTHESPOT
1465 else if (input_style & XIMPreeditCallbacks) 1528 else if (input_style & XIMPreeditCallbacks)
1466 { 1529 {
1530 XIMCallback xcb[4];
1531
1467 im_set_position (spot); 1532 im_set_position (spot);
1468 1533
1469 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1534 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1470 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1535 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1471 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1536 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1486#endif 1551#endif
1487 1552
1488 Input_Context = XCreateIC (xim, 1553 Input_Context = XCreateIC (xim,
1489 XNInputStyle, input_style, 1554 XNInputStyle, input_style,
1490 XNClientWindow, vt, 1555 XNClientWindow, vt,
1491 XNFocusWindow, parent[0], 1556 XNFocusWindow, parent,
1492 preedit_attr ? XNPreeditAttributes : NULL, 1557 preedit_attr ? XNPreeditAttributes : NULL,
1493 preedit_attr, 1558 preedit_attr,
1494 status_attr ? XNStatusAttributes : NULL, 1559 status_attr ? XNStatusAttributes : NULL,
1495 status_attr, NULL); 1560 status_attr, NULL);
1496 1561
… …
1509 // unfortunately, only the focus window is used by XIM, hard to fix 1574 // unfortunately, only the focus window is used by XIM, hard to fix
1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1575 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1511 vt_select_input (); 1576 vt_select_input ();
1512#endif 1577#endif
1513 1578
1514 IMSetPosition (); 1579 im_set_position ();
1515 1580
1516 return true; 1581 return true;
1517} 1582}
1518 1583
1519void 1584void
… …
1529 im_destroy (); 1594 im_destroy ();
1530 1595
1531 if (Input_Context) 1596 if (Input_Context)
1532 return; 1597 return;
1533 1598
1534#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1535 if (rs[Rs_imLocale]) 1599 if (rs[Rs_imLocale])
1536 SET_LOCALE (rs[Rs_imLocale]); 1600 SET_LOCALE (rs[Rs_imLocale]);
1537#endif
1538 1601
1539 p = rs[Rs_inputMethod]; 1602 p = rs[Rs_inputMethod];
1540 if (p && *p) 1603 if (p && *p)
1541 { 1604 {
1542 bool found = false; 1605 bool found = false;
1543 1606
1544 s = rxvt_splitcommastring (p); 1607 s = rxvt_strsplit (',', p);
1545 1608
1546 for (i = 0; s[i]; i++) 1609 for (i = 0; s[i]; i++)
1547 { 1610 {
1548 if (*s[i]) 1611 if (*s[i])
1549 { 1612 {
1550 strcpy (buf, "@im="); 1613 strcpy (buf, "@im=");
1551 strncat (buf, s[i], IMBUFSIZ - 5); 1614 strncat (buf, s[i], IMBUFSIZ - 5);
1552 if (IM_get_IC (buf)) 1615 if (im_get_ic (buf))
1553 { 1616 {
1554 found = true; 1617 found = true;
1555 break; 1618 break;
1556 } 1619 }
1557 } 1620 }
1558 } 1621 }
1559 1622
1560 rxvt_freecommastring (s); 1623 rxvt_free_strsplit (s);
1561 1624
1562 if (found) 1625 if (found)
1563 goto done; 1626 goto done;
1564 } 1627 }
1565 1628
1566 /* try with XMODIFIERS env. var. */ 1629 /* try with XMODIFIERS env. var. */
1567 if (IM_get_IC ("")) 1630 if (im_get_ic (""))
1568 goto done; 1631 goto done;
1569 1632
1570 /* try with no modifiers base IF the user didn't specify an IM */ 1633 /* try with no modifiers base IF the user didn't specify an IM */
1571 if (IM_get_IC ("@im=none")) 1634 if (im_get_ic ("@im=none"))
1572 goto done; 1635 goto done;
1573 1636
1574done: 1637done:
1575#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1576 if (rs[Rs_imLocale]) 1638 if (rs[Rs_imLocale])
1577 SET_LOCALE (locale); 1639 SET_LOCALE (locale);
1578#endif
1579} 1640}
1580 1641
1581void 1642void
1582rxvt_term::IMSetPosition () 1643rxvt_term::im_set_position ()
1583{ 1644{
1584 XRectangle preedit_rect, status_rect, *needed_rect; 1645 XRectangle preedit_rect, status_rect, *needed_rect;
1585 XVaNestedList preedit_attr, status_attr; 1646 XVaNestedList preedit_attr, status_attr;
1586 1647
1587 if (!Input_Context 1648 if (!Input_Context
1588 || !focus 1649 || !focus
1589 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1650 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1590 || !IMisRunning ()) 1651 || !im_is_running ())
1591 return; 1652 return;
1592 1653
1593 if (input_style & XIMPreeditPosition) 1654 if (input_style & XIMPreeditPosition)
1594 { 1655 {
1595 im_set_size (preedit_rect); 1656 im_set_size (preedit_rect);
… …
1625 1686
1626void 1687void
1627rxvt_term::get_window_origin (int &x, int &y) 1688rxvt_term::get_window_origin (int &x, int &y)
1628{ 1689{
1629 Window cr; 1690 Window cr;
1630 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1691 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1631/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1632}
1633
1634Pixmap
1635rxvt_term::get_pixmap_property (int prop_id)
1636{
1637 if (prop_id > 0 && prop_id < NUM_XA)
1638 if (xa[prop_id])
1639 {
1640 int aformat;
1641 unsigned long nitems, bytes_after;
1642 Atom atype;
1643 unsigned char *prop = NULL;
1644 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1645 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1646 &nitems, &bytes_after, &prop);
1647 if (result == Success && prop && atype == XA_PIXMAP)
1648 return *(Pixmap *)prop;
1649 }
1650
1651 return None;
1652} 1692}
1653 1693
1654#ifdef HAVE_BG_PIXMAP 1694#ifdef HAVE_BG_PIXMAP
1655# if TRACE_PIXMAPS
1656# undef update_background
1657void
1658rxvt_term::trace_update_background (const char *file, int line)
1659{
1660 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1661 update_background ();
1662}
1663# endif
1664 1695
1665void 1696void
1666rxvt_term::update_background () 1697rxvt_term::update_background ()
1667{ 1698{
1668 if (update_background_ev.is_active ()) 1699 if (update_background_ev.is_active ())
1669 return; 1700 return;
1670 1701
1671 bgPixmap.invalidate ();
1672
1673 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1702 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1674 1703
1675 if (to_wait <= 0.) 1704 if (to_wait <= 0.)
1676 bgPixmap.render (); 1705 bg_render ();
1677 else 1706 else
1678 update_background_ev.start (to_wait); 1707 update_background_ev.start (to_wait);
1679} 1708}
1680 1709
1681void 1710void
1682rxvt_term::update_background_cb (ev::timer &w, int revents) 1711rxvt_term::update_background_cb (ev::timer &w, int revents)
1683{ 1712{
1684 make_current (); 1713 make_current ();
1685 1714
1686 update_background_ev.stop (); 1715 update_background_ev.stop ();
1687 bgPixmap.render (); 1716 bg_render ();
1688 refresh_check (); 1717 refresh_check ();
1689} 1718}
1690 1719
1691#endif /* HAVE_BG_PIXMAP */ 1720#endif /* HAVE_BG_PIXMAP */
1692 1721

Diff Legend

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