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.384 by sf-exg, Sat Dec 29 14:23:35 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
234 if (display) 231 if (display)
235 { 232 {
236 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
237 235
238#ifdef USE_XIM 236#if USE_XIM
239 im_destroy (); 237 im_destroy ();
240#endif 238#endif
241#ifdef XTERM_SCROLLBAR 239 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); 240 if (gc) XFreeGC (dpy, gc);
266 241
267 delete drawable; 242 delete drawable;
268 // destroy all windows 243 // destroy all windows
269 if (parent[0]) 244 if (parent)
270 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
271 246
272 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
273 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
274 { 249 {
275 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
277 pix_colors_unfocused [i].free (this); 252 pix_colors_unfocused [i].free (this);
278#endif 253#endif
279 } 254 }
280 255
281 clear (); 256 clear ();
282 }
283 257
284 delete [] pix_colors_focused; 258 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); 259 displays.put (display);
260 }
293 261
294 scr_release (); 262 scr_release ();
295 263
296 /* clear all resources */ 264 /* clear all resources */
297 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
298 free (allocated [i]); 266 free (allocated [i]);
299 267
300 free (selection.text); 268 free (selection.text);
301 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
302 free (env_display);
303 free (env_term);
304 free (locale); 270 free (locale);
305 free (v_buffer); 271 free (v_buffer);
306 free (incr_buf); 272
273 delete selection_req;
307 274
308 delete envv; 275 delete envv;
309 delete argv; 276 delete argv;
310 277
311#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
312 delete keyboard; 279 delete keyboard;
313#endif 280#endif
281#ifndef NO_RESOURCES
282 XrmDestroyDatabase (option_db);
283#endif
314} 284}
315 285
316// child has exited, usually destroys 286// child has exited, usually destroys
317void 287void
318rxvt_term::child_cb (ev::child &w, int status) 288rxvt_term::child_cb (ev::child &w, int status)
… …
326} 296}
327 297
328void 298void
329rxvt_term::destroy () 299rxvt_term::destroy ()
330{ 300{
331 if (destroy_ev.active) 301 if (destroy_ev.is_active ())
332 return; 302 return;
333 303
334 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 304 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
335 305
336#if ENABLE_OVERLAY 306#if ENABLE_OVERLAY
… …
340 if (display) 310 if (display)
341 { 311 {
342#if USE_XIM 312#if USE_XIM
343 im_ev.stop (display); 313 im_ev.stop (display);
344#endif 314#endif
345#if HAVE_SCROLLBARS
346 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
347#endif 316#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
348#if ENABLE_TRANSPARENCY || ENABLE_PERL
349 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
350#endif 318#endif
351 incr_ev.stop ();
352 termwin_ev.stop (display); 319 termwin_ev.stop (display);
353 vt_ev.stop (display); 320 vt_ev.stop (display);
354 } 321 }
355 322
356 prepare_ev.stop (); 323 flush_ev.stop ();
357 pty_ev.stop (); 324 pty_ev.stop ();
358#ifdef CURSOR_BLINK 325#ifdef CURSOR_BLINK
359 cursor_blink_ev.stop (); 326 cursor_blink_ev.stop ();
360#endif 327#endif
361#ifdef TEXT_BLINK 328#ifdef TEXT_BLINK
… …
380 make_current (); 347 make_current ();
381 348
382 delete this; 349 delete this;
383} 350}
384 351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
362}
363
385/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
386/* 365/*
387 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * 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 */ 367 */
390static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
391 369
392static void 370static void
393rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
395 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
396 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
397} 375}
398 376
399#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
400static void 378static void ecb_cold
401print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
402{ 380{
403 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
404 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
405 char number[32]; 383 char number[32];
406 char *mtype = "XlibMessage"; 384
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"); 385 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386
387 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389
390 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
410 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
411 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
413 sprintf(number, "%d", event->request_code); 396
414 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
415 rxvt_warn ("(which is %s)\n", buffer);
416 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
417 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 {
418 mesg, BUFSIZ); 399#if 0
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
401 int nexts;
402 char **exts = XListExtensions (dpy, &nexts);
403
404 while (nexts)
405 {
406 char *extname = exts [nexts - 1];
407 int major, first_event, first_error;
408
409 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
410 {
411 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
412 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
413
414 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
415 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
416 rxvt_warn ("+ (which is %s)\n", buffer);
417
418 break;
419 }
420
421 printf ("nextss %d %s\n", nexts, extname);//D
422 --nexts;
423 ++exts;
424 }
425#else
426 int nexts = 0;
427 char **exts = 0;
428#endif
429
430 if (!nexts)
431 {
432 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
433
434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
435 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
436
437#if 0
438 sprintf (number, "RENDER.%d", event->minor_code);
439 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
440 rxvt_warn ("+ (which is %s)\n", buffer);
441#endif
442 }
443
444 XFreeExtensionList (exts);
420 } 445 }
446 else
447 {
448 sprintf (number, "%d", event->request_code);
449 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
450 rxvt_warn ("+ (which is %s)\n", buffer);
451 }
452
421 if ((event->error_code == BadWindow) || 453 if (event->error_code == BadWindow
422 (event->error_code == BadPixmap) || 454 || event->error_code == BadPixmap
423 (event->error_code == BadCursor) || 455 || event->error_code == BadCursor
424 (event->error_code == BadFont) || 456 || event->error_code == BadFont
425 (event->error_code == BadDrawable) || 457 || event->error_code == BadDrawable
426 (event->error_code == BadColor) || 458 || event->error_code == BadColor
427 (event->error_code == BadGC) || 459 || event->error_code == BadGC
428 (event->error_code == BadIDChoice) || 460 || event->error_code == BadIDChoice
429 (event->error_code == BadValue) || 461 || event->error_code == BadValue
430 (event->error_code == BadAtom)) { 462 || event->error_code == BadAtom)
463 {
431 if (event->error_code == BadValue) 464 if (event->error_code == BadValue)
432 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
433 mesg, BUFSIZ);
434 else if (event->error_code == BadAtom) 466 else if (event->error_code == BadAtom)
435 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 467 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
436 mesg, BUFSIZ); 468 else
437 else
438 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 469 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 470
448int 471 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
472 }
473}
474#endif
475
476int ecb_cold
449rxvt_xerror_handler (Display *display, XErrorEvent *event) 477rxvt_xerror_handler (Display *display, XErrorEvent *event)
450{ 478{
451 if (GET_R->allowedxerror == -1) 479 if (GET_R->allowedxerror == -1)
452 GET_R->allowedxerror = event->error_code; 480 GET_R->allowedxerror = event->error_code;
453 else 481 else
… …
462 } 490 }
463 491
464 return 0; 492 return 0;
465} 493}
466 494
467int 495int ecb_cold
468rxvt_xioerror_handler (Display *display) 496rxvt_xioerror_handler (Display *display)
469{ 497{
470 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 498 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
471 DisplayString (display)); 499 DisplayString (display));
472 rxvt_emergency_cleanup (); 500 rxvt_emergency_cleanup ();
473 _exit (EXIT_FAILURE); 501 _exit (EXIT_FAILURE);
474} 502}
475 503
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 504static struct sig_handlers
596{ 505{
597 ev::sig sw_term, sw_int; 506 ev::sig sw_term, sw_int;
598 507
599 /* 508 /*
600 * Catch a fatal signal and tidy up before quitting 509 * Catch a fatal signal and tidy up before quitting
601 */ 510 */
602 void
603 sig_term (ev::sig &w, int revents) 511 void sig_term (ev::sig &w, int revents);
512
513 sig_handlers ()
604 { 514 {
605 rxvt_emergency_cleanup (); 515 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) 516 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
613 {
614 } 517 }
615} sig_handlers; 518} sig_handlers;
616 519
520void
521sig_handlers::sig_term (ev::sig &w, int revents)
522{
523 rxvt_emergency_cleanup ();
524 w.stop ();
525 kill (getpid (), w.signum);
526}
527
528static void
529rxvt_get_ttymode (struct termios *tio)
530{
531 if (tcgetattr (STDIN_FILENO, tio) < 0)
532 memset (tio, 0, sizeof (struct termios));
533
534 for (int i = 0; i < NCCS; i++)
535 tio->c_cc[i] = VDISABLE;
536
537 tio->c_cc[VINTR] = CINTR;
538 tio->c_cc[VQUIT] = CQUIT;
539 tio->c_cc[VERASE] = CERASE;
540#ifdef VERASE2
541 tio->c_cc[VERASE2] = CERASE2;
542#endif
543 tio->c_cc[VKILL] = CKILL;
544 tio->c_cc[VEOF] = CEOF;
545 tio->c_cc[VSTART] = CSTART;
546 tio->c_cc[VSTOP] = CSTOP;
547 tio->c_cc[VSUSP] = CSUSP;
548# ifdef VDSUSP
549 tio->c_cc[VDSUSP] = CDSUSP;
550# endif
551# ifdef VREPRINT
552 tio->c_cc[VREPRINT] = CRPRNT;
553# endif
554# ifdef VDISCRD
555 tio->c_cc[VDISCRD] = CFLUSH;
556# endif
557# ifdef VWERSE
558 tio->c_cc[VWERSE] = CWERASE;
559# endif
560# ifdef VLNEXT
561 tio->c_cc[VLNEXT] = CLNEXT;
562# endif
563# ifdef VSTATUS
564 tio->c_cc[VSTATUS] = CSTATUS;
565# endif
566
567# if VMIN != VEOF
568 tio->c_cc[VMIN] = 1;
569# endif
570# if VTIME != VEOL
571 tio->c_cc[VTIME] = 0;
572# endif
573
574 /* input modes */
575 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
576# ifdef IMAXBEL
577 | IMAXBEL
578# endif
579 | IXON);
580
581 /* output modes */
582 tio->c_oflag = (OPOST | ONLCR);
583
584 /* control modes */
585 tio->c_cflag = (CS8 | CREAD);
586
587 /* local modes */
588 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
589# if defined (ECHOCTL) && defined (ECHOKE)
590 | ECHOCTL | ECHOKE
591# endif
592 | ECHOE | ECHOK);
593}
594
617char **rxvt_environ; // startup environment 595char **rxvt_environ; // startup environment
618 596
619void 597void
620rxvt_init () 598rxvt_init ()
621{ 599{
622 ptytty::init (); 600 assert (("fontMask must not overlap other RS masks",
601 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
623 602
603 rxvt_get_ttymode (&rxvt_term::def_tio);
604
605 // get rid of stdin/stdout as we don't need them, to free resources
606 dup2 (STDERR_FILENO, STDIN_FILENO);
607 dup2 (STDERR_FILENO, STDOUT_FILENO);
608
624 if (!ev::ev_default_loop (0)) 609 if (!ev_default_loop ())
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 610 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626 611
627 rxvt_environ = environ; 612 rxvt_environ = environ;
628 613
629 signal (SIGHUP, SIG_IGN); 614 signal (SIGHUP, SIG_IGN);
630 signal (SIGPIPE, SIG_IGN); 615 signal (SIGPIPE, SIG_IGN);
631 616
632 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 617 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
633 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 618 sig_handlers.sw_int.start (SIGINT); ev_unref ();
634
635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
636 /* signal (SIGURG, SIG_DFL); */
637 619
638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 620 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639 // TODO: handle this with exceptions and tolerate the memory loss 621 // TODO: handle this with exceptions and tolerate the memory loss
640 XSetIOErrorHandler (rxvt_xioerror_handler); 622 XSetIOErrorHandler (rxvt_xioerror_handler);
641 623
642 XrmInitialize (); 624 XrmInitialize ();
643}
644 625
645/* ------------------------------------------------------------------------- * 626#if HAVE_PIXBUF
646 * MEMORY ALLOCATION WRAPPERS * 627 g_type_init ();
647 * ------------------------------------------------------------------------- */ 628#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} 629}
680 630
681/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
682/* 632/*
683 * window size/position calculations for XSizeHint and other storage. 633 * window size/position calculations for XSizeHint and other storage.
… …
685 */ 635 */
686void 636void
687rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 637rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
688{ 638{
689 short recalc_x, recalc_y; 639 short recalc_x, recalc_y;
690 int x, y, sb_w, flags; 640 int x, y, flags;
691 unsigned int w, h; 641 unsigned int w, h;
692 unsigned int max_width, max_height; 642 unsigned int max_width, max_height;
693 643
694 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 644 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
695 szHint.win_gravity = NorthWestGravity; 645 szHint.win_gravity = NorthWestGravity;
… …
705 if (rs[Rs_geometry]) 655 if (rs[Rs_geometry])
706 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 656 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
707 657
708 if (flags & WidthValue) 658 if (flags & WidthValue)
709 { 659 {
660 if (!w)
661 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
662
710 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 663 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
711 szHint.flags |= USSize; 664 szHint.flags |= USSize;
712 } 665 }
713 666
714 if (flags & HeightValue) 667 if (flags & HeightValue)
715 { 668 {
669 if (!h)
670 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
671
716 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 672 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
717 szHint.flags |= USSize; 673 szHint.flags |= USSize;
718 } 674 }
719 675
720 if (flags & XValue) 676 if (flags & XValue)
721 { 677 {
… …
752 max_width = MAX_COLS * fwidth; 708 max_width = MAX_COLS * fwidth;
753 max_height = MAX_ROWS * fheight; 709 max_height = MAX_ROWS * fheight;
754 710
755 szHint.base_width = szHint.base_height = 2 * int_bwidth; 711 szHint.base_width = szHint.base_height = 2 * int_bwidth;
756 712
757 sb_w = 0;
758 window_vt_x = window_vt_y = int_bwidth; 713 window_vt_x = window_vt_y = int_bwidth;
759 714
760 if (scrollBar.state) 715 if (scrollBar.state)
761 { 716 {
762 sb_w = scrollbar_TotalWidth (); 717 int sb_w = scrollBar.total_width ();
763 szHint.base_width += sb_w; 718 szHint.base_width += sb_w;
764 719
765 if (!option (Opt_scrollBar_right)) 720 if (!option (Opt_scrollBar_right))
766 window_vt_x += sb_w; 721 window_vt_x += sb_w;
767 } 722 }
… …
791 { 746 {
792 min_it (height, max_height); 747 min_it (height, max_height);
793 szHint.height = szHint.base_height + height; 748 szHint.height = szHint.base_height + height;
794 } 749 }
795 750
796 if (scrollBar.state && option (Opt_scrollBar_right))
797 window_sb_x = szHint.width - sb_w;
798
799 if (recalc_x) 751 if (recalc_x)
800 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 752 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
801 753
802 if (recalc_y) 754 if (recalc_y)
803 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 755 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
804 756
805 ncol = width / fwidth; 757 ncol = width / fwidth;
806 nrow = height / fheight; 758 nrow = height / fheight;
759
760 // When the size of the vt window is not a multiple of the cell
761 // size, i.e., when the wm does not honour our size hints, there are
762 // extra areas not covered by the terminal screen. Such gaps, when a
763 // bg pixmap is set, would have to be cleared manually to properly
764 // refresh the background. We take the simpler route and shrink the
765 // vt window so as to avoid creating gaps.
766 vt_width = ncol * fwidth;
767 vt_height = nrow * fheight;
807} 768}
808 769
809/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
810/* 771/*
811 * Tell the teletype handler what size the window is. 772 * Tell the teletype handler what size the window is.
… …
819 780
820 struct winsize ws; 781 struct winsize ws;
821 782
822 ws.ws_col = ncol; 783 ws.ws_col = ncol;
823 ws.ws_row = nrow; 784 ws.ws_row = nrow;
824 ws.ws_xpixel = width; 785 ws.ws_xpixel = vt_width;
825 ws.ws_ypixel = height; 786 ws.ws_ypixel = vt_height;
826 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 787 ioctl (pty->pty, TIOCSWINSZ, &ws);
827 788
828#if 0 789#if 0
829 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 790 // TIOCSWINSZ is supposed to do this automatically and correctly
830 if (cmd_pid) /* force through to the command */ 791 if (cmd_pid) /* force through to the command */
831 kill (-cmd_pid, SIGWINCH); 792 kill (-cmd_pid, SIGWINCH);
832#endif 793#endif
833} 794}
834 795
835/*----------------------------------------------------------------------*/ 796/*----------------------------------------------------------------------*/
836/* set_fonts () - load and set the various fonts 797/* 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 798bool
844rxvt_term::set_fonts () 799rxvt_term::set_fonts ()
845{ 800{
846 rxvt_fontset *fs = new rxvt_fontset (this); 801 rxvt_fontset *fs = new rxvt_fontset (this);
847 rxvt_fontprop prop; 802 rxvt_fontprop prop;
… …
861#endif 816#endif
862 817
863 delete fontset[0]; 818 delete fontset[0];
864 fontset[0] = fs; 819 fontset[0] = fs;
865 820
866 prop = (*fs)[1]->properties (); 821 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
867 prop.height += lineSpace; 822 prop.width = max (prop.width + letterSpace, 1);
868 823
869 fs->set_prop (prop, false); 824 fs->set_prop (prop, false);
870 825
871 fwidth = prop.width; 826 fwidth = prop.width;
872 fheight = prop.height; 827 fheight = prop.height + lineSpace;
873 fbase = prop.ascent; 828 fbase = prop.ascent;
874 829
875 for (int style = 1; style < 4; style++) 830 for (int style = 1; style < 4; style++)
876 { 831 {
877#if ENABLE_STYLES 832#if ENABLE_STYLES
… …
903#else 858#else
904 fontset[style] = fontset[0]; 859 fontset[style] = fontset[0];
905#endif 860#endif
906 } 861 }
907 862
908 if (parent[0]) 863 if (parent)
909 { 864 {
910 resize_all_windows (0, 0, 0); 865 resize_all_windows (0, 0, 0);
911 scr_remap_chars (); 866 scr_remap_chars ();
912 scr_touch (true); 867 scr_touch (true);
913 } 868 }
… …
916} 871}
917 872
918void 873void
919rxvt_term::set_string_property (Atom prop, const char *str, int len) 874rxvt_term::set_string_property (Atom prop, const char *str, int len)
920{ 875{
921 XChangeProperty (dpy, parent[0], 876 XChangeProperty (dpy, parent,
922 prop, XA_STRING, 8, PropModeReplace, 877 prop, XA_STRING, 8, PropModeReplace,
923 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 878 (const unsigned char *)str, len >= 0 ? len : strlen (str));
924} 879}
925 880
926void 881void
882rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
883{
884 XTextProperty ct;
885
886 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
887 {
888 XSetTextProperty (dpy, parent, &ct, prop);
889 XFree (ct.value);
890 }
891}
892
893void
927rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 894rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
928{ 895{
929 wchar_t *ws = rxvt_mbstowcs (str, len); 896 wchar_t *ws = rxvt_mbstowcs (str, len);
930 char *s = rxvt_wcstoutf8 (ws); 897 char *s = rxvt_wcstoutf8 (ws);
931 898
932 XChangeProperty (dpy, parent[0], 899 XChangeProperty (dpy, parent,
933 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 900 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
934 (const unsigned char *)s, strlen (s)); 901 (const unsigned char *)s, strlen (s));
935 902
936 free (s); 903 free (s);
937 free (ws); 904 free (ws);
… …
941/*----------------------------------------------------------------------*/ 908/*----------------------------------------------------------------------*/
942/* xterm sequences - title, iconName, color (exptl) */ 909/* xterm sequences - title, iconName, color (exptl) */
943void 910void
944rxvt_term::set_title (const char *str) 911rxvt_term::set_title (const char *str)
945{ 912{
946 set_string_property (XA_WM_NAME, str); 913 set_mbstring_property (XA_WM_NAME, str);
947#if ENABLE_EWMH 914#if ENABLE_EWMH
948 set_utf8_property (xa[XA_NET_WM_NAME], str); 915 set_utf8_property (xa[XA_NET_WM_NAME], str);
949#endif 916#endif
950} 917}
951 918
952void 919void
953rxvt_term::set_icon_name (const char *str) 920rxvt_term::set_icon_name (const char *str)
954{ 921{
955 set_string_property (XA_WM_ICON_NAME, str); 922 set_mbstring_property (XA_WM_ICON_NAME, str);
956#if ENABLE_EWMH 923#if ENABLE_EWMH
957 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 924 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
958#endif 925#endif
959} 926}
960 927
961void 928void
962rxvt_term::set_window_color (int idx, const char *color) 929rxvt_term::set_window_color (int idx, const char *color)
963{ 930{
964#ifdef XTERM_COLOR_CHANGE 931#ifdef XTERM_COLOR_CHANGE
965 rxvt_color xcol; 932 rxvt_color xcol;
966 int i;
967 933
968 if (color == NULL || *color == '\0') 934 if (color == NULL || *color == '\0')
969 return; 935 return;
970 936
971 color = strdup (color); 937 color = strdup (color);
… …
973 rs[Rs_color + idx] = color; 939 rs[Rs_color + idx] = color;
974 940
975 /* handle color aliases */ 941 /* handle color aliases */
976 if (isdigit (*color)) 942 if (isdigit (*color))
977 { 943 {
978 i = atoi (color); 944 int i = atoi (color);
979 945
980 if (i >= 8 && i <= 15) 946 if (i >= 8 && i <= 15)
947 {
981 { /* bright colors */ 948 /* bright colors */
982 i -= 8;
983 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 949 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
984 goto done; 950 goto done;
985 } 951 }
986 952
987 if (i >= 0 && i <= 7) 953 if (i >= 0 && i <= 7)
954 {
988 { /* normal colors */ 955 /* normal colors */
989 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 956 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
990 goto done; 957 goto done;
991 } 958 }
992 } 959 }
993 960
… …
998 * so just keep gobbling up the colormap 965 * so just keep gobbling up the colormap
999 */ 966 */
1000 967
1001 pix_colors_focused[idx] = xcol; 968 pix_colors_focused[idx] = xcol;
1002 969
1003 /* XSetWindowAttributes attr; */
1004 /* Cursor cursor; */
1005done: 970done:
1006 /*TODO: handle Color_BD, scrollbar background, etc. */ 971 /*TODO: handle Color_BD, scrollbar background, etc. */
1007 972
1008 update_fade_color (idx); 973 update_fade_color (idx);
1009 recolour_cursor (); 974 recolour_cursor ();
… …
1029 994
1030/*----------------------------------------------------------------------*/ 995/*----------------------------------------------------------------------*/
1031/* 996/*
1032 * find if fg/bg matches any of the normal (low-intensity) colors 997 * find if fg/bg matches any of the normal (low-intensity) colors
1033 */ 998 */
1034void 999char *
1035rxvt_term::set_colorfgbg () 1000rxvt_term::get_colorfgbg ()
1036{ 1001{
1037 unsigned int i; 1002 unsigned int i;
1038 const char *xpmb = "\0"; 1003 const char *xpmb = "";
1039 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1004 char fstr[] = "default";
1005 char bstr[] = "default";
1006 char *env_colorfgbg;
1040 1007
1041 strcpy (fstr, "default");
1042 strcpy (bstr, "default");
1043 for (i = Color_Black; i <= Color_White; i++) 1008 for (i = Color_Black; i <= Color_White; i++)
1044 if (pix_colors[Color_fg] == pix_colors[i]) 1009 if (pix_colors[Color_fg] == pix_colors[i])
1045 { 1010 {
1046 sprintf (fstr, "%d", (i - Color_Black)); 1011 sprintf (fstr, "%d", i - Color_Black);
1047 break; 1012 break;
1048 } 1013 }
1049 1014
1050 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
1051 if (pix_colors[Color_bg] == pix_colors[i]) 1016 if (pix_colors[Color_bg] == pix_colors[i])
1052 { 1017 {
1053 sprintf (bstr, "%d", (i - Color_Black)); 1018 sprintf (bstr, "%d", i - Color_Black);
1054#ifdef BG_IMAGE_FROM_FILE 1019#if BG_IMAGE_FROM_FILE
1055 xpmb = "default;"; 1020 xpmb = "default;";
1056#endif 1021#endif
1057 break; 1022 break;
1058 } 1023 }
1059 1024
1025 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1060 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1026 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1027 return env_colorfgbg;
1061} 1028}
1062 1029
1063/*----------------------------------------------------------------------*/ 1030/*----------------------------------------------------------------------*/
1064 1031
1065bool 1032bool
… …
1088 int old_width = szHint.width; 1055 int old_width = szHint.width;
1089 int old_height = szHint.height; 1056 int old_height = szHint.height;
1090 1057
1091 window_calc (newwidth, newheight); 1058 window_calc (newwidth, newheight);
1092 1059
1093 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1060 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1061
1062 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1063 if (set_hint)
1064 {
1065 szHint.flags &= ~(PBaseSize | PResizeInc);
1094 XSetWMNormalHints (dpy, parent[0], &szHint); 1066 XSetWMNormalHints (dpy, parent, &szHint);
1067 szHint.flags |= PBaseSize | PResizeInc;
1068 }
1095 1069
1096 if (!ignoreparent) 1070 if (!ignoreparent)
1097 { 1071 {
1098#ifdef SMART_RESIZE 1072#ifdef SMART_RESIZE
1099 /* 1073 /*
… …
1103 int x, y, x1, y1; 1077 int x, y, x1, y1;
1104 int dx, dy; 1078 int dx, dy;
1105 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1079 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1106 Window unused_cr; 1080 Window unused_cr;
1107 1081
1108 XTranslateCoordinates (dpy, parent[0], display->root, 1082 XTranslateCoordinates (dpy, parent, display->root,
1109 0, 0, &x, &y, &unused_cr); 1083 0, 0, &x, &y, &unused_cr);
1110 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1084 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1111 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1085 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1112 /* 1086 /*
1113 * if display->root isn't the parent window, a WM will probably have offset 1087 * if display->root isn't the parent window, a WM will probably have offset
1114 * our position for handles and decorations. Counter it 1088 * our position for handles and decorations. Counter it
1115 */ 1089 */
… …
1132 if (y < y1) /* top half */ 1106 if (y < y1) /* top half */
1133 dy = 0; 1107 dy = 0;
1134 else if (y == y1) /* exact center */ 1108 else if (y == y1) /* exact center */
1135 dy /= 2; 1109 dy /= 2;
1136 1110
1137 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1111 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1138 szHint.width, szHint.height); 1112 szHint.width, szHint.height);
1139#else 1113#else
1140 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1114 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1141#endif 1115#endif
1142 } 1116 }
1117
1118 if (set_hint)
1119 XSetWMNormalHints (dpy, parent, &szHint);
1143 1120
1144 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1121 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1145 1122
1146 if (fix_screen || newwidth != old_width || newheight != old_height) 1123 if (fix_screen || newwidth != old_width || newheight != old_height)
1147 { 1124 {
1148 if (scrollBar.state) 1125 if (scrollBar.state)
1149 { 1126 scrollBar.resize ();
1150 XMoveResizeWindow (dpy, scrollBar.win,
1151 window_sb_x, 0,
1152 scrollbar_TotalWidth (), szHint.height);
1153 resize_scrollbar ();
1154 }
1155 1127
1156 XMoveResizeWindow (dpy, vt, 1128 XMoveResizeWindow (dpy, vt,
1157 window_vt_x, window_vt_y, 1129 window_vt_x, window_vt_y,
1158 width, height); 1130 vt_width, vt_height);
1131
1132 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1159 1133
1160#ifdef HAVE_BG_PIXMAP 1134#ifdef HAVE_BG_PIXMAP
1161 if (bgPixmap.window_size_sensitive ()) 1135 if (bg_window_size_sensitive ())
1162 update_background (); 1136 update_background ();
1163#endif 1137#endif
1164
1165 scr_clear ();
1166 } 1138 }
1167 1139
1168 if (fix_screen || old_height == 0) 1140 if (fix_screen || old_height == 0)
1169 scr_reset (); 1141 scr_reset ();
1170 1142
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 1143#if USE_XIM
1181 IMSetPosition (); 1144 im_set_position ();
1182#endif 1145#endif
1183} 1146}
1184 1147
1185/* 1148/*
1186 * Set the width/height of the vt window in characters. Units are pixels. 1149 * Set the width/height of the vt window in characters. Units are pixels.
… …
1199 newwidth = wattr.width - szHint.base_width; 1162 newwidth = wattr.width - szHint.base_width;
1200 if (newheight == 0) 1163 if (newheight == 0)
1201 newheight = wattr.height - szHint.base_height; 1164 newheight = wattr.height - szHint.base_height;
1202 } 1165 }
1203 1166
1204 if (newwidth != width || newheight != height) 1167 if (newwidth != vt_width || newheight != vt_height)
1205 { 1168 {
1206 newwidth += szHint.base_width; 1169 newwidth += szHint.base_width;
1207 newheight += szHint.base_height; 1170 newheight += szHint.base_height;
1208 resize_all_windows (newwidth, newheight, 0); 1171 resize_all_windows (newwidth, newheight, 0);
1209 } 1172 }
1210} 1173}
1211 1174
1212/* -------------------------------------------------------------------- * 1175/* -------------------------------------------------------------------- *
1213 * - X INPUT METHOD ROUTINES - * 1176 * - X INPUT METHOD ROUTINES - *
1214 * -------------------------------------------------------------------- */ 1177 * -------------------------------------------------------------------- */
1215#ifdef USE_XIM 1178#if USE_XIM
1216 1179
1217void 1180void
1218rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1181rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1219{ 1182{
1220 fg = pix_colors [Color_fg]; 1183 fg = pix_colors [Color_fg];
… …
1247 status_rect.height = fheight; 1210 status_rect.height = fheight;
1248} 1211}
1249 1212
1250/* Checking whether input method is running. */ 1213/* Checking whether input method is running. */
1251bool 1214bool
1252rxvt_term::IMisRunning () 1215rxvt_term::im_is_running ()
1253{ 1216{
1254 char *p;
1255 Atom atom; 1217 Atom atom;
1256 Window win; 1218 Window win;
1257 char server[IMBUFSIZ]; 1219 char server[IMBUFSIZ];
1258 1220
1259 /* get current locale modifier */ 1221 /* get current locale modifier */
1260 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1222 if (char *p = XSetLocaleModifiers (0))
1261 { 1223 {
1262 strcpy (server, "@server="); 1224 strcpy (server, "@server=");
1263 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1225 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1264 1226
1265 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1227 if (p = strchr (server + 1, '@')) /* first one only */
1266 *p = '\0'; 1228 *p = '\0';
1267 1229
1268 atom = XInternAtom (dpy, server, False); 1230 atom = XInternAtom (dpy, server, False);
1269 win = XGetSelectionOwner (dpy, atom); 1231 win = XGetSelectionOwner (dpy, atom);
1270 1232
1271 if (win != None) 1233 if (win != None)
1272 return True; 1234 return true;
1273 } 1235 }
1274 1236
1275 return False; 1237 return false;
1276} 1238}
1277 1239
1278void 1240void
1279rxvt_term::IMSendSpot () 1241rxvt_term::im_send_spot ()
1280{ 1242{
1281 XPoint nspot; 1243 XPoint nspot;
1282 XVaNestedList preedit_attr; 1244 XVaNestedList preedit_attr;
1283 1245
1284 if (!Input_Context 1246 if (!Input_Context
… …
1337 1299
1338 term->make_current (); 1300 term->make_current ();
1339 1301
1340 if (text) 1302 if (text)
1341 { 1303 {
1342 void *str; 1304 wchar_t *str;
1343 1305
1344 if (!text->encoding_is_wchar && text->string.multi_byte) 1306 if (!text->encoding_is_wchar && text->string.multi_byte)
1345 { 1307 {
1346 // of course, X makes it ugly again 1308 // of course, X makes it ugly again
1347 if (term->rs[Rs_imLocale]) 1309 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->rs[Rs_imLocale]); 1310 SET_LOCALE (term->rs[Rs_imLocale]);
1349 1311
1350 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1312 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1351 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1313 mbstowcs (str, text->string.multi_byte, text->length + 1);
1352 1314
1353 if (term->rs[Rs_imLocale]) 1315 if (term->rs[Rs_imLocale])
1354 SET_LOCALE (term->locale); 1316 SET_LOCALE (term->locale);
1355 } 1317 }
1356 else 1318 else
1357 str = (void *)text->string.wide_char; 1319 str = text->string.wide_char;
1358 1320
1359 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1321 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1360 DT_INT, call_data->caret, 1322 DT_INT, call_data->caret,
1361 DT_INT, call_data->chg_first, 1323 DT_INT, call_data->chg_first,
1362 DT_INT, call_data->chg_length, 1324 DT_INT, call_data->chg_length,
… …
1390/* 1352/*
1391 * Try to open a XIM with the current modifiers, then see if we can 1353 * Try to open a XIM with the current modifiers, then see if we can
1392 * open a suitable preedit type 1354 * open a suitable preedit type
1393 */ 1355 */
1394bool 1356bool
1395rxvt_term::IM_get_IC (const char *modifiers) 1357rxvt_term::im_get_ic (const char *modifiers)
1396{ 1358{
1397 int i, j, found; 1359 int i, j, found;
1398 XIM xim; 1360 XIM xim;
1399 XPoint spot; 1361 XPoint spot;
1400 XRectangle rect, status_rect, needed_rect; 1362 XRectangle rect, status_rect, needed_rect;
1401 unsigned long fg, bg; 1363 unsigned long fg, bg;
1402 const char *p; 1364 const char *p;
1403 char **s; 1365 char **s;
1404 XIMStyles *xim_styles; 1366 XIMStyles *xim_styles;
1405#ifdef ENABLE_XIM_ONTHESPOT
1406 XIMCallback xcb[4];
1407#endif
1408 1367
1409 set_environ (envv); 1368 set_environ (envv);
1410 1369
1411 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1370 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1412 return false; 1371 return false;
… …
1433 p = pet[pi]; 1392 p = pet[pi];
1434 1393
1435 if (!p) 1394 if (!p)
1436 continue; 1395 continue;
1437 1396
1438 s = rxvt_splitcommastring (p); 1397 s = rxvt_strsplit (',', p);
1439 1398
1440 for (i = found = 0; !found && s[i]; i++) 1399 for (i = found = 0; !found && s[i]; i++)
1441 { 1400 {
1442 if (!strcmp (s[i], "OverTheSpot")) 1401 if (!strcmp (s[i], "OverTheSpot"))
1443 input_style = XIMPreeditPosition | XIMStatusNothing; 1402 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1455 input_style = XIMPreeditNothing | XIMStatusNothing; 1414 input_style = XIMPreeditNothing | XIMStatusNothing;
1456 1415
1457 for (j = 0; j < xim_styles->count_styles; j++) 1416 for (j = 0; j < xim_styles->count_styles; j++)
1458 if (input_style == xim_styles->supported_styles[j]) 1417 if (input_style == xim_styles->supported_styles[j])
1459 { 1418 {
1460 rxvt_freecommastring (s); 1419 rxvt_free_strsplit (s);
1461 1420
1462 found = 1; 1421 found = 1;
1463 goto foundpet; 1422 goto foundpet;
1464 } 1423 }
1465 1424
1466 } 1425 }
1467 1426
1468 rxvt_freecommastring (s); 1427 rxvt_free_strsplit (s);
1469 } 1428 }
1470 1429
1471foundpet: 1430foundpet:
1472 1431
1473 XFree (xim_styles); 1432 XFree (xim_styles);
… …
1552 NULL); 1511 NULL);
1553 } 1512 }
1554#if ENABLE_XIM_ONTHESPOT 1513#if ENABLE_XIM_ONTHESPOT
1555 else if (input_style & XIMPreeditCallbacks) 1514 else if (input_style & XIMPreeditCallbacks)
1556 { 1515 {
1516 XIMCallback xcb[4];
1517
1557 im_set_position (spot); 1518 im_set_position (spot);
1558 1519
1559 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1520 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; 1521 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; 1522 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1576#endif 1537#endif
1577 1538
1578 Input_Context = XCreateIC (xim, 1539 Input_Context = XCreateIC (xim,
1579 XNInputStyle, input_style, 1540 XNInputStyle, input_style,
1580 XNClientWindow, vt, 1541 XNClientWindow, vt,
1581 XNFocusWindow, parent[0], 1542 XNFocusWindow, parent,
1582 preedit_attr ? XNPreeditAttributes : NULL, 1543 preedit_attr ? XNPreeditAttributes : NULL,
1583 preedit_attr, 1544 preedit_attr,
1584 status_attr ? XNStatusAttributes : NULL, 1545 status_attr ? XNStatusAttributes : NULL,
1585 status_attr, NULL); 1546 status_attr, NULL);
1586 1547
… …
1599 // unfortunately, only the focus window is used by XIM, hard to fix 1560 // unfortunately, only the focus window is used by XIM, hard to fix
1600 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1561 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1601 vt_select_input (); 1562 vt_select_input ();
1602#endif 1563#endif
1603 1564
1604 IMSetPosition (); 1565 im_set_position ();
1605 1566
1606 return true; 1567 return true;
1607} 1568}
1608 1569
1609void 1570void
… …
1619 im_destroy (); 1580 im_destroy ();
1620 1581
1621 if (Input_Context) 1582 if (Input_Context)
1622 return; 1583 return;
1623 1584
1624#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1625 if (rs[Rs_imLocale]) 1585 if (rs[Rs_imLocale])
1626 SET_LOCALE (rs[Rs_imLocale]); 1586 SET_LOCALE (rs[Rs_imLocale]);
1627#endif
1628 1587
1629 p = rs[Rs_inputMethod]; 1588 p = rs[Rs_inputMethod];
1630 if (p && *p) 1589 if (p && *p)
1631 { 1590 {
1632 bool found = false; 1591 bool found = false;
1633 1592
1634 s = rxvt_splitcommastring (p); 1593 s = rxvt_strsplit (',', p);
1635 1594
1636 for (i = 0; s[i]; i++) 1595 for (i = 0; s[i]; i++)
1637 { 1596 {
1638 if (*s[i]) 1597 if (*s[i])
1639 { 1598 {
1640 strcpy (buf, "@im="); 1599 strcpy (buf, "@im=");
1641 strncat (buf, s[i], IMBUFSIZ - 5); 1600 strncat (buf, s[i], IMBUFSIZ - 5);
1642 if (IM_get_IC (buf)) 1601 if (im_get_ic (buf))
1643 { 1602 {
1644 found = true; 1603 found = true;
1645 break; 1604 break;
1646 } 1605 }
1647 } 1606 }
1648 } 1607 }
1649 1608
1650 rxvt_freecommastring (s); 1609 rxvt_free_strsplit (s);
1651 1610
1652 if (found) 1611 if (found)
1653 goto done; 1612 goto done;
1654 } 1613 }
1655 1614
1656 /* try with XMODIFIERS env. var. */ 1615 /* try with XMODIFIERS env. var. */
1657 if (IM_get_IC ("")) 1616 if (im_get_ic (""))
1658 goto done; 1617 goto done;
1659 1618
1660 /* try with no modifiers base IF the user didn't specify an IM */ 1619 /* try with no modifiers base IF the user didn't specify an IM */
1661 if (IM_get_IC ("@im=none")) 1620 if (im_get_ic ("@im=none"))
1662 goto done; 1621 goto done;
1663 1622
1664done: 1623done:
1665#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1666 if (rs[Rs_imLocale]) 1624 if (rs[Rs_imLocale])
1667 SET_LOCALE (locale); 1625 SET_LOCALE (locale);
1668#endif
1669} 1626}
1670 1627
1671void 1628void
1672rxvt_term::IMSetPosition () 1629rxvt_term::im_set_position ()
1673{ 1630{
1674 XRectangle preedit_rect, status_rect, *needed_rect; 1631 XRectangle preedit_rect, status_rect, *needed_rect;
1675 XVaNestedList preedit_attr, status_attr; 1632 XVaNestedList preedit_attr, status_attr;
1676 1633
1677 if (!Input_Context 1634 if (!Input_Context
1678 || !focus 1635 || !focus
1679 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1636 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1680 || !IMisRunning ()) 1637 || !im_is_running ())
1681 return; 1638 return;
1682 1639
1683 if (input_style & XIMPreeditPosition) 1640 if (input_style & XIMPreeditPosition)
1684 { 1641 {
1685 im_set_size (preedit_rect); 1642 im_set_size (preedit_rect);
… …
1715 1672
1716void 1673void
1717rxvt_term::get_window_origin (int &x, int &y) 1674rxvt_term::get_window_origin (int &x, int &y)
1718{ 1675{
1719 Window cr; 1676 Window cr;
1720 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1677 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} 1678}
1744 1679
1745#ifdef HAVE_BG_PIXMAP 1680#ifdef HAVE_BG_PIXMAP
1746# if TRACE_PIXMAPS 1681
1747# undef update_background 1682void
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 () 1683rxvt_term::update_background ()
1756{ 1684{
1685 if (update_background_ev.is_active ())
1686 return;
1687
1757 bgPixmap.invalidate (); 1688 bg_invalidate ();
1758 1689
1759 /* no chance of real time refresh if we are blurring! */ 1690 if (!mapped)
1760 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1691 return;
1692
1693 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1694
1695 if (to_wait <= 0.)
1761 bgPixmap.render (); 1696 bg_render ();
1762 else 1697 else
1763 {
1764 update_background_ev.stop ();
1765
1766 if (!bgPixmap.need_client_side_rendering())
1767 update_background_ev.start (.05); 1698 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} 1699}
1776 1700
1777void 1701void
1778rxvt_term::update_background_cb (ev::timer &w, int revents) 1702rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{ 1703{
1704 make_current ();
1705
1706 update_background_ev.stop ();
1780 bgPixmap.render (); 1707 bg_render ();
1708 refresh_check ();
1781} 1709}
1782 1710
1783#endif /* HAVE_BG_PIXMAP */ 1711#endif /* HAVE_BG_PIXMAP */
1784 1712
1785/*----------------------- end-of-file (C source) -----------------------*/ 1713/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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