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

Diff Legend

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