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.261 by root, Mon Nov 19 15:33:34 2007 UTC vs.
Revision 1.390 by root, Thu May 22 18:54:33 2014 UTC

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

Diff Legend

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