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.219 by root, Sat Feb 11 02:28:19 2006 UTC vs.
Revision 1.370 by sf-exg, Thu Jan 19 15:08:55 2012 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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
56static char curlocale[128], savelocale[128]; 60static char curlocale[128], savelocale[128];
57 61
58bool 62bool
59rxvt_set_locale (const char *locale) NOTHROW 63rxvt_set_locale (const char *locale) NOTHROW
60{ 64{
65 int size = strlen (locale) + 1;
66
67 if (size > sizeof (curlocale))
68 rxvt_fatal ("locale string too long, aborting.\n");
69
61 if (!locale || !strncmp (locale, curlocale, 128)) 70 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 71 return false;
63 72
64 strncpy (curlocale, locale, 128); 73 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 74 setlocale (LC_CTYPE, curlocale);
66 return true; 75 return true;
67} 76}
68 77
69void 78void
… …
83class rxvt_composite_vec rxvt_composite; 92class rxvt_composite_vec rxvt_composite;
84 93
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 95{
87 compose_char *cc; 96 compose_char *cc;
88 97
89 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
91 cc = (*this)[c1]; 100 cc = (*this)[c1];
92 while (cc) 101 while (cc)
93 { 102 {
94 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
95 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
96 } 105 }
97 106
98 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
99 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
100 {
101 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
102 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
103 }
104 111
105 // allocate a new combination 112 // allocate a new combination
106 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
107 { 114 {
108 static int seen; 115 static int seen;
109 116
110 if (!seen++) 117 if (!seen++)
111 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
112 119
113 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
114 } 121 }
115 122
116 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
142 149
143} 150}
144#endif 151#endif
145 152
146rxvt_term::rxvt_term () 153rxvt_term::rxvt_term ()
147 : 154{
148#if TRANSPARENT 155#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 156 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 157#endif
154#ifdef CURSOR_BLINK 158#ifdef CURSOR_BLINK
155 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);
156#endif 160#endif
157#ifdef TEXT_BLINK 161#ifdef TEXT_BLINK
158 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);
159#endif 163#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 164#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 165 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 166#endif
163#ifdef SELECTION_SCROLLING 167#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 169#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 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 ENABLE_TRANSPARENCY || 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#ifdef USE_XIM
178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 179#endif
169#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 182#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 183#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 184 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 185#endif
178 termwin_ev (this, &rxvt_term::x_cb), 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 192
185 incr_ev (this, &rxvt_term::incr_cb)
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 194
189 termlist.push_back (this); 195 termlist.push_back (this);
190 196
191#ifdef KEYSYM_RESOURCE 197#ifdef KEYSYM_RESOURCE
… …
193#endif 199#endif
194} 200}
195 201
196// 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.
197// for use before an emergency exit 203// for use before an emergency exit
204void
198void rxvt_term::emergency_cleanup () 205rxvt_term::emergency_cleanup ()
199{ 206{
200 if (cmd_pid) 207 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 208 kill (-cmd_pid, SIGHUP);
202 209
210 pty_ev.stop ();
203 delete pty; pty = 0; 211 delete pty; pty = 0;
204} 212}
205 213
206rxvt_term::~rxvt_term () 214rxvt_term::~rxvt_term ()
207{ 215{
… …
214 if (fontset[i] != fontset[0]) 222 if (fontset[i] != fontset[0])
215 delete fontset[i]; 223 delete fontset[i];
216#endif 224#endif
217 delete fontset[0]; 225 delete fontset[0];
218 226
227#ifdef HAVE_BG_PIXMAP
228 bg_destroy ();
229#endif
230
219 if (display) 231 if (display)
220 { 232 {
221 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
222 235
223#ifdef USE_XIM 236#ifdef USE_XIM
224 im_destroy (); 237 im_destroy ();
225#endif 238#endif
226#ifdef XTERM_SCROLLBAR 239 scrollBar.destroy ();
227 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif
230#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif
233#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif
245#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif
250 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
251 241
252 delete drawable; 242 delete drawable;
253 // destroy all windows 243 // destroy all windows
254 if (parent[0]) 244 if (parent)
255 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
256 246
257 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
259 { 249 {
260 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
262 pix_colors_unfocused [i].free (this); 252 pix_colors_unfocused [i].free (this);
263#endif 253#endif
264 } 254 }
265 255
266 clear (); 256 clear ();
267 }
268 257
269 delete pix_colors_focused; 258 display->flush (); /* ideally .put should do this */
270#if OFF_FOCUS_FADING
271 delete pix_colors_unfocused;
272#endif
273
274 displays.put (display); 259 displays.put (display);
260 }
275 261
276 scr_release (); 262 scr_release ();
277 263
278 /* clear all resources */ 264 /* clear all resources */
279 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
280 free (allocated [i]); 266 free (allocated [i]);
281 267
282 free (selection.text); 268 free (selection.text);
283 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
284 free (env_display);
285 free (env_term);
286 free (locale); 270 free (locale);
287 free (v_buffer); 271 free (v_buffer);
288 free (incr_buf); 272
273 delete selection_req;
289 274
290 delete envv; 275 delete envv;
291 delete argv; 276 delete argv;
292 277
293#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
294 delete keyboard; 279 delete keyboard;
295#endif 280#endif
281#ifndef NO_RESOURCES
282 XrmDestroyDatabase (option_db);
283#endif
296} 284}
297 285
298// child has exited, usually destroys 286// child has exited, usually destroys
299void 287void
300rxvt_term::child_cb (child_watcher &w, int status) 288rxvt_term::child_cb (ev::child &w, int status)
301{ 289{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 290 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303 291
304 cmd_pid = 0; 292 cmd_pid = 0;
305 293
306 if (!OPTION (Opt_hold)) 294 if (!option (Opt_hold))
307 destroy (); 295 destroy ();
308} 296}
309 297
310void 298void
311rxvt_term::destroy () 299rxvt_term::destroy ()
312{ 300{
313 if (destroy_ev.active) 301 if (destroy_ev.is_active ())
314 return; 302 return;
315 303
316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 304 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
317 305
318#if ENABLE_OVERLAY 306#if ENABLE_OVERLAY
… …
322 if (display) 310 if (display)
323 { 311 {
324#if USE_XIM 312#if USE_XIM
325 im_ev.stop (display); 313 im_ev.stop (display);
326#endif 314#endif
327#if HAVE_SCROLLBARS
328 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
329#endif 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
330#if TRANSPARENT
331 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
332#endif 318#endif
333 incr_ev.stop ();
334 termwin_ev.stop (display); 319 termwin_ev.stop (display);
335 vt_ev.stop (display); 320 vt_ev.stop (display);
336 } 321 }
337 322
338 check_ev.stop (); 323 flush_ev.stop ();
339 pty_ev.stop (); 324 pty_ev.stop ();
340#ifdef CURSOR_BLINK 325#ifdef CURSOR_BLINK
341 cursor_blink_ev.stop (); 326 cursor_blink_ev.stop ();
342#endif 327#endif
343#ifdef TEXT_BLINK 328#ifdef TEXT_BLINK
… …
351#endif 336#endif
352#ifdef POINTER_BLANK 337#ifdef POINTER_BLANK
353 pointer_ev.stop (); 338 pointer_ev.stop ();
354#endif 339#endif
355 340
356 destroy_ev.start (0); 341 destroy_ev.start ();
357} 342}
358 343
359void 344void
360rxvt_term::destroy_cb (time_watcher &w) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
361{ 346{
362 make_current (); 347 make_current ();
363 348
364 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);
365} 362}
366 363
367/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
368/* 365/*
369 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
383print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
384{ 381{
385 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
386 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
387 char number[32]; 384 char number[32];
388 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
389 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
390 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
391 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");
392 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
393 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
394 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
395 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
396 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
397 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
398 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
399 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
400 mesg, BUFSIZ); 397 mesg, BUFSIZ);
401 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
402 } 399 }
403 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
404 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
405 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
406 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
407 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
408 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
409 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
410 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
411 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
412 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
413 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
414 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
415 mesg, BUFSIZ); 412 mesg, BUFSIZ);
416 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
417 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
418 mesg, BUFSIZ); 415 mesg, BUFSIZ);
419 else 416 else
420 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
421 mesg, BUFSIZ); 418 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
423 } 420 }
424 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
425 mesg, BUFSIZ); 422 mesg, BUFSIZ);
426 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
427} 424}
428#endif 425#endif
429 426
430int 427int
… …
453 DisplayString (display)); 450 DisplayString (display));
454 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
455 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
456} 453}
457 454
458/*----------------------------------------------------------------------*/
459bool
460rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
461{
462 this->envv = envv;
463
464 SET_R (this);
465 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :(
467
468 if (!init_vars ())
469 return false;
470
471 init_secondary ();
472
473 const char **cmd_argv = init_resources (argc, argv);
474
475#ifdef KEYSYM_RESOURCE
476 keyboard->register_done ();
477#endif
478
479#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */
482#endif
483
484 pty = ptytty::create ();
485
486 create_windows (argc, argv);
487
488 init_xlocale ();
489
490 scr_reset (); // initialize screen
491
492#if 0
493 XSynchronize (dpy, True);
494#endif
495
496#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */
499#endif
500#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent))
502 {
503 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents ();
505 rootwin_ev.start (display, display->root);
506 }
507#endif
508
509 set_colorfgbg ();
510
511 init_command (cmd_argv);
512
513 free (cmd_argv);
514
515 if (pty->pty >= 0)
516 pty_ev.start (pty->pty, EVENT_READ);
517
518 check_ev.start ();
519
520 HOOK_INVOKE ((this, HOOK_START, DT_END));
521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
532 XMapWindow (dpy, vt);
533 XMapWindow (dpy, parent[0]);
534
535 return true;
536}
537
538static struct sig_handlers 455static struct sig_handlers
539{ 456{
540 sig_watcher sw_term, sw_int; 457 ev::sig sw_term, sw_int;
541 458
542 /* 459 /*
543 * Catch a fatal signal and tidy up before quitting 460 * Catch a fatal signal and tidy up before quitting
544 */ 461 */
545 void 462 void sig_term (ev::sig &w, int revents);
546 sig_term (sig_watcher &w) 463
464 sig_handlers ()
547 { 465 {
548 rxvt_emergency_cleanup (); 466 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
549 signal (w.signum, SIG_DFL);
550 kill (getpid (), w.signum);
551 }
552
553 sig_handlers ()
554 : sw_term (this, &sig_handlers::sig_term),
555 sw_int (this, &sig_handlers::sig_term) 467 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
556 {
557 } 468 }
558} sig_handlers; 469} sig_handlers;
559 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
560char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
561 547
562void 548void
563rxvt_init () 549rxvt_init ()
564{ 550{
565 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");
566 562
567 rxvt_environ = environ; 563 rxvt_environ = environ;
568 564
569 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
570 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
571 567
572 sig_handlers.sw_term.start (SIGTERM); 568 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
573 sig_handlers.sw_int.start (SIGINT); 569 sig_handlers.sw_int.start (SIGINT); ev_unref ();
574
575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
576 /* signal (SIGURG, SIG_DFL); */
577 570
578 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
579 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
580 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
581 574
582 XrmInitialize (); 575 XrmInitialize ();
583} 576}
584 577
585/* ------------------------------------------------------------------------- *
586 * MEMORY ALLOCATION WRAPPERS *
587 * ------------------------------------------------------------------------- */
588void *
589rxvt_malloc (size_t size)
590{
591 void *p = malloc (size);
592
593 if (!p)
594 rxvt_fatal ("memory allocation failure. aborting.\n");
595
596 return p;
597}
598
599void *
600rxvt_calloc (size_t number, size_t size)
601{
602 void *p = calloc (number, size);
603
604 if (!p)
605 rxvt_fatal ("memory allocation failure. aborting.\n");
606
607 return p;
608}
609
610void *
611rxvt_realloc (void *ptr, size_t size)
612{
613 void *p = realloc (ptr, size);
614
615 if (!p)
616 rxvt_fatal ("memory allocation failure. aborting.\n");
617
618 return p;
619}
620
621/*----------------------------------------------------------------------*/ 578/*----------------------------------------------------------------------*/
622/* 579/*
623 * window size/position calculcations for XSizeHint and other storage. 580 * window size/position calculations for XSizeHint and other storage.
624 * if width/height are non-zero then override calculated width/height 581 * if width/height are non-zero then override calculated width/height
625 */ 582 */
626void 583void
627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 584rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628{ 585{
629 short recalc_x, recalc_y; 586 short recalc_x, recalc_y;
630 int x, y, sb_w, flags; 587 int x, y, flags;
631 unsigned int w, h; 588 unsigned int w, h;
632 unsigned int max_width, max_height; 589 unsigned int max_width, max_height;
633 590
634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 591 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
635 szHint.win_gravity = NorthWestGravity; 592 szHint.win_gravity = NorthWestGravity;
… …
645 if (rs[Rs_geometry]) 602 if (rs[Rs_geometry])
646 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 603 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
647 604
648 if (flags & WidthValue) 605 if (flags & WidthValue)
649 { 606 {
607 if (!w)
608 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
609
650 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 610 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
651 szHint.flags |= USSize; 611 szHint.flags |= USSize;
652 } 612 }
653 613
654 if (flags & HeightValue) 614 if (flags & HeightValue)
655 { 615 {
616 if (!h)
617 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
618
656 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 619 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
657 szHint.flags |= USSize; 620 szHint.flags |= USSize;
658 } 621 }
659 622
660 if (flags & XValue) 623 if (flags & XValue)
661 { 624 {
… …
692 max_width = MAX_COLS * fwidth; 655 max_width = MAX_COLS * fwidth;
693 max_height = MAX_ROWS * fheight; 656 max_height = MAX_ROWS * fheight;
694 657
695 szHint.base_width = szHint.base_height = 2 * int_bwidth; 658 szHint.base_width = szHint.base_height = 2 * int_bwidth;
696 659
697 sb_w = 0;
698 window_vt_x = window_vt_y = int_bwidth; 660 window_vt_x = window_vt_y = int_bwidth;
699 661
700 if (scrollBar.state) 662 if (scrollBar.state)
701 { 663 {
702 sb_w = scrollbar_TotalWidth (); 664 int sb_w = scrollBar.total_width ();
703 szHint.base_width += sb_w; 665 szHint.base_width += sb_w;
704 666
705 if (!OPTION (Opt_scrollBar_right)) 667 if (!option (Opt_scrollBar_right))
706 window_vt_x += sb_w; 668 window_vt_x += sb_w;
707 } 669 }
708 670
709 szHint.width_inc = fwidth; 671 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 672 szHint.height_inc = fheight;
… …
731 { 693 {
732 min_it (height, max_height); 694 min_it (height, max_height);
733 szHint.height = szHint.base_height + height; 695 szHint.height = szHint.base_height + height;
734 } 696 }
735 697
736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w;
738
739 if (recalc_x) 698 if (recalc_x)
740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 699 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 700
742 if (recalc_y) 701 if (recalc_y)
743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 702 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
744 703
745 ncol = width / fwidth; 704 ncol = width / fwidth;
746 nrow = height / fheight; 705 nrow = height / fheight;
706
707 // When the size of the vt window is not a multiple of the cell
708 // size, i.e., when the wm does not honour our size hints, there are
709 // extra areas not covered by the terminal screen. Such gaps, when a
710 // bg pixmap is set, would have to be cleared manually to properly
711 // refresh the background. We take the simpler route and shrink the
712 // vt window so as to avoid creating gaps.
713 vt_width = ncol * fwidth;
714 vt_height = nrow * fheight;
747} 715}
748 716
749/*----------------------------------------------------------------------*/ 717/*----------------------------------------------------------------------*/
750/* 718/*
751 * Tell the teletype handler what size the window is. 719 * Tell the teletype handler what size the window is.
… …
759 727
760 struct winsize ws; 728 struct winsize ws;
761 729
762 ws.ws_col = ncol; 730 ws.ws_col = ncol;
763 ws.ws_row = nrow; 731 ws.ws_row = nrow;
764 ws.ws_xpixel = width; 732 ws.ws_xpixel = vt_width;
765 ws.ws_ypixel = height; 733 ws.ws_ypixel = vt_height;
766 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 734 ioctl (pty->pty, TIOCSWINSZ, &ws);
767 735
768#if 0 736#if 0
769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 737 // TIOCSWINSZ is supposed to do this automatically and correctly
770 if (cmd_pid) /* force through to the command */ 738 if (cmd_pid) /* force through to the command */
771 kill (-cmd_pid, SIGWINCH); 739 kill (-cmd_pid, SIGWINCH);
772#endif 740#endif
773} 741}
774 742
775/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
776/* set_fonts () - load and set the various fonts 744/* load and set the various fonts */
777 *
778 * init = 1 - initialize
779 *
780 * fontname == FONT_UP - switch to bigger font
781 * fontname == FONT_DN - switch to smaller font
782 */
783bool 745bool
784rxvt_term::set_fonts () 746rxvt_term::set_fonts ()
785{ 747{
786 rxvt_fontset *fs = new rxvt_fontset (this); 748 rxvt_fontset *fs = new rxvt_fontset (this);
787 rxvt_fontprop prop; 749 rxvt_fontprop prop;
… …
801#endif 763#endif
802 764
803 delete fontset[0]; 765 delete fontset[0];
804 fontset[0] = fs; 766 fontset[0] = fs;
805 767
806 prop = (*fs)[1]->properties (); 768 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
807 prop.height += lineSpace; 769 prop.height += lineSpace;
770 prop.width += letterSpace;
771
808 fs->set_prop (prop); 772 fs->set_prop (prop, false);
809 773
810 fwidth = prop.width; 774 fwidth = prop.width;
811 fheight = prop.height; 775 fheight = prop.height;
812 fbase = prop.ascent; 776 fbase = prop.ascent;
813 777
… …
822 { 786 {
823 fontset[style] = fs = new rxvt_fontset (this); 787 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 788 rxvt_fontprop prop2 = prop;
825 789
826 if (res) 790 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 791 {
792 fs->populate (res);
793 fs->set_prop (prop2, false);
794 }
828 else 795 else
829 { 796 {
830 res = fontset[0]->fontdesc; 797 fs->populate (fontset[0]->fontdesc);
831 798
832 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 799 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
833 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 800 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
801
802 fs->set_prop (prop2, true);
834 } 803 }
835 804
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 805 }
839#else 806#else
840 fontset[style] = fontset[0]; 807 fontset[style] = fontset[0];
841#endif 808#endif
842 } 809 }
843 810
844 if (parent[0]) 811 if (parent)
845 { 812 {
846 resize_all_windows (0, 0, 0); 813 resize_all_windows (0, 0, 0);
847 scr_remap_chars (); 814 scr_remap_chars ();
848 scr_touch (true); 815 scr_touch (true);
849 } 816 }
850 817
851 return true; 818 return true;
852} 819}
853 820
821void
854void rxvt_term::set_string_property (Atom prop, const char *str, int len) 822rxvt_term::set_string_property (Atom prop, const char *str, int len)
855{ 823{
856 XChangeProperty (dpy, parent[0], 824 XChangeProperty (dpy, parent,
857 prop, XA_STRING, 8, PropModeReplace, 825 prop, XA_STRING, 8, PropModeReplace,
858 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 826 (const unsigned char *)str, len >= 0 ? len : strlen (str));
859} 827}
860 828
829void
830rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
831{
832 XTextProperty ct;
833
834 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
835 {
836 XSetTextProperty (dpy, parent, &ct, prop);
837 XFree (ct.value);
838 }
839}
840
841void
861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 842rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
862{ 843{
863 wchar_t *ws = rxvt_mbstowcs (str, len); 844 wchar_t *ws = rxvt_mbstowcs (str, len);
864 char *s = rxvt_wcstoutf8 (ws); 845 char *s = rxvt_wcstoutf8 (ws);
865 846
866 XChangeProperty (dpy, parent[0], 847 XChangeProperty (dpy, parent,
867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 848 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
868 (const unsigned char *)s, strlen (s)); 849 (const unsigned char *)s, strlen (s));
869 850
870 free (s); 851 free (s);
871 free (ws); 852 free (ws);
… …
875/*----------------------------------------------------------------------*/ 856/*----------------------------------------------------------------------*/
876/* xterm sequences - title, iconName, color (exptl) */ 857/* xterm sequences - title, iconName, color (exptl) */
877void 858void
878rxvt_term::set_title (const char *str) 859rxvt_term::set_title (const char *str)
879{ 860{
880 set_string_property (XA_WM_NAME, str); 861 set_mbstring_property (XA_WM_NAME, str);
881#if ENABLE_EWMH 862#if ENABLE_EWMH
882 set_utf8_property (xa[XA_NET_WM_NAME], str); 863 set_utf8_property (xa[XA_NET_WM_NAME], str);
883#endif 864#endif
884} 865}
885 866
886void 867void
887rxvt_term::set_icon_name (const char *str) 868rxvt_term::set_icon_name (const char *str)
888{ 869{
889 set_string_property (XA_WM_ICON_NAME, str); 870 set_mbstring_property (XA_WM_ICON_NAME, str);
890#if ENABLE_EWMH 871#if ENABLE_EWMH
891 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 872 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
892#endif 873#endif
893} 874}
894 875
876void
877rxvt_term::set_window_color (int idx, const char *color)
878{
895#ifdef XTERM_COLOR_CHANGE 879#ifdef XTERM_COLOR_CHANGE
896void
897rxvt_term::set_window_color (int idx, const char *color)
898{
899 rxvt_color xcol; 880 rxvt_color xcol;
900 int i; 881
901
902 if (color == NULL || *color == '\0') 882 if (color == NULL || *color == '\0')
903 return; 883 return;
904 884
905 color = strdup (color); 885 color = strdup (color);
906 allocated.push_back ((void *)color); 886 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color; 887 rs[Rs_color + idx] = color;
908 888
909 /* handle color aliases */ 889 /* handle color aliases */
910 if (isdigit (*color)) 890 if (isdigit (*color))
911 { 891 {
912 i = atoi (color); 892 int i = atoi (color);
913 893
914 if (i >= 8 && i <= 15) 894 if (i >= 8 && i <= 15)
895 {
915 { /* bright colors */ 896 /* bright colors */
916 i -= 8;
917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 897 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
918 goto done; 898 goto done;
919 } 899 }
920 900
921 if (i >= 0 && i <= 7) 901 if (i >= 0 && i <= 7)
902 {
922 { /* normal colors */ 903 /* normal colors */
923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 904 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
924 goto done; 905 goto done;
925 } 906 }
926 } 907 }
927 908
… …
932 * so just keep gobbling up the colormap 913 * so just keep gobbling up the colormap
933 */ 914 */
934 915
935 pix_colors_focused[idx] = xcol; 916 pix_colors_focused[idx] = xcol;
936 917
937 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */
939done: 918done:
940
941#if OFF_FOCUS_FADING
942 if (rs[Rs_fade])
943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 919 /*TODO: handle Color_BD, scrollbar background, etc. */
951 920
921 update_fade_color (idx);
952 recolour_cursor (); 922 recolour_cursor ();
953 scr_recolour (); 923 scr_recolour ();
924#endif /* XTERM_COLOR_CHANGE */
954} 925}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */
959 926
960void 927void
961rxvt_term::recolour_cursor () 928rxvt_term::recolour_cursor ()
962{ 929{
963 XColor fg, bg; 930 XColor fg, bg;
… …
975 942
976/*----------------------------------------------------------------------*/ 943/*----------------------------------------------------------------------*/
977/* 944/*
978 * find if fg/bg matches any of the normal (low-intensity) colors 945 * find if fg/bg matches any of the normal (low-intensity) colors
979 */ 946 */
980void 947char *
981rxvt_term::set_colorfgbg () 948rxvt_term::get_colorfgbg ()
982{ 949{
983 unsigned int i; 950 unsigned int i;
984 const char *xpmb = "\0"; 951 const char *xpmb = "";
985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 952 char fstr[] = "default";
953 char bstr[] = "default";
954 char *env_colorfgbg;
986 955
987 strcpy (fstr, "default");
988 strcpy (bstr, "default");
989 for (i = Color_Black; i <= Color_White; i++) 956 for (i = Color_Black; i <= Color_White; i++)
990 if (pix_colors[Color_fg] == pix_colors[i]) 957 if (pix_colors[Color_fg] == pix_colors[i])
991 { 958 {
992 sprintf (fstr, "%d", (i - Color_Black)); 959 sprintf (fstr, "%d", i - Color_Black);
993 break; 960 break;
994 } 961 }
995 962
996 for (i = Color_Black; i <= Color_White; i++) 963 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 964 if (pix_colors[Color_bg] == pix_colors[i])
998 { 965 {
999 sprintf (bstr, "%d", (i - Color_Black)); 966 sprintf (bstr, "%d", i - Color_Black);
1000#ifdef XPM_BACKGROUND 967#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 968 xpmb = "default;";
1002#endif 969#endif
1003 break; 970 break;
1004 } 971 }
1005 972
973 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
975 return env_colorfgbg;
1007} 976}
1008 977
1009/*----------------------------------------------------------------------*/ 978/*----------------------------------------------------------------------*/
1010 979
1011bool 980bool
… …
1034 int old_width = szHint.width; 1003 int old_width = szHint.width;
1035 int old_height = szHint.height; 1004 int old_height = szHint.height;
1036 1005
1037 window_calc (newwidth, newheight); 1006 window_calc (newwidth, newheight);
1038 1007
1039 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1008 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1009
1010 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1011 if (set_hint)
1012 {
1013 szHint.flags &= ~(PBaseSize | PResizeInc);
1040 XSetWMNormalHints (dpy, parent[0], &szHint); 1014 XSetWMNormalHints (dpy, parent, &szHint);
1015 szHint.flags |= PBaseSize | PResizeInc;
1016 }
1041 1017
1042 if (!ignoreparent) 1018 if (!ignoreparent)
1043 { 1019 {
1044#ifdef SMART_RESIZE 1020#ifdef SMART_RESIZE
1045 /* 1021 /*
… …
1049 int x, y, x1, y1; 1025 int x, y, x1, y1;
1050 int dx, dy; 1026 int dx, dy;
1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1027 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1052 Window unused_cr; 1028 Window unused_cr;
1053 1029
1054 XTranslateCoordinates (dpy, parent[0], display->root, 1030 XTranslateCoordinates (dpy, parent, display->root,
1055 0, 0, &x, &y, &unused_cr); 1031 0, 0, &x, &y, &unused_cr);
1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1032 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1033 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1058 /* 1034 /*
1059 * if display->root isn't the parent window, a WM will probably have offset 1035 * if display->root isn't the parent window, a WM will probably have offset
1060 * our position for handles and decorations. Counter it 1036 * our position for handles and decorations. Counter it
1061 */ 1037 */
… …
1078 if (y < y1) /* top half */ 1054 if (y < y1) /* top half */
1079 dy = 0; 1055 dy = 0;
1080 else if (y == y1) /* exact center */ 1056 else if (y == y1) /* exact center */
1081 dy /= 2; 1057 dy /= 2;
1082 1058
1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1059 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1084 szHint.width, szHint.height); 1060 szHint.width, szHint.height);
1085#else 1061#else
1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1062 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1087#endif 1063#endif
1088 } 1064 }
1065
1066 if (set_hint)
1067 XSetWMNormalHints (dpy, parent, &szHint);
1089 1068
1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1091 1070
1092 if (fix_screen || newwidth != old_width || newheight != old_height) 1071 if (fix_screen || newwidth != old_width || newheight != old_height)
1093 { 1072 {
1094 if (scrollBar.state) 1073 if (scrollBar.state)
1095 { 1074 scrollBar.resize ();
1096 XMoveResizeWindow (dpy, scrollBar.win,
1097 window_sb_x, 0,
1098 scrollbar_TotalWidth (), szHint.height);
1099 resize_scrollbar ();
1100 }
1101 1075
1102 XMoveResizeWindow (dpy, vt, 1076 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1077 window_vt_x, window_vt_y,
1104 width, height); 1078 vt_width, vt_height);
1105 1079
1106 scr_clear (); 1080#ifdef HAVE_BG_PIXMAP
1107#ifdef XPM_BACKGROUND 1081 if (bg_window_size_sensitive ())
1108 resize_pixmap (); 1082 update_background ();
1109#endif 1083#endif
1110 } 1084 }
1111 1085
1112 if (fix_screen || old_height == 0) 1086 if (fix_screen || old_height == 0)
1113 scr_reset (); 1087 scr_reset ();
1114 1088
1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 //scr_touch (false);
1117
1118#ifdef XPM_BACKGROUND
1119 if (pixmap)
1120 scr_touch (false);
1121#endif
1122
1123#ifdef USE_XIM 1089#ifdef USE_XIM
1124 IMSetStatusPosition (); 1090 im_set_position ();
1125#endif 1091#endif
1126} 1092}
1127 1093
1128/* 1094/*
1129 * Set the width/height of the vt window in characters. Units are pixels. 1095 * Set the width/height of the vt window in characters. Units are pixels.
… …
1142 newwidth = wattr.width - szHint.base_width; 1108 newwidth = wattr.width - szHint.base_width;
1143 if (newheight == 0) 1109 if (newheight == 0)
1144 newheight = wattr.height - szHint.base_height; 1110 newheight = wattr.height - szHint.base_height;
1145 } 1111 }
1146 1112
1147 if (newwidth != width || newheight != height) 1113 if (newwidth != vt_width || newheight != vt_height)
1148 { 1114 {
1149 newwidth += szHint.base_width; 1115 newwidth += szHint.base_width;
1150 newheight += szHint.base_height; 1116 newheight += szHint.base_height;
1151 resize_all_windows (newwidth, newheight, 0); 1117 resize_all_windows (newwidth, newheight, 0);
1152 } 1118 }
… …
1190 status_rect.height = fheight; 1156 status_rect.height = fheight;
1191} 1157}
1192 1158
1193/* Checking whether input method is running. */ 1159/* Checking whether input method is running. */
1194bool 1160bool
1195rxvt_term::IMisRunning () 1161rxvt_term::im_is_running ()
1196{ 1162{
1197 char *p;
1198 Atom atom; 1163 Atom atom;
1199 Window win; 1164 Window win;
1200 char server[IMBUFSIZ]; 1165 char server[IMBUFSIZ];
1201 1166
1202 /* get current locale modifier */ 1167 /* get current locale modifier */
1203 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1168 if (char *p = XSetLocaleModifiers (0))
1204 { 1169 {
1205 strcpy (server, "@server="); 1170 strcpy (server, "@server=");
1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1171 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1207 1172
1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1173 if (p = strchr (server + 1, '@')) /* first one only */
1209 *p = '\0'; 1174 *p = '\0';
1210 1175
1211 atom = XInternAtom (dpy, server, False); 1176 atom = XInternAtom (dpy, server, False);
1212 win = XGetSelectionOwner (dpy, atom); 1177 win = XGetSelectionOwner (dpy, atom);
1213 1178
1214 if (win != None) 1179 if (win != None)
1215 return True; 1180 return true;
1216 } 1181 }
1217 1182
1218 return False; 1183 return false;
1219} 1184}
1220 1185
1221void 1186void
1222rxvt_term::IMSendSpot () 1187rxvt_term::im_send_spot ()
1223{ 1188{
1224 XPoint nspot; 1189 XPoint nspot;
1225 XVaNestedList preedit_attr; 1190 XVaNestedList preedit_attr;
1226 1191
1227 if (!Input_Context 1192 if (!Input_Context
… …
1280 1245
1281 term->make_current (); 1246 term->make_current ();
1282 1247
1283 if (text) 1248 if (text)
1284 { 1249 {
1285 void *str; 1250 wchar_t *str;
1286 1251
1287 if (!text->encoding_is_wchar && text->string.multi_byte) 1252 if (!text->encoding_is_wchar && text->string.multi_byte)
1288 { 1253 {
1289 // of course, X makes it ugly again 1254 // of course, X makes it ugly again
1290 if (term->rs[Rs_imLocale]) 1255 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->rs[Rs_imLocale]); 1256 SET_LOCALE (term->rs[Rs_imLocale]);
1292 1257
1293 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1258 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1294 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1259 mbstowcs (str, text->string.multi_byte, text->length + 1);
1295 1260
1296 if (term->rs[Rs_imLocale]) 1261 if (term->rs[Rs_imLocale])
1297 SET_LOCALE (term->locale); 1262 SET_LOCALE (term->locale);
1298 } 1263 }
1299 else 1264 else
1300 str = (void *)text->string.wide_char; 1265 str = text->string.wide_char;
1301 1266
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1267 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret, 1268 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first, 1269 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length, 1270 DT_INT, call_data->chg_length,
1306 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1271 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1333/* 1298/*
1334 * Try to open a XIM with the current modifiers, then see if we can 1299 * Try to open a XIM with the current modifiers, then see if we can
1335 * open a suitable preedit type 1300 * open a suitable preedit type
1336 */ 1301 */
1337bool 1302bool
1338rxvt_term::IM_get_IC (const char *modifiers) 1303rxvt_term::im_get_ic (const char *modifiers)
1339{ 1304{
1340 int i, j, found; 1305 int i, j, found;
1341 XIM xim; 1306 XIM xim;
1342 XPoint spot; 1307 XPoint spot;
1343 XRectangle rect, status_rect, needed_rect; 1308 XRectangle rect, status_rect, needed_rect;
1344 unsigned long fg, bg; 1309 unsigned long fg, bg;
1345 const char *p; 1310 const char *p;
1346 char **s; 1311 char **s;
1347 XIMStyles *xim_styles; 1312 XIMStyles *xim_styles;
1348#ifdef ENABLE_XIM_ONTHESPOT
1349 XIMCallback xcb[4];
1350#endif
1351 1313
1352 set_environ (envv); 1314 set_environ (envv);
1353 1315
1354 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1316 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1355 return false; 1317 return false;
… …
1376 p = pet[pi]; 1338 p = pet[pi];
1377 1339
1378 if (!p) 1340 if (!p)
1379 continue; 1341 continue;
1380 1342
1381 s = rxvt_splitcommastring (p); 1343 s = rxvt_strsplit (',', p);
1382 1344
1383 for (i = found = 0; !found && s[i]; i++) 1345 for (i = found = 0; !found && s[i]; i++)
1384 { 1346 {
1385 if (!strcmp (s[i], "OverTheSpot")) 1347 if (!strcmp (s[i], "OverTheSpot"))
1386 input_style = XIMPreeditPosition | XIMStatusNothing; 1348 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1398 input_style = XIMPreeditNothing | XIMStatusNothing; 1360 input_style = XIMPreeditNothing | XIMStatusNothing;
1399 1361
1400 for (j = 0; j < xim_styles->count_styles; j++) 1362 for (j = 0; j < xim_styles->count_styles; j++)
1401 if (input_style == xim_styles->supported_styles[j]) 1363 if (input_style == xim_styles->supported_styles[j])
1402 { 1364 {
1403 rxvt_freecommastring (s); 1365 rxvt_free_strsplit (s);
1404 1366
1405 found = 1; 1367 found = 1;
1406 goto foundpet; 1368 goto foundpet;
1407 } 1369 }
1408 1370
1409 } 1371 }
1410 1372
1411 rxvt_freecommastring (s); 1373 rxvt_free_strsplit (s);
1412 } 1374 }
1413 1375
1414foundpet: 1376foundpet:
1415 1377
1416 XFree (xim_styles); 1378 XFree (xim_styles);
… …
1495 NULL); 1457 NULL);
1496 } 1458 }
1497#if ENABLE_XIM_ONTHESPOT 1459#if ENABLE_XIM_ONTHESPOT
1498 else if (input_style & XIMPreeditCallbacks) 1460 else if (input_style & XIMPreeditCallbacks)
1499 { 1461 {
1462 XIMCallback xcb[4];
1463
1500 im_set_position (spot); 1464 im_set_position (spot);
1501 1465
1502 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1466 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1503 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1467 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1504 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1468 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1519#endif 1483#endif
1520 1484
1521 Input_Context = XCreateIC (xim, 1485 Input_Context = XCreateIC (xim,
1522 XNInputStyle, input_style, 1486 XNInputStyle, input_style,
1523 XNClientWindow, vt, 1487 XNClientWindow, vt,
1524 XNFocusWindow, parent[0], 1488 XNFocusWindow, parent,
1525 preedit_attr ? XNPreeditAttributes : NULL, 1489 preedit_attr ? XNPreeditAttributes : NULL,
1526 preedit_attr, 1490 preedit_attr,
1527 status_attr ? XNStatusAttributes : NULL, 1491 status_attr ? XNStatusAttributes : NULL,
1528 status_attr, NULL); 1492 status_attr, NULL);
1529 1493
1530 if (preedit_attr) XFree (preedit_attr); 1494 if (preedit_attr) XFree (preedit_attr);
1531 if (status_attr) XFree (status_attr); 1495 if (status_attr) XFree (status_attr);
1532 if (fs) XFreeFontSet (dpy, fs); 1496 if (fs) XFreeFontSet (dpy, fs);
1533 1497
1534 if (Input_Context == NULL) 1498 if (Input_Context == NULL)
1535 { 1499 {
1536 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1500 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1537 im_destroy (); 1501 im_destroy ();
… …
1542 // unfortunately, only the focus window is used by XIM, hard to fix 1506 // unfortunately, only the focus window is used by XIM, hard to fix
1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1507 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1544 vt_select_input (); 1508 vt_select_input ();
1545#endif 1509#endif
1546 1510
1547 if (input_style & XIMPreeditArea) 1511 im_set_position ();
1548 IMSetStatusPosition ();
1549 1512
1550 return true; 1513 return true;
1551} 1514}
1552 1515
1553void 1516void
… …
1563 im_destroy (); 1526 im_destroy ();
1564 1527
1565 if (Input_Context) 1528 if (Input_Context)
1566 return; 1529 return;
1567 1530
1568#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1569 if (rs[Rs_imLocale]) 1531 if (rs[Rs_imLocale])
1570 SET_LOCALE (rs[Rs_imLocale]); 1532 SET_LOCALE (rs[Rs_imLocale]);
1571#endif
1572 1533
1573 p = rs[Rs_inputMethod]; 1534 p = rs[Rs_inputMethod];
1574 if (p && *p) 1535 if (p && *p)
1575 { 1536 {
1576 bool found = false; 1537 bool found = false;
1577 1538
1578 s = rxvt_splitcommastring (p); 1539 s = rxvt_strsplit (',', p);
1579 1540
1580 for (i = 0; s[i]; i++) 1541 for (i = 0; s[i]; i++)
1581 { 1542 {
1582 if (*s[i]) 1543 if (*s[i])
1583 { 1544 {
1584 strcpy (buf, "@im="); 1545 strcpy (buf, "@im=");
1585 strncat (buf, s[i], IMBUFSIZ - 5); 1546 strncat (buf, s[i], IMBUFSIZ - 5);
1586 if (IM_get_IC (buf)) 1547 if (im_get_ic (buf))
1587 { 1548 {
1588 found = true; 1549 found = true;
1589 break; 1550 break;
1590 } 1551 }
1591 } 1552 }
1592 } 1553 }
1593 1554
1594 rxvt_freecommastring (s); 1555 rxvt_free_strsplit (s);
1595 1556
1596 if (found) 1557 if (found)
1597 goto done; 1558 goto done;
1598 } 1559 }
1599 1560
1600 /* try with XMODIFIERS env. var. */ 1561 /* try with XMODIFIERS env. var. */
1601 if (IM_get_IC ("")) 1562 if (im_get_ic (""))
1602 goto done; 1563 goto done;
1603 1564
1604 /* try with no modifiers base IF the user didn't specify an IM */ 1565 /* try with no modifiers base IF the user didn't specify an IM */
1605 if (IM_get_IC ("@im=none")) 1566 if (im_get_ic ("@im=none"))
1606 goto done; 1567 goto done;
1607 1568
1608done: 1569done: ;
1609#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1610 if (rs[Rs_imLocale]) 1570 if (rs[Rs_imLocale])
1611 SET_LOCALE (locale); 1571 SET_LOCALE (locale);
1612#endif
1613} 1572}
1614 1573
1615void 1574void
1616rxvt_term::IMSetStatusPosition () 1575rxvt_term::im_set_position ()
1617{ 1576{
1618 XRectangle preedit_rect, status_rect, *needed_rect; 1577 XRectangle preedit_rect, status_rect, *needed_rect;
1619 XVaNestedList preedit_attr, status_attr; 1578 XVaNestedList preedit_attr, status_attr;
1620 1579
1621 if (!Input_Context 1580 if (!Input_Context
1622 || !focus 1581 || !focus
1623 || !(input_style & XIMPreeditArea) 1582 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1624 || !IMisRunning ()) 1583 || !im_is_running ())
1625 return; 1584 return;
1626 1585
1586 if (input_style & XIMPreeditPosition)
1587 {
1588 im_set_size (preedit_rect);
1589 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1590
1591 XSetICValues (Input_Context,
1592 XNPreeditAttributes, preedit_attr, NULL);
1593 }
1594 else
1595 {
1627 /* Getting the necessary width of preedit area */ 1596 /* Getting the necessary width of preedit area */
1628 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1597 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1629 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1598 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1630 XFree (status_attr); 1599 XFree (status_attr);
1631 1600
1632 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1601 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1633 XFree (needed_rect); 1602 XFree (needed_rect);
1634 1603
1635 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1604 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1636 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1605 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1637 1606
1638 XSetICValues (Input_Context, 1607 XSetICValues (Input_Context,
1639 XNPreeditAttributes, preedit_attr, 1608 XNPreeditAttributes, preedit_attr,
1640 XNStatusAttributes, status_attr, NULL); 1609 XNStatusAttributes, status_attr,
1610 NULL);
1641 1611
1612 XFree (status_attr);
1613 }
1614
1642 XFree (preedit_attr); 1615 XFree (preedit_attr);
1643 XFree (status_attr);
1644} 1616}
1645#endif /* USE_XIM */ 1617#endif /* USE_XIM */
1618
1619void
1620rxvt_term::get_window_origin (int &x, int &y)
1621{
1622 Window cr;
1623 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1624}
1625
1626Pixmap
1627rxvt_term::get_pixmap_property (Atom property)
1628{
1629 Pixmap pixmap = None;
1630
1631 int aformat;
1632 unsigned long nitems, bytes_after;
1633 Atom atype;
1634 unsigned char *prop;
1635 int result = XGetWindowProperty (dpy, display->root, property,
1636 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1637 &nitems, &bytes_after, &prop);
1638 if (result == Success)
1639 {
1640 if (atype == XA_PIXMAP)
1641 pixmap = *(Pixmap *)prop;
1642 XFree (prop);
1643 }
1644
1645 return pixmap;
1646}
1647
1648#ifdef HAVE_BG_PIXMAP
1649
1650void
1651rxvt_term::update_background ()
1652{
1653 if (update_background_ev.is_active ())
1654 return;
1655
1656 bg_invalidate ();
1657
1658 if (!mapped)
1659 return;
1660
1661 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1662
1663 if (to_wait <= 0.)
1664 bg_render ();
1665 else
1666 update_background_ev.start (to_wait);
1667}
1668
1669void
1670rxvt_term::update_background_cb (ev::timer &w, int revents)
1671{
1672 make_current ();
1673
1674 update_background_ev.stop ();
1675 bg_render ();
1676 refresh_check ();
1677}
1678
1679#endif /* HAVE_BG_PIXMAP */
1646 1680
1647/*----------------------- end-of-file (C source) -----------------------*/ 1681/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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