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.251 by sasha, Tue Sep 18 22:01:36 2007 UTC vs.
Revision 1.376 by root, Mon Jun 4 15:18:52 2012 UTC

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

Diff Legend

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