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.262 by ayin, Wed Nov 21 09:15:33 2007 UTC vs.
Revision 1.386 by sf-exg, Sun Dec 30 11:52:15 2012 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45#include <termios.h>
45#endif
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 52#endif
54#endif
55 53
54struct termios rxvt_term::def_tio;
56vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
57 56
58// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
60 59
… …
95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
96{ 95{
97 compose_char *cc; 96 compose_char *cc;
98 97
99 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
100 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
101 cc = (*this)[c1]; 100 cc = (*this)[c1];
102 while (cc) 101 while (cc)
103 { 102 {
104 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
105 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
106 } 105 }
107 106
108 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
109 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
110 {
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 }
114 111
115 // allocate a new combination 112 // allocate a new combination
116 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
117 { 114 {
118 static int seen; 115 static int seen;
119 116
120 if (!seen++) 117 if (!seen++)
121 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
122 119
123 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
124 } 121 }
125 122
126 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
152 149
153} 150}
154#endif 151#endif
155 152
156rxvt_term::rxvt_term () 153rxvt_term::rxvt_term ()
157 : 154{
158#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb),
160#endif
161#if HAVE_BG_PIXMAP 155#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb), 156 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
163#endif
164#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb),
166#endif 157#endif
167#ifdef CURSOR_BLINK 158#ifdef CURSOR_BLINK
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 159 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
169#endif 160#endif
170#ifdef TEXT_BLINK 161#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb), 162 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
172#endif 163#endif
173#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 164#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 165 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
175#endif 166#endif
176#ifdef SELECTION_SCROLLING 167#ifdef SELECTION_SCROLLING
177 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
178#endif 169#endif
179#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
172#endif
173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
175#endif
176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
177#if USE_XIM
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 (this, &rxvt_term::pointer_cb), 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#endif 182#endif
188#ifndef NO_BELL 183#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 184 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 185#endif
191 termwin_ev (this, &rxvt_term::x_cb), 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 192
198 incr_ev (this, &rxvt_term::incr_cb)
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 194
202 termlist.push_back (this); 195 termlist.push_back (this);
203 196
204#ifdef KEYSYM_RESOURCE 197#ifdef KEYSYM_RESOURCE
… …
229 if (fontset[i] != fontset[0]) 222 if (fontset[i] != fontset[0])
230 delete fontset[i]; 223 delete fontset[i];
231#endif 224#endif
232 delete fontset[0]; 225 delete fontset[0];
233 226
227#ifdef HAVE_BG_PIXMAP
228 bg_destroy ();
229#endif
230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
234 if (display) 235 if (display)
235 { 236 {
236 selection_clear (); 237 selection_clear ();
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#ifdef XTERM_SCROLLBAR 243 scrollBar.destroy ();
242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
244#endif
245#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247#endif
248#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (dpy, blackGC);
250 if (whiteGC) XFreeGC (dpy, whiteGC);
251 if (grayGC) XFreeGC (dpy, grayGC);
252 if (darkGC) XFreeGC (dpy, darkGC);
253 if (stippleGC) XFreeGC (dpy, stippleGC);
254 if (dimple) XFreePixmap (dpy, dimple);
255 if (upArrow) XFreePixmap (dpy, upArrow);
256 if (downArrow) XFreePixmap (dpy, downArrow);
257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259#endif
260#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264#endif
265 if (gc) XFreeGC (dpy, gc); 244 if (gc) XFreeGC (dpy, gc);
266 245
267 delete drawable; 246 delete drawable;
268 // destroy all windows 247 // destroy all windows
269 if (parent[0]) 248 if (parent)
270 XDestroyWindow (dpy, parent[0]); 249 XDestroyWindow (dpy, parent);
271 250
272 for (int i = 0; i < TOTAL_COLORS; i++) 251 for (int i = 0; i < TOTAL_COLORS; i++)
273 if (ISSET_PIXCOLOR (i)) 252 if (ISSET_PIXCOLOR (i))
274 { 253 {
275 pix_colors_focused [i].free (this); 254 pix_colors_focused [i].free (this);
… …
277 pix_colors_unfocused [i].free (this); 256 pix_colors_unfocused [i].free (this);
278#endif 257#endif
279 } 258 }
280 259
281 clear (); 260 clear ();
282 }
283 261
284 delete [] pix_colors_focused; 262 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
292 displays.put (display); 263 displays.put (display);
264 }
293 265
294 scr_release (); 266 scr_release ();
295 267
296 /* clear all resources */ 268 /* clear all resources */
297 for (int i = 0; i < allocated.size (); i++) 269 for (int i = 0; i < allocated.size (); i++)
298 free (allocated [i]); 270 free (allocated [i]);
299 271
300 free (selection.text); 272 free (selection.text);
301 // TODO: manage env vars in child only(!) 273 free (selection.clip_text);
302 free (env_display);
303 free (env_term);
304 free (locale); 274 free (locale);
305 free (v_buffer); 275 free (v_buffer);
306 free (incr_buf); 276
277 delete selection_req;
307 278
308 delete envv; 279 delete envv;
309 delete argv; 280 delete argv;
310 281
311#ifdef KEYSYM_RESOURCE 282#ifdef KEYSYM_RESOURCE
312 delete keyboard; 283 delete keyboard;
313#endif 284#endif
285#ifndef NO_RESOURCES
286 XrmDestroyDatabase (option_db);
287#endif
314} 288}
315 289
316// child has exited, usually destroys 290// child has exited, usually destroys
317void 291void
318rxvt_term::child_cb (ev::child &w, int status) 292rxvt_term::child_cb (ev::child &w, int status)
… …
326} 300}
327 301
328void 302void
329rxvt_term::destroy () 303rxvt_term::destroy ()
330{ 304{
331 if (destroy_ev.active) 305 if (destroy_ev.is_active ())
332 return; 306 return;
333 307
334 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
335 309
336#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
… …
340 if (display) 314 if (display)
341 { 315 {
342#if USE_XIM 316#if USE_XIM
343 im_ev.stop (display); 317 im_ev.stop (display);
344#endif 318#endif
345#if HAVE_SCROLLBARS
346 scrollbar_ev.stop (display); 319 scrollbar_ev.stop (display);
347#endif 320#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
348#if ENABLE_TRANSPARENCY || ENABLE_PERL
349 rootwin_ev.stop (display); 321 rootwin_ev.stop (display);
350#endif 322#endif
351 incr_ev.stop ();
352 termwin_ev.stop (display); 323 termwin_ev.stop (display);
353 vt_ev.stop (display); 324 vt_ev.stop (display);
354 } 325 }
355 326
356 prepare_ev.stop (); 327 flush_ev.stop ();
357 pty_ev.stop (); 328 pty_ev.stop ();
358#ifdef CURSOR_BLINK 329#ifdef CURSOR_BLINK
359 cursor_blink_ev.stop (); 330 cursor_blink_ev.stop ();
360#endif 331#endif
361#ifdef TEXT_BLINK 332#ifdef TEXT_BLINK
… …
380 make_current (); 351 make_current ();
381 352
382 delete this; 353 delete this;
383} 354}
384 355
356void
357rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
358{
359 if (!opt)
360 return;
361
362 uint8_t mask = 1 << (opt & 7);
363 uint8_t &val = options [opt >> 3];
364
365 val = val & ~mask | (set ? mask : 0);
366}
367
385/*----------------------------------------------------------------------*/ 368/*----------------------------------------------------------------------*/
386/* 369/*
387 * Exit gracefully, clearing the utmp entry and restoring tty attributes 370 * Exit gracefully, clearing the utmp entry and restoring tty attributes
388 * TODO: if debugging, this should free up any known resources if we can
389 */ 371 */
390static XErrorHandler old_xerror_handler; 372static XErrorHandler old_xerror_handler;
391 373
392static void 374static void
393rxvt_emergency_cleanup () 375rxvt_emergency_cleanup ()
… …
395 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
396 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
397} 379}
398 380
399#if !ENABLE_MINIMAL 381#if !ENABLE_MINIMAL
400static void 382static void ecb_cold
401print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
402{ 384{
403 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
404 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
405 char number[32]; 387 char number[32];
406 char *mtype = "XlibMessage"; 388
407 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
408 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
409 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 389 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
390
391 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
392 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
393
394 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
395 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
410 rxvt_warn ("%s: %s\n", mesg, buffer); 396 rxvt_warn ("+ %s: %s\n", mesg, buffer);
397
411 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 398 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 399 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
413 sprintf(number, "%d", event->request_code); 400
414 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
415 rxvt_warn ("(which is %s)\n", buffer);
416 if (event->request_code >= 128) { 401 if (event->request_code >= 128)
417 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 402 {
418 mesg, BUFSIZ); 403#if 0
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 404 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
405 int nexts;
406 char **exts = XListExtensions (dpy, &nexts);
407
408 while (nexts)
409 {
410 char *extname = exts [nexts - 1];
411 int major, first_event, first_error;
412
413 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
414 {
415 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
416 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
417
418 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
419 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
420 rxvt_warn ("+ (which is %s)\n", buffer);
421
422 break;
423 }
424
425 printf ("nextss %d %s\n", nexts, extname);//D
426 --nexts;
427 ++exts;
428 }
429#else
430 int nexts = 0;
431 char **exts = 0;
432#endif
433
434 if (!nexts)
435 {
436 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
437
438 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
439 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
440
441#if 0
442 sprintf (number, "RENDER.%d", event->minor_code);
443 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
444 rxvt_warn ("+ (which is %s)\n", buffer);
445#endif
446 }
447
448 XFreeExtensionList (exts);
420 } 449 }
450 else
451 {
452 sprintf (number, "%d", event->request_code);
453 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
454 rxvt_warn ("+ (which is %s)\n", buffer);
455 }
456
421 if ((event->error_code == BadWindow) || 457 if (event->error_code == BadWindow
422 (event->error_code == BadPixmap) || 458 || event->error_code == BadPixmap
423 (event->error_code == BadCursor) || 459 || event->error_code == BadCursor
424 (event->error_code == BadFont) || 460 || event->error_code == BadFont
425 (event->error_code == BadDrawable) || 461 || event->error_code == BadDrawable
426 (event->error_code == BadColor) || 462 || event->error_code == BadColor
427 (event->error_code == BadGC) || 463 || event->error_code == BadGC
428 (event->error_code == BadIDChoice) || 464 || event->error_code == BadIDChoice
429 (event->error_code == BadValue) || 465 || event->error_code == BadValue
430 (event->error_code == BadAtom)) { 466 || event->error_code == BadAtom)
467 {
431 if (event->error_code == BadValue) 468 if (event->error_code == BadValue)
432 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 469 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
433 mesg, BUFSIZ);
434 else if (event->error_code == BadAtom) 470 else if (event->error_code == BadAtom)
435 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 471 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
436 mesg, BUFSIZ); 472 else
437 else
438 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 473 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
439 mesg, BUFSIZ);
440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
441 }
442 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
443 mesg, BUFSIZ);
444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
445}
446#endif
447 474
448int 475 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
476 }
477}
478#endif
479
480int ecb_cold
449rxvt_xerror_handler (Display *display, XErrorEvent *event) 481rxvt_xerror_handler (Display *display, XErrorEvent *event)
450{ 482{
451 if (GET_R->allowedxerror == -1) 483 if (GET_R->allowedxerror == -1)
452 GET_R->allowedxerror = event->error_code; 484 GET_R->allowedxerror = event->error_code;
453 else 485 else
… …
462 } 494 }
463 495
464 return 0; 496 return 0;
465} 497}
466 498
467int 499int ecb_cold
468rxvt_xioerror_handler (Display *display) 500rxvt_xioerror_handler (Display *display)
469{ 501{
470 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 502 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
471 DisplayString (display)); 503 DisplayString (display));
472 rxvt_emergency_cleanup (); 504 rxvt_emergency_cleanup ();
473 _exit (EXIT_FAILURE); 505 _exit (EXIT_FAILURE);
474} 506}
475 507
476/*----------------------------------------------------------------------*/
477bool
478rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
479{
480 this->envv = envv;
481
482 SET_R (this);
483 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
485
486 if (!init_vars ())
487 return false;
488
489 init_secondary ();
490
491 const char **cmd_argv = init_resources (argc, argv);
492
493#ifdef KEYSYM_RESOURCE
494 keyboard->register_done ();
495#endif
496
497#ifdef HAVE_SCROLLBARS
498 if (option (Opt_scrollBar))
499 scrollBar.setIdle (); /* set existence for size calculations */
500#endif
501
502 pty = ptytty::create ();
503
504 create_windows (argc, argv);
505
506 init_xlocale ();
507
508 scr_reset (); // initialize screen
509
510#if 0
511 XSynchronize (dpy, True);
512#endif
513
514#ifdef HAVE_SCROLLBARS
515 if (option (Opt_scrollBar))
516 resize_scrollbar (); /* create and map scrollbar */
517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent))
524 {
525 bgPixmap.set_transparent ();
526#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif
530 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]);
534
535 bgPixmap.set_root_pixmap ();
536 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root);
538 }
539#endif
540
541#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL)
543 {
544 const char *p = rs[Rs_backgroundPixmap];
545
546 if ((p = strchr (p, ';')) != NULL)
547 {
548 p++;
549 bgPixmap.set_geometry (p);
550 }
551 else
552 bgPixmap.set_defaultGeometry ();
553
554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
557 }
558#endif
559 }
560#endif
561
562#if ENABLE_PERL
563 rootwin_ev.start (display, display->root);
564#endif
565
566 set_colorfgbg ();
567
568 init_command (cmd_argv);
569
570 free (cmd_argv);
571
572 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ);
574
575 prepare_ev.start ();
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END));
578
579#if ENABLE_XEMBED
580 if (rs[Rs_embed])
581 {
582 long info[2] = { 0, XEMBED_MAPPED };
583
584 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
585 32, PropModeReplace, (unsigned char *)&info, 2);
586 }
587#endif
588
589 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]);
591
592 return true;
593}
594
595static struct sig_handlers 508static struct sig_handlers
596{ 509{
597 ev::sig sw_term, sw_int; 510 ev::sig sw_term, sw_int;
598 511
599 /* 512 /*
600 * Catch a fatal signal and tidy up before quitting 513 * Catch a fatal signal and tidy up before quitting
601 */ 514 */
602 void
603 sig_term (ev::sig &w, int revents) 515 void sig_term (ev::sig &w, int revents);
516
517 sig_handlers ()
604 { 518 {
605 rxvt_emergency_cleanup (); 519 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
606 w.stop ();
607 kill (getpid (), w.signum);
608 }
609
610 sig_handlers ()
611 : sw_term (this, &sig_handlers::sig_term),
612 sw_int (this, &sig_handlers::sig_term) 520 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
613 {
614 } 521 }
615} sig_handlers; 522} sig_handlers;
616 523
524void
525sig_handlers::sig_term (ev::sig &w, int revents)
526{
527 rxvt_emergency_cleanup ();
528 w.stop ();
529 kill (getpid (), w.signum);
530}
531
532static void
533rxvt_get_ttymode (struct termios *tio)
534{
535 if (tcgetattr (STDIN_FILENO, tio) < 0)
536 memset (tio, 0, sizeof (struct termios));
537
538 for (int i = 0; i < NCCS; i++)
539 tio->c_cc[i] = VDISABLE;
540
541 tio->c_cc[VINTR] = CINTR;
542 tio->c_cc[VQUIT] = CQUIT;
543 tio->c_cc[VERASE] = CERASE;
544#ifdef VERASE2
545 tio->c_cc[VERASE2] = CERASE2;
546#endif
547 tio->c_cc[VKILL] = CKILL;
548 tio->c_cc[VEOF] = CEOF;
549 tio->c_cc[VSTART] = CSTART;
550 tio->c_cc[VSTOP] = CSTOP;
551 tio->c_cc[VSUSP] = CSUSP;
552# ifdef VDSUSP
553 tio->c_cc[VDSUSP] = CDSUSP;
554# endif
555# ifdef VREPRINT
556 tio->c_cc[VREPRINT] = CRPRNT;
557# endif
558# ifdef VDISCRD
559 tio->c_cc[VDISCRD] = CFLUSH;
560# endif
561# ifdef VWERSE
562 tio->c_cc[VWERSE] = CWERASE;
563# endif
564# ifdef VLNEXT
565 tio->c_cc[VLNEXT] = CLNEXT;
566# endif
567# ifdef VSTATUS
568 tio->c_cc[VSTATUS] = CSTATUS;
569# endif
570
571# if VMIN != VEOF
572 tio->c_cc[VMIN] = 1;
573# endif
574# if VTIME != VEOL
575 tio->c_cc[VTIME] = 0;
576# endif
577
578 /* input modes */
579 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
580# ifdef IMAXBEL
581 | IMAXBEL
582# endif
583 | IXON);
584
585 /* output modes */
586 tio->c_oflag = (OPOST | ONLCR);
587
588 /* control modes */
589 tio->c_cflag = (CS8 | CREAD);
590
591 /* local modes */
592 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
593# if defined (ECHOCTL) && defined (ECHOKE)
594 | ECHOCTL | ECHOKE
595# endif
596 | ECHOE | ECHOK);
597}
598
617char **rxvt_environ; // startup environment 599char **rxvt_environ; // startup environment
618 600
619void 601void
620rxvt_init () 602rxvt_init ()
621{ 603{
622 ptytty::init (); 604 assert (("fontMask must not overlap other RS masks",
605 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
623 606
607 rxvt_get_ttymode (&rxvt_term::def_tio);
608
609 // get rid of stdin/stdout as we don't need them, to free resources
610 dup2 (STDERR_FILENO, STDIN_FILENO);
611 dup2 (STDERR_FILENO, STDOUT_FILENO);
612
624 if (!ev::ev_default_loop (0)) 613 if (!ev_default_loop ())
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 614 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626 615
627 rxvt_environ = environ; 616 rxvt_environ = environ;
628 617
629 signal (SIGHUP, SIG_IGN); 618 signal (SIGHUP, SIG_IGN);
630 signal (SIGPIPE, SIG_IGN); 619 signal (SIGPIPE, SIG_IGN);
631 620
632 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 621 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
633 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 622 sig_handlers.sw_int.start (SIGINT); ev_unref ();
634
635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
636 /* signal (SIGURG, SIG_DFL); */
637 623
638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 624 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639 // TODO: handle this with exceptions and tolerate the memory loss 625 // TODO: handle this with exceptions and tolerate the memory loss
640 XSetIOErrorHandler (rxvt_xioerror_handler); 626 XSetIOErrorHandler (rxvt_xioerror_handler);
641 627
642 XrmInitialize (); 628 XrmInitialize ();
643}
644 629
645/* ------------------------------------------------------------------------- * 630#if HAVE_PIXBUF
646 * MEMORY ALLOCATION WRAPPERS * 631 g_type_init ();
647 * ------------------------------------------------------------------------- */ 632#endif
648void *
649rxvt_malloc (size_t size)
650{
651 void *p = malloc (size);
652
653 if (!p)
654 rxvt_fatal ("memory allocation failure. aborting.\n");
655
656 return p;
657}
658
659void *
660rxvt_calloc (size_t number, size_t size)
661{
662 void *p = calloc (number, size);
663
664 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n");
666
667 return p;
668}
669
670void *
671rxvt_realloc (void *ptr, size_t size)
672{
673 void *p = realloc (ptr, size);
674
675 if (!p)
676 rxvt_fatal ("memory allocation failure. aborting.\n");
677
678 return p;
679} 633}
680 634
681/*----------------------------------------------------------------------*/ 635/*----------------------------------------------------------------------*/
682/* 636/*
683 * window size/position calculations for XSizeHint and other storage. 637 * window size/position calculations for XSizeHint and other storage.
… …
685 */ 639 */
686void 640void
687rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 641rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
688{ 642{
689 short recalc_x, recalc_y; 643 short recalc_x, recalc_y;
690 int x, y, sb_w, flags; 644 int x, y, flags;
691 unsigned int w, h; 645 unsigned int w, h;
692 unsigned int max_width, max_height; 646 unsigned int max_width, max_height;
693 647
694 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 648 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
695 szHint.win_gravity = NorthWestGravity; 649 szHint.win_gravity = NorthWestGravity;
… …
705 if (rs[Rs_geometry]) 659 if (rs[Rs_geometry])
706 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 660 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
707 661
708 if (flags & WidthValue) 662 if (flags & WidthValue)
709 { 663 {
664 if (!w)
665 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
666
710 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 667 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
711 szHint.flags |= USSize; 668 szHint.flags |= USSize;
712 } 669 }
713 670
714 if (flags & HeightValue) 671 if (flags & HeightValue)
715 { 672 {
673 if (!h)
674 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
675
716 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 676 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
717 szHint.flags |= USSize; 677 szHint.flags |= USSize;
718 } 678 }
719 679
720 if (flags & XValue) 680 if (flags & XValue)
721 { 681 {
… …
752 max_width = MAX_COLS * fwidth; 712 max_width = MAX_COLS * fwidth;
753 max_height = MAX_ROWS * fheight; 713 max_height = MAX_ROWS * fheight;
754 714
755 szHint.base_width = szHint.base_height = 2 * int_bwidth; 715 szHint.base_width = szHint.base_height = 2 * int_bwidth;
756 716
757 sb_w = 0;
758 window_vt_x = window_vt_y = int_bwidth; 717 window_vt_x = window_vt_y = int_bwidth;
759 718
760 if (scrollBar.state) 719 if (scrollBar.state)
761 { 720 {
762 sb_w = scrollbar_TotalWidth (); 721 int sb_w = scrollBar.total_width ();
763 szHint.base_width += sb_w; 722 szHint.base_width += sb_w;
764 723
765 if (!option (Opt_scrollBar_right)) 724 if (!option (Opt_scrollBar_right))
766 window_vt_x += sb_w; 725 window_vt_x += sb_w;
767 } 726 }
… …
791 { 750 {
792 min_it (height, max_height); 751 min_it (height, max_height);
793 szHint.height = szHint.base_height + height; 752 szHint.height = szHint.base_height + height;
794 } 753 }
795 754
796 if (scrollBar.state && option (Opt_scrollBar_right))
797 window_sb_x = szHint.width - sb_w;
798
799 if (recalc_x) 755 if (recalc_x)
800 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 756 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
801 757
802 if (recalc_y) 758 if (recalc_y)
803 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 759 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
804 760
805 ncol = width / fwidth; 761 ncol = width / fwidth;
806 nrow = height / fheight; 762 nrow = height / fheight;
763
764 // When the size of the vt window is not a multiple of the cell
765 // size, i.e., when the wm does not honour our size hints, there are
766 // extra areas not covered by the terminal screen. Such gaps, when a
767 // bg pixmap is set, would have to be cleared manually to properly
768 // refresh the background. We take the simpler route and shrink the
769 // vt window so as to avoid creating gaps.
770 vt_width = ncol * fwidth;
771 vt_height = nrow * fheight;
807} 772}
808 773
809/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
810/* 775/*
811 * Tell the teletype handler what size the window is. 776 * Tell the teletype handler what size the window is.
… …
819 784
820 struct winsize ws; 785 struct winsize ws;
821 786
822 ws.ws_col = ncol; 787 ws.ws_col = ncol;
823 ws.ws_row = nrow; 788 ws.ws_row = nrow;
824 ws.ws_xpixel = width; 789 ws.ws_xpixel = vt_width;
825 ws.ws_ypixel = height; 790 ws.ws_ypixel = vt_height;
826 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 791 ioctl (pty->pty, TIOCSWINSZ, &ws);
827 792
828#if 0 793#if 0
829 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 794 // TIOCSWINSZ is supposed to do this automatically and correctly
830 if (cmd_pid) /* force through to the command */ 795 if (cmd_pid) /* force through to the command */
831 kill (-cmd_pid, SIGWINCH); 796 kill (-cmd_pid, SIGWINCH);
832#endif 797#endif
833} 798}
834 799
835/*----------------------------------------------------------------------*/ 800/*----------------------------------------------------------------------*/
836/* set_fonts () - load and set the various fonts 801/* load and set the various fonts */
837 *
838 * init = 1 - initialize
839 *
840 * fontname == FONT_UP - switch to bigger font
841 * fontname == FONT_DN - switch to smaller font
842 */
843bool 802bool
844rxvt_term::set_fonts () 803rxvt_term::set_fonts ()
845{ 804{
846 rxvt_fontset *fs = new rxvt_fontset (this); 805 rxvt_fontset *fs = new rxvt_fontset (this);
847 rxvt_fontprop prop; 806 rxvt_fontprop prop;
… …
861#endif 820#endif
862 821
863 delete fontset[0]; 822 delete fontset[0];
864 fontset[0] = fs; 823 fontset[0] = fs;
865 824
866 prop = (*fs)[1]->properties (); 825 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
867 prop.height += lineSpace; 826 prop.width = max (prop.width + letterSpace, 1);
868 827
869 fs->set_prop (prop, false); 828 fs->set_prop (prop, false);
870 829
871 fwidth = prop.width; 830 fwidth = prop.width;
872 fheight = prop.height; 831 fheight = prop.height + lineSpace;
873 fbase = prop.ascent; 832 fbase = prop.ascent;
874 833
875 for (int style = 1; style < 4; style++) 834 for (int style = 1; style < 4; style++)
876 { 835 {
877#if ENABLE_STYLES 836#if ENABLE_STYLES
… …
903#else 862#else
904 fontset[style] = fontset[0]; 863 fontset[style] = fontset[0];
905#endif 864#endif
906 } 865 }
907 866
908 if (parent[0]) 867 if (parent)
909 { 868 {
910 resize_all_windows (0, 0, 0); 869 resize_all_windows (0, 0, 0);
911 scr_remap_chars (); 870 scr_remap_chars ();
912 scr_touch (true); 871 scr_touch (true);
913 } 872 }
… …
916} 875}
917 876
918void 877void
919rxvt_term::set_string_property (Atom prop, const char *str, int len) 878rxvt_term::set_string_property (Atom prop, const char *str, int len)
920{ 879{
921 XChangeProperty (dpy, parent[0], 880 XChangeProperty (dpy, parent,
922 prop, XA_STRING, 8, PropModeReplace, 881 prop, XA_STRING, 8, PropModeReplace,
923 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 882 (const unsigned char *)str, len >= 0 ? len : strlen (str));
924} 883}
925 884
926void 885void
886rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
887{
888 XTextProperty ct;
889
890 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
891 {
892 XSetTextProperty (dpy, parent, &ct, prop);
893 XFree (ct.value);
894 }
895}
896
897void
927rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 898rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
928{ 899{
929 wchar_t *ws = rxvt_mbstowcs (str, len); 900 wchar_t *ws = rxvt_mbstowcs (str, len);
930 char *s = rxvt_wcstoutf8 (ws); 901 char *s = rxvt_wcstoutf8 (ws);
931 902
932 XChangeProperty (dpy, parent[0], 903 XChangeProperty (dpy, parent,
933 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 904 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
934 (const unsigned char *)s, strlen (s)); 905 (const unsigned char *)s, strlen (s));
935 906
936 free (s); 907 free (s);
937 free (ws); 908 free (ws);
… …
941/*----------------------------------------------------------------------*/ 912/*----------------------------------------------------------------------*/
942/* xterm sequences - title, iconName, color (exptl) */ 913/* xterm sequences - title, iconName, color (exptl) */
943void 914void
944rxvt_term::set_title (const char *str) 915rxvt_term::set_title (const char *str)
945{ 916{
946 set_string_property (XA_WM_NAME, str); 917 set_mbstring_property (XA_WM_NAME, str);
947#if ENABLE_EWMH 918#if ENABLE_EWMH
948 set_utf8_property (xa[XA_NET_WM_NAME], str); 919 set_utf8_property (xa[XA_NET_WM_NAME], str);
949#endif 920#endif
950} 921}
951 922
952void 923void
953rxvt_term::set_icon_name (const char *str) 924rxvt_term::set_icon_name (const char *str)
954{ 925{
955 set_string_property (XA_WM_ICON_NAME, str); 926 set_mbstring_property (XA_WM_ICON_NAME, str);
956#if ENABLE_EWMH 927#if ENABLE_EWMH
957 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 928 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
958#endif 929#endif
959} 930}
960 931
961void 932void
962rxvt_term::set_window_color (int idx, const char *color) 933rxvt_term::set_window_color (int idx, const char *color)
963{ 934{
964#ifdef XTERM_COLOR_CHANGE 935#ifdef XTERM_COLOR_CHANGE
965 rxvt_color xcol; 936 rxvt_color xcol;
966 int i;
967 937
968 if (color == NULL || *color == '\0') 938 if (color == NULL || *color == '\0')
969 return; 939 return;
970 940
971 color = strdup (color); 941 color = strdup (color);
… …
973 rs[Rs_color + idx] = color; 943 rs[Rs_color + idx] = color;
974 944
975 /* handle color aliases */ 945 /* handle color aliases */
976 if (isdigit (*color)) 946 if (isdigit (*color))
977 { 947 {
978 i = atoi (color); 948 int i = atoi (color);
979 949
980 if (i >= 8 && i <= 15) 950 if (i >= 8 && i <= 15)
951 {
981 { /* bright colors */ 952 /* bright colors */
982 i -= 8;
983 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 953 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
984 goto done; 954 goto done;
985 } 955 }
986 956
987 if (i >= 0 && i <= 7) 957 if (i >= 0 && i <= 7)
958 {
988 { /* normal colors */ 959 /* normal colors */
989 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 960 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
990 goto done; 961 goto done;
991 } 962 }
992 } 963 }
993 964
… …
998 * so just keep gobbling up the colormap 969 * so just keep gobbling up the colormap
999 */ 970 */
1000 971
1001 pix_colors_focused[idx] = xcol; 972 pix_colors_focused[idx] = xcol;
1002 973
1003 /* XSetWindowAttributes attr; */
1004 /* Cursor cursor; */
1005done: 974done:
1006 /*TODO: handle Color_BD, scrollbar background, etc. */ 975 /*TODO: handle Color_BD, scrollbar background, etc. */
1007 976
1008 update_fade_color (idx); 977 update_fade_color (idx);
1009 recolour_cursor (); 978 recolour_cursor ();
… …
1029 998
1030/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
1031/* 1000/*
1032 * find if fg/bg matches any of the normal (low-intensity) colors 1001 * find if fg/bg matches any of the normal (low-intensity) colors
1033 */ 1002 */
1034void 1003char *
1035rxvt_term::set_colorfgbg () 1004rxvt_term::get_colorfgbg ()
1036{ 1005{
1037 unsigned int i; 1006 unsigned int i;
1038 const char *xpmb = "\0"; 1007 const char *xpmb = "";
1039 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1008 char fstr[] = "default";
1009 char bstr[] = "default";
1010 char *env_colorfgbg;
1040 1011
1041 strcpy (fstr, "default");
1042 strcpy (bstr, "default");
1043 for (i = Color_Black; i <= Color_White; i++) 1012 for (i = Color_Black; i <= Color_White; i++)
1044 if (pix_colors[Color_fg] == pix_colors[i]) 1013 if (pix_colors[Color_fg] == pix_colors[i])
1045 { 1014 {
1046 sprintf (fstr, "%d", (i - Color_Black)); 1015 sprintf (fstr, "%d", i - Color_Black);
1047 break; 1016 break;
1048 } 1017 }
1049 1018
1050 for (i = Color_Black; i <= Color_White; i++) 1019 for (i = Color_Black; i <= Color_White; i++)
1051 if (pix_colors[Color_bg] == pix_colors[i]) 1020 if (pix_colors[Color_bg] == pix_colors[i])
1052 { 1021 {
1053 sprintf (bstr, "%d", (i - Color_Black)); 1022 sprintf (bstr, "%d", i - Color_Black);
1054#ifdef BG_IMAGE_FROM_FILE 1023#if BG_IMAGE_FROM_FILE
1055 xpmb = "default;"; 1024 xpmb = "default;";
1056#endif 1025#endif
1057 break; 1026 break;
1058 } 1027 }
1059 1028
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1060 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1030 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1031 return env_colorfgbg;
1061} 1032}
1062 1033
1063/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
1064 1035
1065bool 1036bool
… …
1088 int old_width = szHint.width; 1059 int old_width = szHint.width;
1089 int old_height = szHint.height; 1060 int old_height = szHint.height;
1090 1061
1091 window_calc (newwidth, newheight); 1062 window_calc (newwidth, newheight);
1092 1063
1093 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1064 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1065
1066 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1067 if (set_hint)
1068 {
1069 szHint.flags &= ~(PBaseSize | PResizeInc);
1094 XSetWMNormalHints (dpy, parent[0], &szHint); 1070 XSetWMNormalHints (dpy, parent, &szHint);
1071 szHint.flags |= PBaseSize | PResizeInc;
1072 }
1095 1073
1096 if (!ignoreparent) 1074 if (!ignoreparent)
1097 { 1075 {
1098#ifdef SMART_RESIZE 1076#ifdef SMART_RESIZE
1099 /* 1077 /*
… …
1103 int x, y, x1, y1; 1081 int x, y, x1, y1;
1104 int dx, dy; 1082 int dx, dy;
1105 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1083 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1106 Window unused_cr; 1084 Window unused_cr;
1107 1085
1108 XTranslateCoordinates (dpy, parent[0], display->root, 1086 XTranslateCoordinates (dpy, parent, display->root,
1109 0, 0, &x, &y, &unused_cr); 1087 0, 0, &x, &y, &unused_cr);
1110 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1088 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1111 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1089 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1112 /* 1090 /*
1113 * if display->root isn't the parent window, a WM will probably have offset 1091 * if display->root isn't the parent window, a WM will probably have offset
1114 * our position for handles and decorations. Counter it 1092 * our position for handles and decorations. Counter it
1115 */ 1093 */
… …
1132 if (y < y1) /* top half */ 1110 if (y < y1) /* top half */
1133 dy = 0; 1111 dy = 0;
1134 else if (y == y1) /* exact center */ 1112 else if (y == y1) /* exact center */
1135 dy /= 2; 1113 dy /= 2;
1136 1114
1137 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1115 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1138 szHint.width, szHint.height); 1116 szHint.width, szHint.height);
1139#else 1117#else
1140 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1118 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1141#endif 1119#endif
1142 } 1120 }
1121
1122 if (set_hint)
1123 XSetWMNormalHints (dpy, parent, &szHint);
1143 1124
1144 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1125 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1145 1126
1146 if (fix_screen || newwidth != old_width || newheight != old_height) 1127 if (fix_screen || newwidth != old_width || newheight != old_height)
1147 { 1128 {
1148 if (scrollBar.state) 1129 if (scrollBar.state)
1149 { 1130 scrollBar.resize ();
1150 XMoveResizeWindow (dpy, scrollBar.win,
1151 window_sb_x, 0,
1152 scrollbar_TotalWidth (), szHint.height);
1153 resize_scrollbar ();
1154 }
1155 1131
1156 XMoveResizeWindow (dpy, vt, 1132 XMoveResizeWindow (dpy, vt,
1157 window_vt_x, window_vt_y, 1133 window_vt_x, window_vt_y,
1158 width, height); 1134 vt_width, vt_height);
1135
1136 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1159 1137
1160#ifdef HAVE_BG_PIXMAP 1138#ifdef HAVE_BG_PIXMAP
1161 if (bgPixmap.window_size_sensitive ()) 1139 if (bg_window_size_sensitive ())
1162 update_background (); 1140 update_background ();
1163#endif 1141#endif
1164
1165 scr_clear ();
1166 } 1142 }
1167 1143
1168 if (fix_screen || old_height == 0) 1144 if (fix_screen || old_height == 0)
1169 scr_reset (); 1145 scr_reset ();
1170 1146
1171 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1172 //scr_touch (false);
1173
1174#ifdef HAVE_BG_PIXMAP
1175// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1176// if (bgPixmap.pixmap)
1177// scr_touch (false);
1178#endif
1179
1180#ifdef USE_XIM 1147#if USE_XIM
1181 IMSetPosition (); 1148 im_set_position ();
1182#endif 1149#endif
1183} 1150}
1184 1151
1185/* 1152/*
1186 * Set the width/height of the vt window in characters. Units are pixels. 1153 * Set the width/height of the vt window in characters. Units are pixels.
… …
1199 newwidth = wattr.width - szHint.base_width; 1166 newwidth = wattr.width - szHint.base_width;
1200 if (newheight == 0) 1167 if (newheight == 0)
1201 newheight = wattr.height - szHint.base_height; 1168 newheight = wattr.height - szHint.base_height;
1202 } 1169 }
1203 1170
1204 if (newwidth != width || newheight != height) 1171 if (newwidth != vt_width || newheight != vt_height)
1205 { 1172 {
1206 newwidth += szHint.base_width; 1173 newwidth += szHint.base_width;
1207 newheight += szHint.base_height; 1174 newheight += szHint.base_height;
1208 resize_all_windows (newwidth, newheight, 0); 1175 resize_all_windows (newwidth, newheight, 0);
1209 } 1176 }
1210} 1177}
1211 1178
1212/* -------------------------------------------------------------------- * 1179/* -------------------------------------------------------------------- *
1213 * - X INPUT METHOD ROUTINES - * 1180 * - X INPUT METHOD ROUTINES - *
1214 * -------------------------------------------------------------------- */ 1181 * -------------------------------------------------------------------- */
1215#ifdef USE_XIM 1182#if USE_XIM
1216 1183
1217void 1184void
1218rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1185rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1219{ 1186{
1220 fg = pix_colors [Color_fg]; 1187 fg = pix_colors [Color_fg];
… …
1247 status_rect.height = fheight; 1214 status_rect.height = fheight;
1248} 1215}
1249 1216
1250/* Checking whether input method is running. */ 1217/* Checking whether input method is running. */
1251bool 1218bool
1252rxvt_term::IMisRunning () 1219rxvt_term::im_is_running ()
1253{ 1220{
1254 char *p;
1255 Atom atom; 1221 Atom atom;
1256 Window win; 1222 Window win;
1257 char server[IMBUFSIZ]; 1223 char server[IMBUFSIZ];
1258 1224
1259 /* get current locale modifier */ 1225 /* get current locale modifier */
1260 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1226 if (char *p = XSetLocaleModifiers (0))
1261 { 1227 {
1262 strcpy (server, "@server="); 1228 strcpy (server, "@server=");
1263 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1229 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1264 1230
1265 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1231 if (p = strchr (server + 1, '@')) /* first one only */
1266 *p = '\0'; 1232 *p = '\0';
1267 1233
1268 atom = XInternAtom (dpy, server, False); 1234 atom = XInternAtom (dpy, server, False);
1269 win = XGetSelectionOwner (dpy, atom); 1235 win = XGetSelectionOwner (dpy, atom);
1270 1236
1271 if (win != None) 1237 if (win != None)
1272 return True; 1238 return true;
1273 } 1239 }
1274 1240
1275 return False; 1241 return false;
1276} 1242}
1277 1243
1278void 1244void
1279rxvt_term::IMSendSpot () 1245rxvt_term::im_send_spot ()
1280{ 1246{
1281 XPoint nspot; 1247 XPoint nspot;
1282 XVaNestedList preedit_attr; 1248 XVaNestedList preedit_attr;
1283 1249
1284 if (!Input_Context 1250 if (!Input_Context
… …
1337 1303
1338 term->make_current (); 1304 term->make_current ();
1339 1305
1340 if (text) 1306 if (text)
1341 { 1307 {
1342 void *str; 1308 wchar_t *str;
1343 1309
1344 if (!text->encoding_is_wchar && text->string.multi_byte) 1310 if (!text->encoding_is_wchar && text->string.multi_byte)
1345 { 1311 {
1346 // of course, X makes it ugly again 1312 // of course, X makes it ugly again
1347 if (term->rs[Rs_imLocale]) 1313 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->rs[Rs_imLocale]); 1314 SET_LOCALE (term->rs[Rs_imLocale]);
1349 1315
1350 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1316 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1351 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1317 mbstowcs (str, text->string.multi_byte, text->length + 1);
1352 1318
1353 if (term->rs[Rs_imLocale]) 1319 if (term->rs[Rs_imLocale])
1354 SET_LOCALE (term->locale); 1320 SET_LOCALE (term->locale);
1355 } 1321 }
1356 else 1322 else
1357 str = (void *)text->string.wide_char; 1323 str = text->string.wide_char;
1358 1324
1359 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1325 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1360 DT_INT, call_data->caret, 1326 DT_INT, call_data->caret,
1361 DT_INT, call_data->chg_first, 1327 DT_INT, call_data->chg_first,
1362 DT_INT, call_data->chg_length, 1328 DT_INT, call_data->chg_length,
… …
1390/* 1356/*
1391 * Try to open a XIM with the current modifiers, then see if we can 1357 * Try to open a XIM with the current modifiers, then see if we can
1392 * open a suitable preedit type 1358 * open a suitable preedit type
1393 */ 1359 */
1394bool 1360bool
1395rxvt_term::IM_get_IC (const char *modifiers) 1361rxvt_term::im_get_ic (const char *modifiers)
1396{ 1362{
1397 int i, j, found; 1363 int i, j, found;
1398 XIM xim; 1364 XIM xim;
1399 XPoint spot; 1365 XPoint spot;
1400 XRectangle rect, status_rect, needed_rect; 1366 XRectangle rect, status_rect, needed_rect;
1401 unsigned long fg, bg; 1367 unsigned long fg, bg;
1402 const char *p; 1368 const char *p;
1403 char **s; 1369 char **s;
1404 XIMStyles *xim_styles; 1370 XIMStyles *xim_styles;
1405#ifdef ENABLE_XIM_ONTHESPOT
1406 XIMCallback xcb[4];
1407#endif
1408 1371
1409 set_environ (envv); 1372 set_environ (envv);
1410 1373
1411 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1374 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1412 return false; 1375 return false;
… …
1433 p = pet[pi]; 1396 p = pet[pi];
1434 1397
1435 if (!p) 1398 if (!p)
1436 continue; 1399 continue;
1437 1400
1438 s = rxvt_splitcommastring (p); 1401 s = rxvt_strsplit (',', p);
1439 1402
1440 for (i = found = 0; !found && s[i]; i++) 1403 for (i = found = 0; !found && s[i]; i++)
1441 { 1404 {
1442 if (!strcmp (s[i], "OverTheSpot")) 1405 if (!strcmp (s[i], "OverTheSpot"))
1443 input_style = XIMPreeditPosition | XIMStatusNothing; 1406 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1455 input_style = XIMPreeditNothing | XIMStatusNothing; 1418 input_style = XIMPreeditNothing | XIMStatusNothing;
1456 1419
1457 for (j = 0; j < xim_styles->count_styles; j++) 1420 for (j = 0; j < xim_styles->count_styles; j++)
1458 if (input_style == xim_styles->supported_styles[j]) 1421 if (input_style == xim_styles->supported_styles[j])
1459 { 1422 {
1460 rxvt_freecommastring (s); 1423 rxvt_free_strsplit (s);
1461 1424
1462 found = 1; 1425 found = 1;
1463 goto foundpet; 1426 goto foundpet;
1464 } 1427 }
1465 1428
1466 } 1429 }
1467 1430
1468 rxvt_freecommastring (s); 1431 rxvt_free_strsplit (s);
1469 } 1432 }
1470 1433
1471foundpet: 1434foundpet:
1472 1435
1473 XFree (xim_styles); 1436 XFree (xim_styles);
… …
1552 NULL); 1515 NULL);
1553 } 1516 }
1554#if ENABLE_XIM_ONTHESPOT 1517#if ENABLE_XIM_ONTHESPOT
1555 else if (input_style & XIMPreeditCallbacks) 1518 else if (input_style & XIMPreeditCallbacks)
1556 { 1519 {
1520 XIMCallback xcb[4];
1521
1557 im_set_position (spot); 1522 im_set_position (spot);
1558 1523
1559 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1524 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1560 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1525 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1561 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1526 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1576#endif 1541#endif
1577 1542
1578 Input_Context = XCreateIC (xim, 1543 Input_Context = XCreateIC (xim,
1579 XNInputStyle, input_style, 1544 XNInputStyle, input_style,
1580 XNClientWindow, vt, 1545 XNClientWindow, vt,
1581 XNFocusWindow, parent[0], 1546 XNFocusWindow, parent,
1582 preedit_attr ? XNPreeditAttributes : NULL, 1547 preedit_attr ? XNPreeditAttributes : NULL,
1583 preedit_attr, 1548 preedit_attr,
1584 status_attr ? XNStatusAttributes : NULL, 1549 status_attr ? XNStatusAttributes : NULL,
1585 status_attr, NULL); 1550 status_attr, NULL);
1586 1551
… …
1599 // unfortunately, only the focus window is used by XIM, hard to fix 1564 // unfortunately, only the focus window is used by XIM, hard to fix
1600 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1565 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1601 vt_select_input (); 1566 vt_select_input ();
1602#endif 1567#endif
1603 1568
1604 IMSetPosition (); 1569 im_set_position ();
1605 1570
1606 return true; 1571 return true;
1607} 1572}
1608 1573
1609void 1574void
… …
1619 im_destroy (); 1584 im_destroy ();
1620 1585
1621 if (Input_Context) 1586 if (Input_Context)
1622 return; 1587 return;
1623 1588
1624#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1625 if (rs[Rs_imLocale]) 1589 if (rs[Rs_imLocale])
1626 SET_LOCALE (rs[Rs_imLocale]); 1590 SET_LOCALE (rs[Rs_imLocale]);
1627#endif
1628 1591
1629 p = rs[Rs_inputMethod]; 1592 p = rs[Rs_inputMethod];
1630 if (p && *p) 1593 if (p && *p)
1631 { 1594 {
1632 bool found = false; 1595 bool found = false;
1633 1596
1634 s = rxvt_splitcommastring (p); 1597 s = rxvt_strsplit (',', p);
1635 1598
1636 for (i = 0; s[i]; i++) 1599 for (i = 0; s[i]; i++)
1637 { 1600 {
1638 if (*s[i]) 1601 if (*s[i])
1639 { 1602 {
1640 strcpy (buf, "@im="); 1603 strcpy (buf, "@im=");
1641 strncat (buf, s[i], IMBUFSIZ - 5); 1604 strncat (buf, s[i], IMBUFSIZ - 5);
1642 if (IM_get_IC (buf)) 1605 if (im_get_ic (buf))
1643 { 1606 {
1644 found = true; 1607 found = true;
1645 break; 1608 break;
1646 } 1609 }
1647 } 1610 }
1648 } 1611 }
1649 1612
1650 rxvt_freecommastring (s); 1613 rxvt_free_strsplit (s);
1651 1614
1652 if (found) 1615 if (found)
1653 goto done; 1616 goto done;
1654 } 1617 }
1655 1618
1656 /* try with XMODIFIERS env. var. */ 1619 /* try with XMODIFIERS env. var. */
1657 if (IM_get_IC ("")) 1620 if (im_get_ic (""))
1658 goto done; 1621 goto done;
1659 1622
1660 /* try with no modifiers base IF the user didn't specify an IM */ 1623 /* try with no modifiers base IF the user didn't specify an IM */
1661 if (IM_get_IC ("@im=none")) 1624 if (im_get_ic ("@im=none"))
1662 goto done; 1625 goto done;
1663 1626
1664done: 1627done:
1665#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1666 if (rs[Rs_imLocale]) 1628 if (rs[Rs_imLocale])
1667 SET_LOCALE (locale); 1629 SET_LOCALE (locale);
1668#endif
1669} 1630}
1670 1631
1671void 1632void
1672rxvt_term::IMSetPosition () 1633rxvt_term::im_set_position ()
1673{ 1634{
1674 XRectangle preedit_rect, status_rect, *needed_rect; 1635 XRectangle preedit_rect, status_rect, *needed_rect;
1675 XVaNestedList preedit_attr, status_attr; 1636 XVaNestedList preedit_attr, status_attr;
1676 1637
1677 if (!Input_Context 1638 if (!Input_Context
1678 || !focus 1639 || !focus
1679 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1640 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1680 || !IMisRunning ()) 1641 || !im_is_running ())
1681 return; 1642 return;
1682 1643
1683 if (input_style & XIMPreeditPosition) 1644 if (input_style & XIMPreeditPosition)
1684 { 1645 {
1685 im_set_size (preedit_rect); 1646 im_set_size (preedit_rect);
… …
1715 1676
1716void 1677void
1717rxvt_term::get_window_origin (int &x, int &y) 1678rxvt_term::get_window_origin (int &x, int &y)
1718{ 1679{
1719 Window cr; 1680 Window cr;
1720 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1681 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1721/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1722}
1723
1724Pixmap
1725rxvt_term::get_pixmap_property (int prop_id)
1726{
1727 if (prop_id > 0 && prop_id < NUM_XA)
1728 if (xa[prop_id])
1729 {
1730 int aformat;
1731 unsigned long nitems, bytes_after;
1732 Atom atype;
1733 unsigned char *prop = NULL;
1734 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1735 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1736 &nitems, &bytes_after, &prop);
1737 if (result == Success && prop && atype == XA_PIXMAP)
1738 {
1739 return *(Pixmap *)prop;
1740 }
1741 }
1742 return None;
1743} 1682}
1744 1683
1745#ifdef HAVE_BG_PIXMAP 1684#ifdef HAVE_BG_PIXMAP
1746# if TRACE_PIXMAPS 1685
1747# undef update_background 1686void
1748int rxvt_term::trace_update_background (const char* file, int line)
1749{
1750 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1751 update_background ();
1752}
1753# endif
1754int
1755rxvt_term::update_background () 1687rxvt_term::update_background ()
1756{ 1688{
1757 bgPixmap.invalidate (); 1689 if (update_background_ev.is_active ())
1690 return;
1758 1691
1759 /* no chance of real time refresh if we are blurring! */ 1692 bg_flags &= BG_INHIBIT_RENDER;
1760 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1693
1694 if (!mapped)
1695 return;
1696
1697 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1698
1699 if (to_wait <= 0.)
1761 bgPixmap.render (); 1700 bg_render ();
1762 else 1701 else
1763 {
1764 update_background_ev.stop ();
1765
1766 if (!bgPixmap.need_client_side_rendering())
1767 update_background_ev.start (.05); 1702 update_background_ev.start (to_wait);
1768 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1769 update_background_ev.start (.20); /* very slow !!! */
1770 else
1771 update_background_ev.start (.07);
1772 }
1773
1774 return 0;
1775} 1703}
1776 1704
1777void 1705void
1778rxvt_term::update_background_cb (ev::timer &w, int revents) 1706rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{ 1707{
1708 make_current ();
1709
1710 update_background_ev.stop ();
1780 bgPixmap.render (); 1711 bg_render ();
1712 refresh_check ();
1781} 1713}
1782 1714
1783#endif /* HAVE_BG_PIXMAP */ 1715#endif /* HAVE_BG_PIXMAP */
1784 1716
1785/*----------------------- end-of-file (C source) -----------------------*/ 1717/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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