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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines