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.185 by root, Tue Jan 17 15:17:39 2006 UTC vs.
Revision 1.303 by ayin, Sun Jan 27 22:48:33 2008 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-2008 Marc Lehmann <pcg@goof.com>
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.
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
49#endif 51# endif
50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
52static uid_t saved_euid;
53static gid_t saved_egid;
54#endif 52#endif
53
54vector<rxvt_term *> rxvt_term::termlist;
55
56// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term;
58
59static char curlocale[128], savelocale[128];
55 60
56bool 61bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 62rxvt_set_locale (const char *locale) NOTHROW
72{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
73 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
74 return false; 70 return false;
75 71
76 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
77 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
78 return true; 74 return true;
79} 75}
80 76
81void 77void
82rxvt_push_locale (const char *locale) 78rxvt_push_locale (const char *locale) NOTHROW
83{ 79{
84 strcpy (savelocale, curlocale); 80 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 81 rxvt_set_locale (locale);
86} 82}
87 83
88void 84void
89rxvt_pop_locale () 85rxvt_pop_locale () NOTHROW
90{ 86{
91 rxvt_set_locale (savelocale); 87 rxvt_set_locale (savelocale);
92} 88}
93 89
94#if ENABLE_COMBINING 90#if ENABLE_COMBINING
95class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
96 92
97text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
98{ 94{
99 compose_char *cc; 95 compose_char *cc;
100 96
101 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
102 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
103 cc = (*this)[c1]; 99 cc = (*this)[c1];
104 while (cc) 100 while (cc)
105 { 101 {
154 150
155} 151}
156#endif 152#endif
157 153
158rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
159 : 155{
160#if TRANSPARENT 156#if HAVE_BG_PIXMAP
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
162#endif
163#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 158#endif
166#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
168#endif 161#endif
169#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
170 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
171#endif 164#endif
172#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
173 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
174#endif 167#endif
175#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
176 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
177#endif 170#endif
178#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
179 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
180#endif 180#endif
181#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
182 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
183#endif 183#endif
184#ifdef USE_XIM 184#ifndef NO_BELL
185 im_ev (this, &rxvt_term::im_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
186#endif 186#endif
187 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 incr_ev (this, &rxvt_term::incr_cb) 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194{ 194
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 196
197 termlist.push_back (this); 197 termlist.push_back (this);
198 198
199#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif 201#endif
205} 202}
206 203
207// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
208// for use before an emergency exit 205// for use before an emergency exit
206void
209void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
210{ 208{
211 if (cmd_pid) 209 if (cmd_pid)
212 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
213 211
214#ifdef UTMP_SUPPORT 212 pty_ev.stop ();
215 privileged_utmp (RESTORE);
216#endif
217
218 delete pty; pty = 0; 213 delete pty; pty = 0;
219} 214}
220 215
221rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
222{ 217{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225 termlist.erase (find (termlist.begin (), termlist.end(), this)); 218 termlist.erase (find (termlist.begin (), termlist.end(), this));
226 219
227 emergency_cleanup (); 220 emergency_cleanup ();
228 221
229#if ENABLE_STYLES 222#if ENABLE_STYLES
231 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
232 delete fontset[i]; 225 delete fontset[i];
233#endif 226#endif
234 delete fontset[0]; 227 delete fontset[0];
235 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232
236 if (display) 233 if (display)
237 { 234 {
238 dDisp;
239
240 selection_clear (); 235 selection_clear ();
241 236
242#ifdef USE_XIM 237#ifdef USE_XIM
243 im_destroy (); 238 im_destroy ();
244#endif 239#endif
245#ifdef XTERM_SCROLLBAR 240#ifdef XTERM_SCROLLBAR
246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 241 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
247 if (ShadowGC) XFreeGC (disp, ShadowGC); 242 if (ShadowGC) XFreeGC (dpy, ShadowGC);
248#endif 243#endif
249#ifdef PLAIN_SCROLLBAR 244#ifdef PLAIN_SCROLLBAR
250 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 245 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
251#endif 246#endif
252#ifdef NEXT_SCROLLBAR 247#ifdef NEXT_SCROLLBAR
253 if (blackGC) XFreeGC (disp, blackGC); 248 if (blackGC) XFreeGC (dpy, blackGC);
254 if (whiteGC) XFreeGC (disp, whiteGC); 249 if (whiteGC) XFreeGC (dpy, whiteGC);
255 if (grayGC) XFreeGC (disp, grayGC); 250 if (grayGC) XFreeGC (dpy, grayGC);
256 if (darkGC) XFreeGC (disp, darkGC); 251 if (darkGC) XFreeGC (dpy, darkGC);
257 if (stippleGC) XFreeGC (disp, stippleGC); 252 if (stippleGC) XFreeGC (dpy, stippleGC);
258 if (dimple) XFreePixmap (disp, dimple); 253 if (dimple) XFreePixmap (dpy, dimple);
259 if (upArrow) XFreePixmap (disp, upArrow); 254 if (upArrow) XFreePixmap (dpy, upArrow);
260 if (downArrow) XFreePixmap (disp, downArrow); 255 if (downArrow) XFreePixmap (dpy, downArrow);
261 if (upArrowHi) XFreePixmap (disp, upArrowHi); 256 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
262 if (downArrowHi) XFreePixmap (disp, downArrowHi); 257 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
263#endif 258#endif
264#ifdef RXVT_SCROLLBAR 259#ifdef RXVT_SCROLLBAR
265 if (topShadowGC) XFreeGC (disp, topShadowGC); 260 if (topShadowGC) XFreeGC (dpy, topShadowGC);
266 if (botShadowGC) XFreeGC (disp, botShadowGC); 261 if (botShadowGC) XFreeGC (dpy, botShadowGC);
267 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 262 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
268#endif 263#endif
269 if (gc) XFreeGC (disp, gc); 264 if (gc) XFreeGC (dpy, gc);
270 265
271 delete drawable; 266 delete drawable;
272 // destroy all windows 267 // destroy all windows
273 if (parent[0]) 268 if (parent[0])
274 XDestroyWindow (disp, parent[0]); 269 XDestroyWindow (dpy, parent[0]);
275 }
276 270
277 // TODO: free pixcolours, colours should become part of rxvt_display 271 for (int i = 0; i < TOTAL_COLORS; i++)
278 delete pix_colors_focused; 272 if (ISSET_PIXCOLOR (i))
273 {
274 pix_colors_focused [i].free (this);
279#if OFF_FOCUS_FADING 275#if OFF_FOCUS_FADING
280 delete pix_colors_unfocused; 276 pix_colors_unfocused [i].free (this);
281#endif 277#endif
278 }
282 279
280 clear ();
281
282 display->flush (); /* ideally .put should do this */
283 displays.put (display); 283 displays.put (display);
284 }
284 285
285 scr_release (); 286 scr_release ();
286 287
287 /* clear all resources */ 288 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 289 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 290 free (allocated [i]);
290 291
291 free (selection.text); 292 free (selection.text);
292 // TODO: manage env vars in child only(!) 293 // TODO: manage env vars in child only(!)
293 free (env_windowid);
294 free (env_display); 294 free (env_display);
295 free (env_term); 295 free (env_term);
296 free (env_colorfgbg);
297 free (locale); 296 free (locale);
298 free (v_buffer); 297 free (v_buffer);
299 free (incr_buf); 298 free (incr_buf);
300 299
301 delete envv; 300 delete envv;
302 delete argv; 301 delete argv;
303 302
304#ifdef KEYSYM_RESOURCE 303#ifdef KEYSYM_RESOURCE
305 delete keyboard; 304 delete keyboard;
306#endif 305#endif
306#ifndef NO_RESOURCES
307 XrmDestroyDatabase (option_db);
308#endif
307} 309}
308 310
311// child has exited, usually destroys
309void 312void
310rxvt_term::child_exit () 313rxvt_term::child_cb (ev::child &w, int status)
311{ 314{
315 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
316
312 cmd_pid = 0; 317 cmd_pid = 0;
313 318
314 if (!OPTION (Opt_hold)) 319 if (!option (Opt_hold))
315 destroy (); 320 destroy ();
316} 321}
317 322
318void 323void
319rxvt_term::destroy () 324rxvt_term::destroy ()
320{ 325{
321 if (destroy_ev.active) 326 if (destroy_ev.is_active ())
322 return; 327 return;
328
329 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323 330
324#if ENABLE_OVERLAY 331#if ENABLE_OVERLAY
325 scr_overlay_off (); 332 scr_overlay_off ();
326#endif 333#endif
327 334
328 if (display) 335 if (display)
329 { 336 {
330#if USE_XIM 337#if USE_XIM
331 im_ev.stop (display); 338 im_ev.stop (display);
332#endif 339#endif
333#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 340 scrollbar_ev.stop (display);
335#endif 341#if ENABLE_TRANSPARENCY || ENABLE_PERL
336#if TRANSPARENT
337 rootwin_ev.stop (display); 342 rootwin_ev.stop (display);
338#endif 343#endif
339 incr_ev.stop (); 344 incr_ev.stop ();
340 termwin_ev.stop (display); 345 termwin_ev.stop (display);
341 vt_ev.stop (display); 346 vt_ev.stop (display);
342 } 347 }
343 348
344 check_ev.stop (); 349 flush_ev.stop ();
345 pty_ev.stop (); 350 pty_ev.stop ();
346#ifdef CURSOR_BLINK 351#ifdef CURSOR_BLINK
347 cursor_blink_ev.stop (); 352 cursor_blink_ev.stop ();
348#endif 353#endif
349#ifdef TEXT_BLINK 354#ifdef TEXT_BLINK
357#endif 362#endif
358#ifdef POINTER_BLANK 363#ifdef POINTER_BLANK
359 pointer_ev.stop (); 364 pointer_ev.stop ();
360#endif 365#endif
361 366
362 destroy_ev.start (0); 367 destroy_ev.start ();
363} 368}
364 369
365void 370void
366rxvt_term::destroy_cb (time_watcher &w) 371rxvt_term::destroy_cb (ev::idle &w, int revents)
367{ 372{
368 make_current (); 373 make_current ();
369 374
370 delete this; 375 delete this;
371} 376}
382{ 387{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
385} 390}
386 391
387#if ENABLE_FRILLS 392#if !ENABLE_MINIMAL
388static void 393static void
389print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
390{ 395{
391 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
392 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
425 else 430 else
426 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427 mesg, BUFSIZ); 432 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429 } 434 }
430 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431 mesg, BUFSIZ); 436 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433} 438}
434#endif 439#endif
435 440
440 GET_R->allowedxerror = event->error_code; 445 GET_R->allowedxerror = event->error_code;
441 else 446 else
442 { 447 {
443 // GET_R is most likely not the terminal which caused the error, 448 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue 449 // so just output the error and continue
445#if ENABLE_FRILLS 450#if ENABLE_MINIMAL
451 old_xerror_handler (display, event);
452#else
446 print_x_error (display, event); 453 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif 454#endif
450 } 455 }
451 456
452 return 0; 457 return 0;
453} 458}
459 DisplayString (display)); 464 DisplayString (display));
460 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
461 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
462} 467}
463 468
464/*----------------------------------------------------------------------*/
465bool
466rxvt_term::init (int argc, const char *const *argv)
467{
468 SET_R (this);
469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
471
472 if (!init_vars ())
473 return false;
474
475 init_secondary ();
476
477 const char **cmd_argv = init_resources (argc, argv);
478
479#ifdef KEYSYM_RESOURCE
480 keyboard->register_done ();
481#endif
482
483#ifdef HAVE_SCROLLBARS
484 if (OPTION (Opt_scrollBar))
485 scrollBar.setIdle (); /* set existence for size calculations */
486#endif
487
488#if ENABLE_PERL
489 if (!rs[Rs_perl_ext_1])
490 rs[Rs_perl_ext_1] = "default";
491
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
509 rxvt_perl.init (this);
510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511 }
512#endif
513
514 pty = rxvt_new_ptytty ();
515
516 create_windows (argc, argv);
517
518 dDisp;
519
520 init_xlocale ();
521
522 scr_reset (); // initialize screen
523
524#if 0
525 XSynchronize (disp, True);
526#endif
527
528#ifdef HAVE_SCROLLBARS
529 if (OPTION (Opt_scrollBar))
530 resize_scrollbar (); /* create and map scrollbar */
531#endif
532#ifdef TRANSPARENT
533 if (OPTION (Opt_transparent))
534 {
535 XSelectInput (disp, display->root, PropertyChangeMask);
536 check_our_parents ();
537 rootwin_ev.start (display, display->root);
538 }
539#endif
540
541 XMapWindow (disp, vt);
542 XMapWindow (disp, parent[0]);
543
544 set_colorfgbg ();
545
546 init_command (cmd_argv);
547
548 free (cmd_argv);
549
550 if (pty->pty >= 0)
551 pty_ev.start (pty->pty, EVENT_READ);
552
553 check_ev.start ();
554
555 HOOK_INVOKE ((this, HOOK_START, DT_END));
556
557 return true;
558}
559
560static struct sig_handlers 469static struct sig_handlers
561{ 470{
562 sig_watcher sw_chld, sw_term, sw_int; 471 ev::sig sw_term, sw_int;
563
564 void sig_chld (sig_watcher &w)
565 {
566 // we are being called for every SIGCHLD, find the corresponding term
567 int pid;
568
569 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
570 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
571 if (pid == (*t)->cmd_pid)
572 {
573 (*t)->child_exit ();
574 break;
575 }
576 }
577 472
578 /* 473 /*
579 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
580 */ 475 */
581 void 476 void sig_term (ev::sig &w, int revents);
582 sig_term (sig_watcher &w) 477
478 sig_handlers ()
583 { 479 {
584#ifdef DEBUG_CMD
585 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586#endif
587 rxvt_emergency_cleanup ();
588 signal (w.signum, SIG_DFL);
589 kill (getpid (), w.signum);
590 }
591
592 sig_handlers ()
593 : sw_chld (this, &sig_handlers::sig_chld),
594 sw_term (this, &sig_handlers::sig_term), 480 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
595 sw_int (this, &sig_handlers::sig_term) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
596 {
597 } 482 }
598} sig_handlers; 483} sig_handlers;
599 484
485void
486sig_handlers::sig_term (ev::sig &w, int revents)
487{
488 rxvt_emergency_cleanup ();
489 w.stop ();
490 kill (getpid (), w.signum);
491}
492
600char **rxvt_environ; // startup environment 493char **rxvt_environ; // startup environment
601 494
602void 495void
603rxvt_init () 496rxvt_init ()
604{ 497{
498 ptytty::init ();
499
500 if (!ev_default_loop (0))
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502
605 rxvt_environ = environ; 503 rxvt_environ = environ;
606
607 /*
608 * Save and then give up any super-user privileges
609 * If we need privileges in any area then we must specifically request it.
610 * We should only need to be root in these cases:
611 * 1. write utmp entries on some systems
612 * 2. chown tty on some systems
613 */
614 rxvt_privileges (SAVE);
615 rxvt_privileges (IGNORE);
616 504
617 signal (SIGHUP, SIG_IGN); 505 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 506 signal (SIGPIPE, SIG_IGN);
619 507
620 sig_handlers.sw_chld.start (SIGCHLD);
621 sig_handlers.sw_term.start (SIGTERM); 508 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
622 sig_handlers.sw_int.start (SIGINT); 509 sig_handlers.sw_int.start (SIGINT); ev_unref ();
623 510
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 512 /* signal (SIGURG, SIG_DFL); */
626 513
627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
629 XSetIOErrorHandler (rxvt_xioerror_handler); 516 XSetIOErrorHandler (rxvt_xioerror_handler);
630 517
631 XrmInitialize (); 518 XrmInitialize ();
632} 519}
633 520
634/* ------------------------------------------------------------------------- *
635 * MEMORY ALLOCATION WRAPPERS *
636 * ------------------------------------------------------------------------- */
637void *
638rxvt_malloc (size_t size)
639{
640 void *p = malloc (size);
641
642 if (!p)
643 rxvt_fatal ("memory allocation failure. aborting.\n");
644
645 return p;
646}
647
648void *
649rxvt_calloc (size_t number, size_t size)
650{
651 void *p = calloc (number, size);
652
653 if (!p)
654 rxvt_fatal ("memory allocation failure. aborting.\n");
655
656 return p;
657}
658
659void *
660rxvt_realloc (void *ptr, size_t size)
661{
662 void *p = realloc (ptr, size);
663
664 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n");
666
667 return p;
668}
669
670/* ------------------------------------------------------------------------- *
671 * PRIVILEGED OPERATIONS *
672 * ------------------------------------------------------------------------- */
673/* take care of suid/sgid super-user (root) privileges */
674void
675rxvt_privileges (rxvt_privaction action)
676{
677#if ! defined(__CYGWIN32__)
678# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
679 /* setreuid () is the poor man's setuid (), seteuid () */
680# define seteuid(a) setreuid(-1, (a))
681# define setegid(a) setregid(-1, (a))
682# define HAVE_SETEUID
683# endif
684# ifdef HAVE_SETEUID
685 switch (action)
686 {
687 case IGNORE:
688 /*
689 * change effective uid/gid - not real uid/gid - so we can switch
690 * back to root later, as required
691 */
692 setegid (getgid ());
693 seteuid (getuid ());
694 break;
695 case SAVE:
696 saved_egid = getegid ();
697 saved_euid = geteuid ();
698 break;
699 case RESTORE:
700 setegid (saved_egid);
701 seteuid (saved_euid);
702 break;
703 }
704# else
705 switch (action)
706 {
707 case IGNORE:
708 setgid (getgid ());
709 setuid (getuid ());
710 /* FALLTHROUGH */
711 case SAVE:
712 /* FALLTHROUGH */
713 case RESTORE:
714 break;
715 }
716# endif
717#endif
718}
719
720/*----------------------------------------------------------------------*/ 521/*----------------------------------------------------------------------*/
721/* 522/*
722 * window size/position calculcations for XSizeHint and other storage. 523 * window size/position calculations for XSizeHint and other storage.
723 * if width/height are non-zero then override calculated width/height 524 * if width/height are non-zero then override calculated width/height
724 */ 525 */
725void 526void
726rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 527rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
727{ 528{
728 short recalc_x, recalc_y; 529 short recalc_x, recalc_y;
729 int x, y, sb_w, flags; 530 int x, y, sb_w, flags;
730 unsigned int w, h; 531 unsigned int w, h;
731 unsigned int max_width, max_height; 532 unsigned int max_width, max_height;
732 dDisp;
733
734 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
735 ncol, nrow, szHint.width, szHint.height));
736 533
737 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
738 szHint.win_gravity = NorthWestGravity; 535 szHint.win_gravity = NorthWestGravity;
739 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 536 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
740 537
802 599
803 if (scrollBar.state) 600 if (scrollBar.state)
804 { 601 {
805 sb_w = scrollbar_TotalWidth (); 602 sb_w = scrollbar_TotalWidth ();
806 szHint.base_width += sb_w; 603 szHint.base_width += sb_w;
604
807 if (!OPTION (Opt_scrollBar_right)) 605 if (!option (Opt_scrollBar_right))
808 window_vt_x += sb_w; 606 window_vt_x += sb_w;
809 } 607 }
810 608
811 szHint.width_inc = fwidth; 609 szHint.width_inc = fwidth;
812 szHint.height_inc = fheight; 610 szHint.height_inc = fheight;
813 szHint.min_width = szHint.base_width + szHint.width_inc; 611 szHint.min_width = szHint.base_width + szHint.width_inc;
814 szHint.min_height = szHint.base_height + szHint.height_inc; 612 szHint.min_height = szHint.base_height + szHint.height_inc;
815 613
816 if (newwidth && newwidth - szHint.base_width < max_width) 614 if (newwidth && newwidth - szHint.base_width < max_width)
817 { 615 {
818 szHint.width = newwidth; 616 szHint.width = newwidth;
833 { 631 {
834 min_it (height, max_height); 632 min_it (height, max_height);
835 szHint.height = szHint.base_height + height; 633 szHint.height = szHint.base_height + height;
836 } 634 }
837 635
838 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 636 if (scrollBar.state && option (Opt_scrollBar_right))
839 window_sb_x = szHint.width - sb_w; 637 window_sb_x = szHint.width - sb_w;
840 638
841 if (recalc_x) 639 if (recalc_x)
842 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 640 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
641
843 if (recalc_y) 642 if (recalc_y)
844 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 643 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
845 644
846 ncol = width / fwidth; 645 ncol = width / fwidth;
847 nrow = height / fheight; 646 nrow = height / fheight;
848 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
849 ncol, nrow, szHint.width,
850 szHint.height));
851 return;
852} 647}
853 648
854/*----------------------------------------------------------------------*/ 649/*----------------------------------------------------------------------*/
855/* 650/*
856 * Tell the teletype handler what size the window is. 651 * Tell the teletype handler what size the window is.
869 ws.ws_xpixel = width; 664 ws.ws_xpixel = width;
870 ws.ws_ypixel = height; 665 ws.ws_ypixel = height;
871 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 666 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
872 667
873#if 0 668#if 0
874 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 669 // TIOCSWINSZ is supposed to do this automatically and correctly
875 if (cmd_pid) /* force through to the command */ 670 if (cmd_pid) /* force through to the command */
876 kill (-cmd_pid, SIGWINCH); 671 kill (-cmd_pid, SIGWINCH);
877#endif 672#endif
878} 673}
879 674
908 delete fontset[0]; 703 delete fontset[0];
909 fontset[0] = fs; 704 fontset[0] = fs;
910 705
911 prop = (*fs)[1]->properties (); 706 prop = (*fs)[1]->properties ();
912 prop.height += lineSpace; 707 prop.height += lineSpace;
708
913 fs->set_prop (prop); 709 fs->set_prop (prop, false);
914 710
915 fwidth = prop.width; 711 fwidth = prop.width;
916 fheight = prop.height; 712 fheight = prop.height;
917 fbase = prop.ascent; 713 fbase = prop.ascent;
918 714
927 { 723 {
928 fontset[style] = fs = new rxvt_fontset (this); 724 fontset[style] = fs = new rxvt_fontset (this);
929 rxvt_fontprop prop2 = prop; 725 rxvt_fontprop prop2 = prop;
930 726
931 if (res) 727 if (res)
932 prop2.weight = prop2.slant = rxvt_fontprop::unset; 728 {
729 fs->populate (res);
730 fs->set_prop (prop2, false);
731 }
933 else 732 else
934 { 733 {
935 res = fontset[0]->fontdesc; 734 fs->populate (fontset[0]->fontdesc);
936 735
937 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 736 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
938 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 737 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
738
739 fs->set_prop (prop2, true);
939 } 740 }
940 741
941 fs->populate (res);
942 fs->set_prop (prop2);
943 } 742 }
944#else 743#else
945 fontset[style] = fontset[0]; 744 fontset[style] = fontset[0];
946#endif 745#endif
947 } 746 }
949 if (parent[0]) 748 if (parent[0])
950 { 749 {
951 resize_all_windows (0, 0, 0); 750 resize_all_windows (0, 0, 0);
952 scr_remap_chars (); 751 scr_remap_chars ();
953 scr_touch (true); 752 scr_touch (true);
954 } 753 }
955 754
956 return true; 755 return true;
957} 756}
958 757
758void
959void rxvt_term::set_string_property (Atom prop, const char *str, int len) 759rxvt_term::set_string_property (Atom prop, const char *str, int len)
960{ 760{
961 XChangeProperty (display->display, parent[0], 761 XChangeProperty (dpy, parent[0],
962 prop, XA_STRING, 8, PropModeReplace, 762 prop, XA_STRING, 8, PropModeReplace,
963 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 763 (const unsigned char *)str, len >= 0 ? len : strlen (str));
964} 764}
965 765
766void
966void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 767rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
967{ 768{
968 wchar_t *ws = rxvt_mbstowcs (str, len); 769 wchar_t *ws = rxvt_mbstowcs (str, len);
969 char *s = rxvt_wcstoutf8 (ws); 770 char *s = rxvt_wcstoutf8 (ws);
970 771
971 XChangeProperty (display->display, parent[0], 772 XChangeProperty (dpy, parent[0],
972 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 773 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
973 (const unsigned char *)s, strlen (s)); 774 (const unsigned char *)s, strlen (s));
974 775
975 free (s); 776 free (s);
976 free (ws); 777 free (ws);
995#if ENABLE_EWMH 796#if ENABLE_EWMH
996 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 797 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
997#endif 798#endif
998} 799}
999 800
801void
802rxvt_term::set_window_color (int idx, const char *color)
803{
1000#ifdef XTERM_COLOR_CHANGE 804#ifdef XTERM_COLOR_CHANGE
1001void
1002rxvt_term::set_window_color (int idx, const char *color)
1003{
1004 rxvt_color xcol; 805 rxvt_color xcol;
1005 int i; 806 int i;
1006 807
1007 if (color == NULL || *color == '\0') 808 if (color == NULL || *color == '\0')
1008 return; 809 return;
1009 810
811 color = strdup (color);
812 allocated.push_back ((void *)color);
813 rs[Rs_color + idx] = color;
814
1010 /* handle color aliases */ 815 /* handle color aliases */
1011 if (isdigit (*color)) 816 if (isdigit (*color))
1012 { 817 {
1013 i = atoi (color); 818 i = atoi (color);
1014 819
1015 if (i >= 8 && i <= 15) 820 if (i >= 8 && i <= 15)
821 {
1016 { /* bright colors */ 822 /* bright colors */
1017 i -= 8;
1018 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 823 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
1019 SET_PIXCOLOR (idx);
1020 goto done; 824 goto done;
1021 } 825 }
1022 826
1023 if (i >= 0 && i <= 7) 827 if (i >= 0 && i <= 7)
828 {
1024 { /* normal colors */ 829 /* normal colors */
1025 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 830 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1026 SET_PIXCOLOR (idx);
1027 goto done; 831 goto done;
1028 } 832 }
1029 } 833 }
1030 834
1031 if (!rXParseAllocColor (&xcol, color)) 835 set_color (xcol, color);
1032 return;
1033
1034 /* XStoreColor (display->display, display->cmap, XColor*); */
1035 836
1036 /* 837 /*
1037 * FIXME: should free colors here, but no idea how to do it so instead, 838 * FIXME: should free colors here, but no idea how to do it so instead,
1038 * so just keep gobbling up the colormap 839 * so just keep gobbling up the colormap
1039 */ 840 */
1040# if 0
1041 for (i = Color_Black; i <= Color_White; i++)
1042 if (pix_colors[idx] == pix_colors[i])
1043 break;
1044 if (i > Color_White)
1045 {
1046 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1047 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1048 DisplayPlanes (display->display, display->screen));
1049 }
1050# endif
1051 841
1052 pix_colors_focused[idx] = xcol; 842 pix_colors_focused[idx] = xcol;
1053 SET_PIXCOLOR (idx);
1054 843
1055 /* XSetWindowAttributes attr; */
1056 /* Cursor cursor; */
1057done: 844done:
1058
1059#if OFF_FOCUS_FADING
1060 if (rs[Rs_fade])
1061 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1062#endif
1063
1064 /*TODO: handle Color_BD, scrollbar background, etc. */ 845 /*TODO: handle Color_BD, scrollbar background, etc. */
1065 846
847 update_fade_color (idx);
1066 recolour_cursor (); 848 recolour_cursor ();
1067 scr_recolour (); 849 scr_recolour ();
850#endif /* XTERM_COLOR_CHANGE */
1068} 851}
1069
1070#else
1071# define set_window_color (idx,color) ((void)0)
1072#endif /* XTERM_COLOR_CHANGE */
1073 852
1074void 853void
1075rxvt_term::recolour_cursor () 854rxvt_term::recolour_cursor ()
1076{ 855{
1077 XColor xcol[2]; 856 XColor fg, bg;
1078 857
1079 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 858 (ISSET_PIXCOLOR (Color_pointer_fg)
1080 ? pix_colors_focused[Color_pointer_fg] 859 ? pix_colors_focused[Color_pointer_fg]
1081 : pix_colors_focused[Color_fg]; 860 : pix_colors_focused[Color_fg]).get (fg);
861
1082 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 862 (ISSET_PIXCOLOR (Color_pointer_bg)
1083 ? pix_colors_focused[Color_pointer_bg] 863 ? pix_colors_focused[Color_pointer_bg]
1084 : pix_colors_focused[Color_bg]; 864 : pix_colors_focused[Color_bg]).get (bg);
1085 865
1086 XQueryColors (display->display, display->cmap, xcol, 2); 866 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1087 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1088} 867}
1089 868
1090/*----------------------------------------------------------------------*/ 869/*----------------------------------------------------------------------*/
1091/* 870/*
1092 * find if fg/bg matches any of the normal (low-intensity) colors 871 * find if fg/bg matches any of the normal (low-intensity) colors
1093 */ 872 */
1094void 873void
1095rxvt_term::set_colorfgbg () 874rxvt_term::set_colorfgbg ()
1096{ 875{
1097 unsigned int i; 876 unsigned int i;
1098 const char *xpmb = "\0"; 877 const char *xpmb = "";
1099 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1100 879
1101 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1102 strcpy (fstr, "default"); 880 strcpy (fstr, "default");
1103 strcpy (bstr, "default"); 881 strcpy (bstr, "default");
1104 for (i = Color_Black; i <= Color_White; i++) 882 for (i = Color_Black; i <= Color_White; i++)
1105 if (pix_colors[Color_fg] == pix_colors[i]) 883 if (pix_colors[Color_fg] == pix_colors[i])
1106 { 884 {
1110 888
1111 for (i = Color_Black; i <= Color_White; i++) 889 for (i = Color_Black; i <= Color_White; i++)
1112 if (pix_colors[Color_bg] == pix_colors[i]) 890 if (pix_colors[Color_bg] == pix_colors[i])
1113 { 891 {
1114 sprintf (bstr, "%d", (i - Color_Black)); 892 sprintf (bstr, "%d", (i - Color_Black));
1115#ifdef XPM_BACKGROUND 893#ifdef BG_IMAGE_FROM_FILE
1116 xpmb = "default;"; 894 xpmb = "default;";
1117#endif 895#endif
1118 break; 896 break;
1119 } 897 }
1120 898
1121 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 899 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1122} 900}
1123 901
1124/*----------------------------------------------------------------------*/ 902/*----------------------------------------------------------------------*/
1125 903
1126int 904bool
1127rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 905rxvt_term::set_color (rxvt_color &color, const char *name)
1128{ 906{
1129 if (!screen_in_out->set (display, colour)) 907 if (color.set (this, name))
1130 {
1131 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1132 return false;
1133 }
1134
1135 return true; 908 return true;
909
910 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
911 return false;
912}
913
914void
915rxvt_term::alias_color (int dst, int src)
916{
917 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1136} 918}
1137 919
1138/* -------------------------------------------------------------------- * 920/* -------------------------------------------------------------------- *
1139 * - WINDOW RESIZING - * 921 * - WINDOW RESIZING - *
1140 * -------------------------------------------------------------------- */ 922 * -------------------------------------------------------------------- */
1141void 923void
1142rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 924rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1143{ 925{
1144 int fix_screen; 926 int fix_screen;
1145 int old_width = szHint.width, old_height = szHint.height; 927 int old_width = szHint.width;
1146 dDisp; 928 int old_height = szHint.height;
1147 929
1148 window_calc (newwidth, newheight); 930 window_calc (newwidth, newheight);
931
932 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1149 XSetWMNormalHints (disp, parent[0], &szHint); 933 XSetWMNormalHints (dpy, parent[0], &szHint);
1150 934
1151 if (!ignoreparent) 935 if (!ignoreparent)
1152 { 936 {
1153#ifdef SMART_RESIZE 937#ifdef SMART_RESIZE
1154 /* 938 /*
1158 int x, y, x1, y1; 942 int x, y, x1, y1;
1159 int dx, dy; 943 int dx, dy;
1160 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 944 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1161 Window unused_cr; 945 Window unused_cr;
1162 946
1163 XTranslateCoordinates (disp, parent[0], display->root, 947 XTranslateCoordinates (dpy, parent[0], display->root,
1164 0, 0, &x, &y, &unused_cr); 948 0, 0, &x, &y, &unused_cr);
1165 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 949 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1166 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 950 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1167 /* 951 /*
1168 * if display->root isn't the parent window, a WM will probably have offset 952 * if display->root isn't the parent window, a WM will probably have offset
1169 * our position for handles and decorations. Counter it 953 * our position for handles and decorations. Counter it
1170 */ 954 */
1172 { 956 {
1173 x -= x1; 957 x -= x1;
1174 y -= y1; 958 y -= y1;
1175 } 959 }
1176 960
1177 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 961 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1178 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 962 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1179 dx = old_width - szHint.width; 963 dx = old_width - szHint.width;
1180 dy = old_height - szHint.height; 964 dy = old_height - szHint.height;
1181 965
1182 /* Check position of the center of the window */ 966 /* Check position of the center of the window */
1183 if (x < x1) /* left half */ 967 if (x < x1) /* left half */
1184 dx = 0; 968 dx = 0;
1187 if (y < y1) /* top half */ 971 if (y < y1) /* top half */
1188 dy = 0; 972 dy = 0;
1189 else if (y == y1) /* exact center */ 973 else if (y == y1) /* exact center */
1190 dy /= 2; 974 dy /= 2;
1191 975
1192 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 976 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1193 szHint.width, szHint.height); 977 szHint.width, szHint.height);
1194#else 978#else
1195 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 979 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1196#endif 980#endif
1197 } 981 }
1198 982
1199 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 983 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1200 984
1201 if (fix_screen || newwidth != old_width || newheight != old_height) 985 if (fix_screen || newwidth != old_width || newheight != old_height)
1202 { 986 {
1203 if (scrollBar.state) 987 if (scrollBar.state)
1204 { 988 {
1205 XMoveResizeWindow (disp, scrollBar.win, 989 XMoveResizeWindow (dpy, scrollBar.win,
1206 window_sb_x, 0, 990 window_sb_x, 0,
1207 scrollbar_TotalWidth (), szHint.height); 991 scrollbar_TotalWidth (), szHint.height);
1208 resize_scrollbar (); 992 resize_scrollbar ();
1209 } 993 }
1210 994
1211 XMoveResizeWindow (disp, vt, 995 XMoveResizeWindow (dpy, vt,
1212 window_vt_x, window_vt_y, 996 window_vt_x, window_vt_y,
1213 width, height); 997 width, height);
1214 998
999#ifdef HAVE_BG_PIXMAP
1000 if (bgPixmap.window_size_sensitive ())
1001 update_background ();
1002#endif
1003
1215 scr_clear (); 1004 scr_clear ();
1216#ifdef XPM_BACKGROUND
1217 resize_pixmap ();
1218#endif
1219 } 1005 }
1220 1006
1221 if (fix_screen || old_height == 0) 1007 if (fix_screen || old_height == 0)
1222 {
1223 int curr_screen = -1;
1224 int old_ncol = prev_ncol;
1225
1226 /* scr_reset only works on the primary screen */
1227 if (old_height) /* this is not the first time through */
1228 {
1229 unsigned int ocol = ncol;
1230 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1231 curr_screen = scr_change_screen (PRIMARY);
1232 ncol = ocol;
1233 }
1234
1235 scr_reset (); 1008 scr_reset ();
1236 1009
1237 if (curr_screen >= 0) /* this is not the first time through */ 1010 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1238 { 1011 //scr_touch (false);
1239 scr_change_screen (curr_screen);
1240 selection_check (old_ncol != ncol ? 4 : 0);
1241 }
1242 }
1243 1012
1244 old_width = szHint.width; 1013#ifdef HAVE_BG_PIXMAP
1245 old_height = szHint.height; 1014// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1246 1015// if (bgPixmap.pixmap)
1247#ifdef XPM_BACKGROUND
1248 if (pixmap)
1249 scr_touch (false); 1016// scr_touch (false);
1250#endif 1017#endif
1251 1018
1252#ifdef USE_XIM 1019#ifdef USE_XIM
1253 IMSetStatusPosition (); 1020 IMSetPosition ();
1254#endif 1021#endif
1255} 1022}
1256 1023
1257/* 1024/*
1258 * Set the width/height of the vt window in characters. Units are pixels. 1025 * Set the width/height of the vt window in characters. Units are pixels.
1263{ 1030{
1264 XWindowAttributes wattr; 1031 XWindowAttributes wattr;
1265 1032
1266 if (newwidth == 0 || newheight == 0) 1033 if (newwidth == 0 || newheight == 0)
1267 { 1034 {
1268 XGetWindowAttributes (display->display, display->root, &wattr); 1035 XGetWindowAttributes (dpy, display->root, &wattr);
1269 1036
1270 if (newwidth == 0) 1037 if (newwidth == 0)
1271 newwidth = wattr.width - szHint.base_width; 1038 newwidth = wattr.width - szHint.base_width;
1272 if (newheight == 0) 1039 if (newheight == 0)
1273 newheight = wattr.height - szHint.base_height; 1040 newheight = wattr.height - szHint.base_height;
1287#ifdef USE_XIM 1054#ifdef USE_XIM
1288 1055
1289void 1056void
1290rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1057rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1291{ 1058{
1292 fg = pix_colors[Color_fg]; 1059 fg = pix_colors [Color_fg];
1293 bg = pix_colors[Color_bg]; 1060 bg = pix_colors [Color_bg];
1294} 1061}
1295 1062
1296void 1063void
1297rxvt_term::im_set_size (XRectangle &size) 1064rxvt_term::im_set_size (XRectangle &size)
1298{ 1065{
1335 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1102 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1336 1103
1337 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1104 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1338 *p = '\0'; 1105 *p = '\0';
1339 1106
1340 atom = XInternAtom (display->display, server, False); 1107 atom = XInternAtom (dpy, server, False);
1341 win = XGetSelectionOwner (display->display, atom); 1108 win = XGetSelectionOwner (dpy, atom);
1342 1109
1343 if (win != None) 1110 if (win != None)
1344 return True; 1111 return True;
1345 } 1112 }
1346 1113
1353 XPoint nspot; 1120 XPoint nspot;
1354 XVaNestedList preedit_attr; 1121 XVaNestedList preedit_attr;
1355 1122
1356 if (!Input_Context 1123 if (!Input_Context
1357 || !focus 1124 || !focus
1358 || !(input_style & XIMPreeditPosition)) 1125 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1359 return; 1126 return;
1360 1127
1361 im_set_position (nspot); 1128 im_set_position (nspot);
1362 1129
1363 if (nspot.x == spot.x && nspot.y == spot.y) 1130 if (nspot.x == spot.x && nspot.y == spot.y)
1382 input_method = 0; 1149 input_method = 0;
1383 } 1150 }
1384 1151
1385 Input_Context = 0; 1152 Input_Context = 0;
1386} 1153}
1154
1155#ifdef ENABLE_XIM_ONTHESPOT
1156
1157static void
1158xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1159{
1160 ((rxvt_term *)client_data)->make_current ();
1161 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1162}
1163
1164static void
1165xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1166{
1167 ((rxvt_term *)client_data)->make_current ();
1168 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1169}
1170
1171static void
1172xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1173{
1174 rxvt_term *term = (rxvt_term *)client_data;
1175 XIMText *text = call_data->text;
1176
1177 term->make_current ();
1178
1179 if (text)
1180 {
1181 void *str;
1182
1183 if (!text->encoding_is_wchar && text->string.multi_byte)
1184 {
1185 // of course, X makes it ugly again
1186 if (term->rs[Rs_imLocale])
1187 SET_LOCALE (term->rs[Rs_imLocale]);
1188
1189 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1190 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1191
1192 if (term->rs[Rs_imLocale])
1193 SET_LOCALE (term->locale);
1194 }
1195 else
1196 str = (void *)text->string.wide_char;
1197
1198 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1199 DT_INT, call_data->caret,
1200 DT_INT, call_data->chg_first,
1201 DT_INT, call_data->chg_length,
1202 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1203 DT_WCS_LEN, str, str ? (int)text->length : 0,
1204 DT_END));
1205 }
1206 else
1207 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1208 DT_INT, call_data->caret,
1209 DT_INT, call_data->chg_first,
1210 DT_INT, call_data->chg_length,
1211 DT_END));
1212}
1213
1214#if 0
1215static void
1216xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1217{
1218 ((rxvt_term *)client_data)->make_current ();
1219 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1220 DT_INT, call_data->position,
1221 DT_INT, call_data->direction,
1222 DT_INT, call_data->style,
1223 DT_END));
1224}
1225#endif
1226
1227#endif
1387 1228
1388/* 1229/*
1389 * Try to open a XIM with the current modifiers, then see if we can 1230 * Try to open a XIM with the current modifiers, then see if we can
1390 * open a suitable preedit type 1231 * open a suitable preedit type
1391 */ 1232 */
1398 XRectangle rect, status_rect, needed_rect; 1239 XRectangle rect, status_rect, needed_rect;
1399 unsigned long fg, bg; 1240 unsigned long fg, bg;
1400 const char *p; 1241 const char *p;
1401 char **s; 1242 char **s;
1402 XIMStyles *xim_styles; 1243 XIMStyles *xim_styles;
1244#ifdef ENABLE_XIM_ONTHESPOT
1245 XIMCallback xcb[4];
1246#endif
1403 1247
1404 set_environ (envv); 1248 set_environ (envv);
1405 1249
1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1250 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1407 return false; 1251 return false;
1408 1252
1409 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1410 input_method = display->get_xim (locale, modifiers); 1253 input_method = display->get_xim (locale, modifiers);
1411 if (input_method == NULL) 1254 if (input_method == NULL)
1412 return false; 1255 return false;
1413 1256
1414 xim = input_method->xim; 1257 xim = input_method->xim;
1434 s = rxvt_splitcommastring (p); 1277 s = rxvt_splitcommastring (p);
1435 1278
1436 for (i = found = 0; !found && s[i]; i++) 1279 for (i = found = 0; !found && s[i]; i++)
1437 { 1280 {
1438 if (!strcmp (s[i], "OverTheSpot")) 1281 if (!strcmp (s[i], "OverTheSpot"))
1439 input_style = (XIMPreeditPosition | XIMStatusNothing); 1282 input_style = XIMPreeditPosition | XIMStatusNothing;
1440 else if (!strcmp (s[i], "OffTheSpot")) 1283 else if (!strcmp (s[i], "OffTheSpot"))
1441 input_style = (XIMPreeditArea | XIMStatusArea); 1284 input_style = XIMPreeditArea | XIMStatusArea;
1442 else if (!strcmp (s[i], "Root")) 1285 else if (!strcmp (s[i], "Root"))
1443 input_style = (XIMPreeditNothing | XIMStatusNothing); 1286 input_style = XIMPreeditNothing | XIMStatusNothing;
1444 else if (!strcmp (s[i], "None")) 1287 else if (!strcmp (s[i], "None"))
1445 input_style = (XIMPreeditNone | XIMStatusNone); 1288 input_style = XIMPreeditNone | XIMStatusNone;
1289#ifdef ENABLE_XIM_ONTHESPOT
1290 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1291 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1292#endif
1293 else
1294 input_style = XIMPreeditNothing | XIMStatusNothing;
1446 1295
1447 for (j = 0; j < xim_styles->count_styles; j++) 1296 for (j = 0; j < xim_styles->count_styles; j++)
1448 if (input_style == xim_styles->supported_styles[j]) 1297 if (input_style == xim_styles->supported_styles[j])
1449 { 1298 {
1450 rxvt_freecommastring (s); 1299 rxvt_freecommastring (s);
1488 "*", 1337 "*",
1489 fheight, 1338 fheight,
1490 fheight + 1, fheight - 1, 1339 fheight + 1, fheight - 1,
1491 fheight - 2, fheight + 2); 1340 fheight - 2, fheight + 2);
1492 1341
1493 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1342 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1494 &missing_charset_list, &missing_charset_count, &def_string); 1343 &missing_charset_list, &missing_charset_count, &def_string);
1495 1344
1496 if (missing_charset_list) 1345 if (missing_charset_list)
1497 XFreeStringList (missing_charset_list); 1346 XFreeStringList (missing_charset_list);
1498 1347
1539 XNBackground, bg, 1388 XNBackground, bg,
1540 XNArea, &status_rect, 1389 XNArea, &status_rect,
1541 XNFontSet, fs, 1390 XNFontSet, fs,
1542 NULL); 1391 NULL);
1543 } 1392 }
1393#if ENABLE_XIM_ONTHESPOT
1394 else if (input_style & XIMPreeditCallbacks)
1395 {
1396 im_set_position (spot);
1397
1398 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1399 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1400 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1401# if 0
1402 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1403# endif
1404
1405 preedit_attr = XVaCreateNestedList (0,
1406 XNSpotLocation, &spot,
1407 XNPreeditStartCallback, &xcb[0],
1408 XNPreeditDoneCallback , &xcb[1],
1409 XNPreeditDrawCallback , &xcb[2],
1410# if 0
1411 XNPreeditCaretCallback, &xcb[3],
1412# endif
1413 NULL);
1414 }
1415#endif
1544 1416
1545 Input_Context = XCreateIC (xim, 1417 Input_Context = XCreateIC (xim,
1546 XNInputStyle, input_style, 1418 XNInputStyle, input_style,
1547 XNClientWindow, vt, 1419 XNClientWindow, vt,
1548 XNFocusWindow, parent[0], 1420 XNFocusWindow, parent[0],
1550 preedit_attr, 1422 preedit_attr,
1551 status_attr ? XNStatusAttributes : NULL, 1423 status_attr ? XNStatusAttributes : NULL,
1552 status_attr, NULL); 1424 status_attr, NULL);
1553 1425
1554 if (preedit_attr) XFree (preedit_attr); 1426 if (preedit_attr) XFree (preedit_attr);
1555 if (status_attr) XFree (status_attr); 1427 if (status_attr) XFree (status_attr);
1556 if (fs) XFreeFontSet (display->display, fs); 1428 if (fs) XFreeFontSet (dpy, fs);
1557 1429
1558 if (Input_Context == NULL) 1430 if (Input_Context == NULL)
1559 { 1431 {
1560 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1432 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1561 im_destroy (); 1433 im_destroy ();
1562 return false; 1434 return false;
1563 } 1435 }
1564 1436
1565 if (input_style & XIMPreeditArea) 1437#if 0
1438 // unfortunately, only the focus window is used by XIM, hard to fix
1439 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1440 vt_select_input ();
1441#endif
1442
1566 IMSetStatusPosition (); 1443 IMSetPosition ();
1567 1444
1568 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1569 return true; 1445 return true;
1570} 1446}
1571 1447
1572void 1448void
1573rxvt_term::im_cb () 1449rxvt_term::im_cb ()
1579 1455
1580 make_current (); 1456 make_current ();
1581 1457
1582 im_destroy (); 1458 im_destroy ();
1583 1459
1584 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1585 if (Input_Context) 1460 if (Input_Context)
1586 return; 1461 return;
1587 1462
1588#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1463#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1589 if (rs[Rs_imLocale]) 1464 if (rs[Rs_imLocale])
1631 SET_LOCALE (locale); 1506 SET_LOCALE (locale);
1632#endif 1507#endif
1633} 1508}
1634 1509
1635void 1510void
1636rxvt_term::IMSetStatusPosition () 1511rxvt_term::IMSetPosition ()
1637{ 1512{
1638 XRectangle preedit_rect, status_rect, *needed_rect; 1513 XRectangle preedit_rect, status_rect, *needed_rect;
1639 XVaNestedList preedit_attr, status_attr; 1514 XVaNestedList preedit_attr, status_attr;
1640 1515
1641 if (!Input_Context 1516 if (!Input_Context
1642 || !focus 1517 || !focus
1643 || !(input_style & XIMPreeditArea) 1518 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1644 || !IMisRunning ()) 1519 || !IMisRunning ())
1645 return; 1520 return;
1646 1521
1522 if (input_style & XIMPreeditPosition)
1523 {
1524 im_set_size (preedit_rect);
1525 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1526
1527 XSetICValues (Input_Context,
1528 XNPreeditAttributes, preedit_attr, NULL);
1529 }
1530 else
1531 {
1647 /* Getting the necessary width of preedit area */ 1532 /* Getting the necessary width of preedit area */
1648 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1533 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1649 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1534 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1650 XFree (status_attr); 1535 XFree (status_attr);
1651 1536
1652 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1537 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1653 XFree (needed_rect); 1538 XFree (needed_rect);
1654 1539
1655 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1540 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1656 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1541 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1657 1542
1658 XSetICValues (Input_Context, 1543 XSetICValues (Input_Context,
1659 XNPreeditAttributes, preedit_attr, 1544 XNPreeditAttributes, preedit_attr,
1660 XNStatusAttributes, status_attr, NULL); 1545 XNStatusAttributes, status_attr,
1546 NULL);
1661 1547
1548 XFree (status_attr);
1549 }
1550
1662 XFree (preedit_attr); 1551 XFree (preedit_attr);
1663 XFree (status_attr);
1664} 1552}
1665#endif /* USE_XIM */ 1553#endif /* USE_XIM */
1666 1554
1667/*----------------------------------------------------------------------*/ 1555void
1668rxvt_t rxvt_current_term; 1556rxvt_term::get_window_origin (int &x, int &y)
1557{
1558 Window cr;
1559 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1560/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1561}
1562
1563Pixmap
1564rxvt_term::get_pixmap_property (int prop_id)
1565{
1566 if (prop_id > 0 && prop_id < NUM_XA)
1567 if (xa[prop_id])
1568 {
1569 int aformat;
1570 unsigned long nitems, bytes_after;
1571 Atom atype;
1572 unsigned char *prop = NULL;
1573 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1574 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1575 &nitems, &bytes_after, &prop);
1576 if (result == Success && prop && atype == XA_PIXMAP)
1577 return *(Pixmap *)prop;
1578 }
1579
1580 return None;
1581}
1582
1583#ifdef HAVE_BG_PIXMAP
1584# if TRACE_PIXMAPS
1585# undef update_background
1586void
1587rxvt_term::trace_update_background (const char *file, int line)
1588{
1589 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1590 update_background ();
1591}
1592# endif
1593
1594void
1595rxvt_term::update_background ()
1596{
1597 if (update_background_ev.is_active ())
1598 return;
1599
1600 bgPixmap.invalidate ();
1601
1602 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1603
1604 if (to_wait <= 0.)
1605 bgPixmap.render ();
1606 else
1607 update_background_ev.start (to_wait);
1608}
1609
1610void
1611rxvt_term::update_background_cb (ev::timer &w, int revents)
1612{
1613 make_current ();
1614
1615 update_background_ev.stop ();
1616 bgPixmap.render ();
1617 refresh_check ();
1618}
1619
1620#endif /* HAVE_BG_PIXMAP */
1669 1621
1670/*----------------------- end-of-file (C source) -----------------------*/ 1622/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines