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.191 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.296 by sasha, Fri Jan 4 21:25:57 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-2007 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>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
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),
150#endif 176#endif
151#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153#endif 179#endif
154#ifdef CURSOR_BLINK 180#ifdef USE_XIM
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 182#endif
169#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 185#endif
172#ifdef USE_XIM 186#ifndef NO_BELL
173 im_ev (this, &rxvt_term::im_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
174#endif 188#endif
175 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
176 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
177 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
178 check_ev (this, &rxvt_term::check_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
179 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
180 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
181 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
182 incr_ev (this, &rxvt_term::incr_cb) 196
183{
184 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
185 198
186 termlist.push_back (this); 199 termlist.push_back (this);
187 200
188#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
… …
190#endif 203#endif
191} 204}
192 205
193// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
194// for use before an emergency exit 207// for use before an emergency exit
208void
195void rxvt_term::emergency_cleanup () 209rxvt_term::emergency_cleanup ()
196{ 210{
197 if (cmd_pid) 211 if (cmd_pid)
198 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
199 213
214 pty_ev.stop ();
200 delete pty; pty = 0; 215 delete pty; pty = 0;
201} 216}
202 217
203rxvt_term::~rxvt_term () 218rxvt_term::~rxvt_term ()
204{ 219{
… …
213#endif 228#endif
214 delete fontset[0]; 229 delete fontset[0];
215 230
216 if (display) 231 if (display)
217 { 232 {
218 dDisp;
219
220 selection_clear (); 233 selection_clear ();
221 234
222#ifdef USE_XIM 235#ifdef USE_XIM
223 im_destroy (); 236 im_destroy ();
224#endif 237#endif
225#ifdef XTERM_SCROLLBAR 238#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
228#endif 241#endif
229#ifdef PLAIN_SCROLLBAR 242#ifdef PLAIN_SCROLLBAR
230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
231#endif 244#endif
232#ifdef NEXT_SCROLLBAR 245#ifdef NEXT_SCROLLBAR
233 if (blackGC) XFreeGC (disp, blackGC); 246 if (blackGC) XFreeGC (dpy, blackGC);
234 if (whiteGC) XFreeGC (disp, whiteGC); 247 if (whiteGC) XFreeGC (dpy, whiteGC);
235 if (grayGC) XFreeGC (disp, grayGC); 248 if (grayGC) XFreeGC (dpy, grayGC);
236 if (darkGC) XFreeGC (disp, darkGC); 249 if (darkGC) XFreeGC (dpy, darkGC);
237 if (stippleGC) XFreeGC (disp, stippleGC); 250 if (stippleGC) XFreeGC (dpy, stippleGC);
238 if (dimple) XFreePixmap (disp, dimple); 251 if (dimple) XFreePixmap (dpy, dimple);
239 if (upArrow) XFreePixmap (disp, upArrow); 252 if (upArrow) XFreePixmap (dpy, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 253 if (downArrow) XFreePixmap (dpy, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
243#endif 256#endif
244#ifdef RXVT_SCROLLBAR 257#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
248#endif 261#endif
249 if (gc) XFreeGC (disp, gc); 262 if (gc) XFreeGC (dpy, gc);
250 263
251 delete drawable; 264 delete drawable;
252 // destroy all windows 265 // destroy all windows
253 if (parent[0]) 266 if (parent[0])
254 XDestroyWindow (disp, parent[0]); 267 XDestroyWindow (dpy, parent[0]);
255 }
256 268
257 // TODO: free pixcolours, colours should become part of rxvt_display 269 for (int i = 0; i < TOTAL_COLORS; i++)
258 delete pix_colors_focused; 270 if (ISSET_PIXCOLOR (i))
271 {
272 pix_colors_focused [i].free (this);
259#if OFF_FOCUS_FADING 273#if OFF_FOCUS_FADING
260 delete pix_colors_unfocused; 274 pix_colors_unfocused [i].free (this);
261#endif 275#endif
276 }
262 277
278 clear ();
279 }
280
281#ifdef HAVE_BG_PIXMAP
282 bgPixmap.destroy ();
283#endif
284 display->flush (); /* ideally .put should do this */
263 displays.put (display); 285 displays.put (display);
264 286
265 scr_release (); 287 scr_release ();
266 288
267 /* clear all resources */ 289 /* clear all resources */
268 for (int i = 0; i < allocated.size (); i++) 290 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 291 free (allocated [i]);
270 292
271 free (selection.text); 293 free (selection.text);
272 // TODO: manage env vars in child only(!) 294 // TODO: manage env vars in child only(!)
273 free (env_windowid);
274 free (env_display); 295 free (env_display);
275 free (env_term); 296 free (env_term);
276 free (env_colorfgbg);
277 free (locale); 297 free (locale);
278 free (v_buffer); 298 free (v_buffer);
279 free (incr_buf); 299 free (incr_buf);
280 300
281 delete envv; 301 delete envv;
282 delete argv; 302 delete argv;
283 303
284#ifdef KEYSYM_RESOURCE 304#ifdef KEYSYM_RESOURCE
285 delete keyboard; 305 delete keyboard;
286#endif 306#endif
307#ifndef NO_RESOURCES
308 XrmDestroyDatabase (option_db);
309#endif
287} 310}
288 311
289// child has exited, usually destroys 312// child has exited, usually destroys
290void 313void
291rxvt_term::child_cb (child_watcher &w, int status) 314rxvt_term::child_cb (ev::child &w, int status)
292{ 315{
293 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 316 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
294 317
295 cmd_pid = 0; 318 cmd_pid = 0;
296 319
297 if (!OPTION (Opt_hold)) 320 if (!option (Opt_hold))
298 destroy (); 321 destroy ();
299} 322}
300 323
301void 324void
302rxvt_term::destroy () 325rxvt_term::destroy ()
303{ 326{
304 if (destroy_ev.active) 327 if (destroy_ev.is_active ())
305 return; 328 return;
306 329
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 330 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 return;
309 331
310#if ENABLE_OVERLAY 332#if ENABLE_OVERLAY
311 scr_overlay_off (); 333 scr_overlay_off ();
312#endif 334#endif
313 335
… …
317 im_ev.stop (display); 339 im_ev.stop (display);
318#endif 340#endif
319#if HAVE_SCROLLBARS 341#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 342 scrollbar_ev.stop (display);
321#endif 343#endif
322#if TRANSPARENT 344#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 345 rootwin_ev.stop (display);
324#endif 346#endif
325 incr_ev.stop (); 347 incr_ev.stop ();
326 termwin_ev.stop (display); 348 termwin_ev.stop (display);
327 vt_ev.stop (display); 349 vt_ev.stop (display);
328 } 350 }
329 351
330 check_ev.stop (); 352 flush_ev.stop ();
331 pty_ev.stop (); 353 pty_ev.stop ();
332#ifdef CURSOR_BLINK 354#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 355 cursor_blink_ev.stop ();
334#endif 356#endif
335#ifdef TEXT_BLINK 357#ifdef TEXT_BLINK
… …
343#endif 365#endif
344#ifdef POINTER_BLANK 366#ifdef POINTER_BLANK
345 pointer_ev.stop (); 367 pointer_ev.stop ();
346#endif 368#endif
347 369
348 destroy_ev.start (0); 370 destroy_ev.start ();
349} 371}
350 372
351void 373void
352rxvt_term::destroy_cb (time_watcher &w) 374rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 375{
354 make_current (); 376 make_current ();
355 377
356 delete this; 378 delete this;
357} 379}
… …
368{ 390{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 391 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 392 (*t)->emergency_cleanup ();
371} 393}
372 394
373#if ENABLE_FRILLS 395#if !ENABLE_MINIMAL
374static void 396static void
375print_x_error (Display *dpy, XErrorEvent *event) 397print_x_error (Display *dpy, XErrorEvent *event)
376{ 398{
377 char buffer[BUFSIZ]; 399 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 400 char mesg[BUFSIZ];
… …
411 else 433 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 434 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 435 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 437 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 438 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 439 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 441}
420#endif 442#endif
421 443
… …
426 GET_R->allowedxerror = event->error_code; 448 GET_R->allowedxerror = event->error_code;
427 else 449 else
428 { 450 {
429 // GET_R is most likely not the terminal which caused the error, 451 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 452 // so just output the error and continue
431#if ENABLE_FRILLS 453#if ENABLE_MINIMAL
454 old_xerror_handler (display, event);
455#else
432 print_x_error (display, event); 456 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 457#endif
436 } 458 }
437 459
438 return 0; 460 return 0;
439} 461}
… …
446 rxvt_emergency_cleanup (); 468 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 469 _exit (EXIT_FAILURE);
448} 470}
449 471
450/*----------------------------------------------------------------------*/ 472/*----------------------------------------------------------------------*/
451bool 473void
452rxvt_term::init (int argc, const char *const *argv) 474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{ 475{
476 this->envv = envv;
477
454 SET_R (this); 478 SET_R (this);
455 set_locale (""); 479 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :( 480 set_environ (envv); // few things in X do not call setlocale :(
457 481
458 if (!init_vars ()) 482 init_vars ();
459 return false;
460 483
461 init_secondary (); 484 init_secondary ();
462 485
463 const char **cmd_argv = init_resources (argc, argv); 486 const char **cmd_argv = init_resources (argc, argv);
464 487
465#ifdef KEYSYM_RESOURCE 488#ifdef KEYSYM_RESOURCE
466 keyboard->register_done (); 489 keyboard->register_done ();
467#endif 490#endif
468 491
492#ifdef HAVE_SCROLLBARS
493 if (option (Opt_scrollBar))
494 scrollBar.setIdle (); /* set existence for size calculations */
495#endif
496
497 pty = ptytty::create ();
498
499 create_windows (argc, argv);
500
501 init_xlocale ();
502
503 scr_reset (); // initialize screen
504
505#if 0
506 XSynchronize (dpy, True);
507#endif
508
509#ifdef HAVE_SCROLLBARS
510 if (option (Opt_scrollBar))
511 resize_scrollbar (); /* create and map scrollbar */
512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516
517#ifdef ENABLE_TRANSPARENCY
518 if (option (Opt_transparent))
519 {
520 bgPixmap.set_transparent ();
521
522#ifdef HAVE_AFTERIMAGE
523 if (rs [Rs_blurradius])
524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
525#endif
526 if (ISSET_PIXCOLOR (Color_tint))
527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
533 XSelectInput (dpy, display->root, PropertyChangeMask);
534 rootwin_ev.start (display, display->root);
535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap])
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != 0)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
469#if ENABLE_PERL 559#if ENABLE_PERL
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482#ifdef HAVE_SCROLLBARS
483 if (OPTION (Opt_scrollBar))
484 scrollBar.setIdle (); /* set existence for size calculations */
485#endif
486
487 pty = rxvt_new_ptytty ();
488
489 create_windows (argc, argv);
490
491 dDisp;
492
493 init_xlocale ();
494
495 scr_reset (); // initialize screen
496
497#if 0
498 XSynchronize (disp, True);
499#endif
500
501#ifdef HAVE_SCROLLBARS
502 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */
504#endif
505#ifdef TRANSPARENT
506 if (OPTION (Opt_transparent))
507 {
508 XSelectInput (disp, display->root, PropertyChangeMask);
509 check_our_parents ();
510 rootwin_ev.start (display, display->root); 560 rootwin_ev.start (display, display->root);
511 }
512#endif 561#endif
513 562
514 set_colorfgbg (); 563 set_colorfgbg ();
515 564
516 init_command (cmd_argv); 565 init_command (cmd_argv);
517 566
518 free (cmd_argv); 567 free (cmd_argv);
519 568
520 if (pty->pty >= 0) 569 if (pty->pty >= 0)
521 pty_ev.start (pty->pty, EVENT_READ); 570 pty_ev.start (pty->pty, ev::READ);
522
523 check_ev.start ();
524 571
525 HOOK_INVOKE ((this, HOOK_START, DT_END)); 572 HOOK_INVOKE ((this, HOOK_START, DT_END));
526 573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
527 XMapWindow (disp, vt); 584 XMapWindow (dpy, vt);
528 XMapWindow (disp, parent[0]); 585 XMapWindow (dpy, parent[0]);
529
530 return true;
531} 586}
532 587
533static struct sig_handlers 588static struct sig_handlers
534{ 589{
535 sig_watcher sw_term, sw_int; 590 ev::sig sw_term, sw_int;
536 591
537 /* 592 /*
538 * Catch a fatal signal and tidy up before quitting 593 * Catch a fatal signal and tidy up before quitting
539 */ 594 */
540 void 595 void sig_term (ev::sig &w, int revents);
541 sig_term (sig_watcher &w) 596
597 sig_handlers ()
542 { 598 {
543#ifdef DEBUG_CMD 599 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
544 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
545#endif
546 rxvt_emergency_cleanup ();
547 signal (w.signum, SIG_DFL);
548 kill (getpid (), w.signum);
549 }
550
551 sig_handlers ()
552 : sw_term (this, &sig_handlers::sig_term),
553 sw_int (this, &sig_handlers::sig_term) 600 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
554 {
555 } 601 }
556} sig_handlers; 602} sig_handlers;
557 603
604void
605sig_handlers::sig_term (ev::sig &w, int revents)
606{
607 rxvt_emergency_cleanup ();
608 w.stop ();
609 kill (getpid (), w.signum);
610}
611
558char **rxvt_environ; // startup environment 612char **rxvt_environ; // startup environment
559 613
560void 614void
561rxvt_init () 615rxvt_init ()
562{ 616{
563 uid_t uid = getuid (); 617 ptytty::init ();
564 gid_t gid = getgid ();
565
566 // before doing anything else, check for setuid/setgid operation,
567 // start the helper process and drop privileges
568 if (uid != geteuid ()
569 || gid != getegid ())
570 {
571#if PTYTTY_HELPER
572 rxvt_ptytty_server ();
573#else
574 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
575#endif
576 618
577 // drop privileges 619 if (!ev_default_loop (0))
578#if HAVE_SETRESUID 620 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
579 setresgid (gid, gid, gid);
580 setresuid (uid, uid, uid);
581#elif HAVE_SETREUID
582 setregid (gid, gid);
583 setreuid (uid, uid);
584#elif HAVE_SETUID
585 setgid (gid);
586 setuid (uid);
587#endif
588
589 if (uid != geteuid ()
590 || gid != getegid ())
591 rxvt_fatal ("unable to drop privileges, aborting.\n");
592 }
593 621
594 rxvt_environ = environ; 622 rxvt_environ = environ;
595 623
596 signal (SIGHUP, SIG_IGN); 624 signal (SIGHUP, SIG_IGN);
597 signal (SIGPIPE, SIG_IGN); 625 signal (SIGPIPE, SIG_IGN);
598 626
599 sig_handlers.sw_term.start (SIGTERM); 627 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
600 sig_handlers.sw_int.start (SIGINT); 628 sig_handlers.sw_int.start (SIGINT); ev_unref ();
601 629
602 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
603 /* signal (SIGURG, SIG_DFL); */ 631 /* signal (SIGURG, SIG_DFL); */
604 632
605 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
607 XSetIOErrorHandler (rxvt_xioerror_handler); 635 XSetIOErrorHandler (rxvt_xioerror_handler);
608 636
609 XrmInitialize (); 637 XrmInitialize ();
610} 638}
611 639
612/* ------------------------------------------------------------------------- *
613 * MEMORY ALLOCATION WRAPPERS *
614 * ------------------------------------------------------------------------- */
615void *
616rxvt_malloc (size_t size)
617{
618 void *p = malloc (size);
619
620 if (!p)
621 rxvt_fatal ("memory allocation failure. aborting.\n");
622
623 return p;
624}
625
626void *
627rxvt_calloc (size_t number, size_t size)
628{
629 void *p = calloc (number, size);
630
631 if (!p)
632 rxvt_fatal ("memory allocation failure. aborting.\n");
633
634 return p;
635}
636
637void *
638rxvt_realloc (void *ptr, size_t size)
639{
640 void *p = realloc (ptr, size);
641
642 if (!p)
643 rxvt_fatal ("memory allocation failure. aborting.\n");
644
645 return p;
646}
647
648/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
649/* 641/*
650 * window size/position calculcations for XSizeHint and other storage. 642 * window size/position calculations for XSizeHint and other storage.
651 * if width/height are non-zero then override calculated width/height 643 * if width/height are non-zero then override calculated width/height
652 */ 644 */
653void 645void
654rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
655{ 647{
656 short recalc_x, recalc_y; 648 short recalc_x, recalc_y;
657 int x, y, sb_w, flags; 649 int x, y, sb_w, flags;
658 unsigned int w, h; 650 unsigned int w, h;
659 unsigned int max_width, max_height; 651 unsigned int max_width, max_height;
660 dDisp;
661
662 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
663 ncol, nrow, szHint.width, szHint.height));
664 652
665 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 653 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
666 szHint.win_gravity = NorthWestGravity; 654 szHint.win_gravity = NorthWestGravity;
667 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 655 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
668 656
… …
730 718
731 if (scrollBar.state) 719 if (scrollBar.state)
732 { 720 {
733 sb_w = scrollbar_TotalWidth (); 721 sb_w = scrollbar_TotalWidth ();
734 szHint.base_width += sb_w; 722 szHint.base_width += sb_w;
723
735 if (!OPTION (Opt_scrollBar_right)) 724 if (!option (Opt_scrollBar_right))
736 window_vt_x += sb_w; 725 window_vt_x += sb_w;
737 } 726 }
738 727
739 szHint.width_inc = fwidth; 728 szHint.width_inc = fwidth;
740 szHint.height_inc = fheight; 729 szHint.height_inc = fheight;
741 szHint.min_width = szHint.base_width + szHint.width_inc; 730 szHint.min_width = szHint.base_width + szHint.width_inc;
742 szHint.min_height = szHint.base_height + szHint.height_inc; 731 szHint.min_height = szHint.base_height + szHint.height_inc;
743 732
744 if (newwidth && newwidth - szHint.base_width < max_width) 733 if (newwidth && newwidth - szHint.base_width < max_width)
745 { 734 {
746 szHint.width = newwidth; 735 szHint.width = newwidth;
… …
761 { 750 {
762 min_it (height, max_height); 751 min_it (height, max_height);
763 szHint.height = szHint.base_height + height; 752 szHint.height = szHint.base_height + height;
764 } 753 }
765 754
766 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 755 if (scrollBar.state && option (Opt_scrollBar_right))
767 window_sb_x = szHint.width - sb_w; 756 window_sb_x = szHint.width - sb_w;
768 757
769 if (recalc_x) 758 if (recalc_x)
770 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 759 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
760
771 if (recalc_y) 761 if (recalc_y)
772 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 762 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
773 763
774 ncol = width / fwidth; 764 ncol = width / fwidth;
775 nrow = height / fheight; 765 nrow = height / fheight;
776 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
777 ncol, nrow, szHint.width,
778 szHint.height));
779 return;
780} 766}
781 767
782/*----------------------------------------------------------------------*/ 768/*----------------------------------------------------------------------*/
783/* 769/*
784 * Tell the teletype handler what size the window is. 770 * Tell the teletype handler what size the window is.
… …
797 ws.ws_xpixel = width; 783 ws.ws_xpixel = width;
798 ws.ws_ypixel = height; 784 ws.ws_ypixel = height;
799 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 785 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
800 786
801#if 0 787#if 0
802 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 788 // TIOCSWINSZ is supposed to do this automatically and correctly
803 if (cmd_pid) /* force through to the command */ 789 if (cmd_pid) /* force through to the command */
804 kill (-cmd_pid, SIGWINCH); 790 kill (-cmd_pid, SIGWINCH);
805#endif 791#endif
806} 792}
807 793
… …
836 delete fontset[0]; 822 delete fontset[0];
837 fontset[0] = fs; 823 fontset[0] = fs;
838 824
839 prop = (*fs)[1]->properties (); 825 prop = (*fs)[1]->properties ();
840 prop.height += lineSpace; 826 prop.height += lineSpace;
827
841 fs->set_prop (prop); 828 fs->set_prop (prop, false);
842 829
843 fwidth = prop.width; 830 fwidth = prop.width;
844 fheight = prop.height; 831 fheight = prop.height;
845 fbase = prop.ascent; 832 fbase = prop.ascent;
846 833
… …
855 { 842 {
856 fontset[style] = fs = new rxvt_fontset (this); 843 fontset[style] = fs = new rxvt_fontset (this);
857 rxvt_fontprop prop2 = prop; 844 rxvt_fontprop prop2 = prop;
858 845
859 if (res) 846 if (res)
860 prop2.weight = prop2.slant = rxvt_fontprop::unset; 847 {
848 fs->populate (res);
849 fs->set_prop (prop2, false);
850 }
861 else 851 else
862 { 852 {
863 res = fontset[0]->fontdesc; 853 fs->populate (fontset[0]->fontdesc);
864 854
865 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 855 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
866 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 856 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
857
858 fs->set_prop (prop2, true);
867 } 859 }
868 860
869 fs->populate (res);
870 fs->set_prop (prop2);
871 } 861 }
872#else 862#else
873 fontset[style] = fontset[0]; 863 fontset[style] = fontset[0];
874#endif 864#endif
875 } 865 }
… …
877 if (parent[0]) 867 if (parent[0])
878 { 868 {
879 resize_all_windows (0, 0, 0); 869 resize_all_windows (0, 0, 0);
880 scr_remap_chars (); 870 scr_remap_chars ();
881 scr_touch (true); 871 scr_touch (true);
882 } 872 }
883 873
884 return true; 874 return true;
885} 875}
886 876
877void
887void rxvt_term::set_string_property (Atom prop, const char *str, int len) 878rxvt_term::set_string_property (Atom prop, const char *str, int len)
888{ 879{
889 XChangeProperty (display->display, parent[0], 880 XChangeProperty (dpy, parent[0],
890 prop, XA_STRING, 8, PropModeReplace, 881 prop, XA_STRING, 8, PropModeReplace,
891 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 882 (const unsigned char *)str, len >= 0 ? len : strlen (str));
892} 883}
893 884
885void
894void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 886rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
895{ 887{
896 wchar_t *ws = rxvt_mbstowcs (str, len); 888 wchar_t *ws = rxvt_mbstowcs (str, len);
897 char *s = rxvt_wcstoutf8 (ws); 889 char *s = rxvt_wcstoutf8 (ws);
898 890
899 XChangeProperty (display->display, parent[0], 891 XChangeProperty (dpy, parent[0],
900 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
901 (const unsigned char *)s, strlen (s)); 893 (const unsigned char *)s, strlen (s));
902 894
903 free (s); 895 free (s);
904 free (ws); 896 free (ws);
… …
923#if ENABLE_EWMH 915#if ENABLE_EWMH
924 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 916 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
925#endif 917#endif
926} 918}
927 919
920void
921rxvt_term::set_window_color (int idx, const char *color)
922{
928#ifdef XTERM_COLOR_CHANGE 923#ifdef XTERM_COLOR_CHANGE
929void
930rxvt_term::set_window_color (int idx, const char *color)
931{
932 rxvt_color xcol; 924 rxvt_color xcol;
933 int i; 925 int i;
934 926
935 if (color == NULL || *color == '\0') 927 if (color == NULL || *color == '\0')
936 return; 928 return;
937 929
930 color = strdup (color);
931 allocated.push_back ((void *)color);
932 rs[Rs_color + idx] = color;
933
938 /* handle color aliases */ 934 /* handle color aliases */
939 if (isdigit (*color)) 935 if (isdigit (*color))
940 { 936 {
941 i = atoi (color); 937 i = atoi (color);
942 938
943 if (i >= 8 && i <= 15) 939 if (i >= 8 && i <= 15)
940 {
944 { /* bright colors */ 941 /* bright colors */
945 i -= 8;
946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 942 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
947 SET_PIXCOLOR (idx);
948 goto done; 943 goto done;
949 } 944 }
950 945
951 if (i >= 0 && i <= 7) 946 if (i >= 0 && i <= 7)
947 {
952 { /* normal colors */ 948 /* normal colors */
953 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 949 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
954 SET_PIXCOLOR (idx);
955 goto done; 950 goto done;
956 } 951 }
957 } 952 }
958 953
959 if (!rXParseAllocColor (&xcol, color)) 954 set_color (xcol, color);
960 return;
961
962 /* XStoreColor (display->display, display->cmap, XColor*); */
963 955
964 /* 956 /*
965 * FIXME: should free colors here, but no idea how to do it so instead, 957 * FIXME: should free colors here, but no idea how to do it so instead,
966 * so just keep gobbling up the colormap 958 * so just keep gobbling up the colormap
967 */ 959 */
968# if 0
969 for (i = Color_Black; i <= Color_White; i++)
970 if (pix_colors[idx] == pix_colors[i])
971 break;
972 if (i > Color_White)
973 {
974 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
975 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
976 DisplayPlanes (display->display, display->screen));
977 }
978# endif
979 960
980 pix_colors_focused[idx] = xcol; 961 pix_colors_focused[idx] = xcol;
981 SET_PIXCOLOR (idx);
982 962
983 /* XSetWindowAttributes attr; */
984 /* Cursor cursor; */
985done: 963done:
986
987#if OFF_FOCUS_FADING
988 if (rs[Rs_fade])
989 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
990#endif
991
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 964 /*TODO: handle Color_BD, scrollbar background, etc. */
993 965
966 update_fade_color (idx);
994 recolour_cursor (); 967 recolour_cursor ();
995 scr_recolour (); 968 scr_recolour ();
969#endif /* XTERM_COLOR_CHANGE */
996} 970}
997
998#else
999# define set_window_color (idx,color) ((void)0)
1000#endif /* XTERM_COLOR_CHANGE */
1001 971
1002void 972void
1003rxvt_term::recolour_cursor () 973rxvt_term::recolour_cursor ()
1004{ 974{
1005 XColor xcol[2]; 975 XColor fg, bg;
1006 976
1007 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 977 (ISSET_PIXCOLOR (Color_pointer_fg)
1008 ? pix_colors_focused[Color_pointer_fg] 978 ? pix_colors_focused[Color_pointer_fg]
1009 : pix_colors_focused[Color_fg]; 979 : pix_colors_focused[Color_fg]).get (fg);
980
1010 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 981 (ISSET_PIXCOLOR (Color_pointer_bg)
1011 ? pix_colors_focused[Color_pointer_bg] 982 ? pix_colors_focused[Color_pointer_bg]
1012 : pix_colors_focused[Color_bg]; 983 : pix_colors_focused[Color_bg]).get (bg);
1013 984
1014 XQueryColors (display->display, display->cmap, xcol, 2); 985 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1015 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1016} 986}
1017 987
1018/*----------------------------------------------------------------------*/ 988/*----------------------------------------------------------------------*/
1019/* 989/*
1020 * find if fg/bg matches any of the normal (low-intensity) colors 990 * find if fg/bg matches any of the normal (low-intensity) colors
1021 */ 991 */
1022void 992void
1023rxvt_term::set_colorfgbg () 993rxvt_term::set_colorfgbg ()
1024{ 994{
1025 unsigned int i; 995 unsigned int i;
1026 const char *xpmb = "\0"; 996 const char *xpmb = "";
1027 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 997 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1028 998
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1030 strcpy (fstr, "default"); 999 strcpy (fstr, "default");
1031 strcpy (bstr, "default"); 1000 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 1001 for (i = Color_Black; i <= Color_White; i++)
1033 if (pix_colors[Color_fg] == pix_colors[i]) 1002 if (pix_colors[Color_fg] == pix_colors[i])
1034 { 1003 {
… …
1038 1007
1039 for (i = Color_Black; i <= Color_White; i++) 1008 for (i = Color_Black; i <= Color_White; i++)
1040 if (pix_colors[Color_bg] == pix_colors[i]) 1009 if (pix_colors[Color_bg] == pix_colors[i])
1041 { 1010 {
1042 sprintf (bstr, "%d", (i - Color_Black)); 1011 sprintf (bstr, "%d", (i - Color_Black));
1043#ifdef XPM_BACKGROUND 1012#ifdef BG_IMAGE_FROM_FILE
1044 xpmb = "default;"; 1013 xpmb = "default;";
1045#endif 1014#endif
1046 break; 1015 break;
1047 } 1016 }
1048 1017
1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1018 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1050} 1019}
1051 1020
1052/*----------------------------------------------------------------------*/ 1021/*----------------------------------------------------------------------*/
1053 1022
1054int 1023bool
1055rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1024rxvt_term::set_color (rxvt_color &color, const char *name)
1056{ 1025{
1057 if (!screen_in_out->set (display, colour)) 1026 if (color.set (this, name))
1058 {
1059 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1060 return false;
1061 }
1062
1063 return true; 1027 return true;
1028
1029 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1030 return false;
1031}
1032
1033void
1034rxvt_term::alias_color (int dst, int src)
1035{
1036 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1064} 1037}
1065 1038
1066/* -------------------------------------------------------------------- * 1039/* -------------------------------------------------------------------- *
1067 * - WINDOW RESIZING - * 1040 * - WINDOW RESIZING - *
1068 * -------------------------------------------------------------------- */ 1041 * -------------------------------------------------------------------- */
1069void 1042void
1070rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1043rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1071{ 1044{
1072 int fix_screen; 1045 int fix_screen;
1073 int old_width = szHint.width, old_height = szHint.height; 1046 int old_width = szHint.width;
1074 dDisp; 1047 int old_height = szHint.height;
1075 1048
1076 window_calc (newwidth, newheight); 1049 window_calc (newwidth, newheight);
1050
1051 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1077 XSetWMNormalHints (disp, parent[0], &szHint); 1052 XSetWMNormalHints (dpy, parent[0], &szHint);
1078 1053
1079 if (!ignoreparent) 1054 if (!ignoreparent)
1080 { 1055 {
1081#ifdef SMART_RESIZE 1056#ifdef SMART_RESIZE
1082 /* 1057 /*
… …
1086 int x, y, x1, y1; 1061 int x, y, x1, y1;
1087 int dx, dy; 1062 int dx, dy;
1088 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1063 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1089 Window unused_cr; 1064 Window unused_cr;
1090 1065
1091 XTranslateCoordinates (disp, parent[0], display->root, 1066 XTranslateCoordinates (dpy, parent[0], display->root,
1092 0, 0, &x, &y, &unused_cr); 1067 0, 0, &x, &y, &unused_cr);
1093 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1068 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1094 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1069 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1095 /* 1070 /*
1096 * if display->root isn't the parent window, a WM will probably have offset 1071 * if display->root isn't the parent window, a WM will probably have offset
1097 * our position for handles and decorations. Counter it 1072 * our position for handles and decorations. Counter it
1098 */ 1073 */
… …
1100 { 1075 {
1101 x -= x1; 1076 x -= x1;
1102 y -= y1; 1077 y -= y1;
1103 } 1078 }
1104 1079
1105 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1080 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1106 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1081 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1107 dx = old_width - szHint.width; 1082 dx = old_width - szHint.width;
1108 dy = old_height - szHint.height; 1083 dy = old_height - szHint.height;
1109 1084
1110 /* Check position of the center of the window */ 1085 /* Check position of the center of the window */
1111 if (x < x1) /* left half */ 1086 if (x < x1) /* left half */
1112 dx = 0; 1087 dx = 0;
… …
1115 if (y < y1) /* top half */ 1090 if (y < y1) /* top half */
1116 dy = 0; 1091 dy = 0;
1117 else if (y == y1) /* exact center */ 1092 else if (y == y1) /* exact center */
1118 dy /= 2; 1093 dy /= 2;
1119 1094
1120 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1095 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1121 szHint.width, szHint.height); 1096 szHint.width, szHint.height);
1122#else 1097#else
1123 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1098 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1124#endif 1099#endif
1125 } 1100 }
1126 1101
1127 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1102 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1128 1103
1129 if (fix_screen || newwidth != old_width || newheight != old_height) 1104 if (fix_screen || newwidth != old_width || newheight != old_height)
1130 { 1105 {
1131 if (scrollBar.state) 1106 if (scrollBar.state)
1132 { 1107 {
1133 XMoveResizeWindow (disp, scrollBar.win, 1108 XMoveResizeWindow (dpy, scrollBar.win,
1134 window_sb_x, 0, 1109 window_sb_x, 0,
1135 scrollbar_TotalWidth (), szHint.height); 1110 scrollbar_TotalWidth (), szHint.height);
1136 resize_scrollbar (); 1111 resize_scrollbar ();
1137 } 1112 }
1138 1113
1139 XMoveResizeWindow (disp, vt, 1114 XMoveResizeWindow (dpy, vt,
1140 window_vt_x, window_vt_y, 1115 window_vt_x, window_vt_y,
1141 width, height); 1116 width, height);
1142 1117
1118#ifdef HAVE_BG_PIXMAP
1119 if (bgPixmap.window_size_sensitive ())
1120 update_background ();
1121#endif
1122
1143 scr_clear (); 1123 scr_clear ();
1144#ifdef XPM_BACKGROUND
1145 resize_pixmap ();
1146#endif
1147 } 1124 }
1148 1125
1149 if (fix_screen || old_height == 0) 1126 if (fix_screen || old_height == 0)
1150 {
1151 int curr_screen = -1;
1152 int old_ncol = prev_ncol;
1153
1154 /* scr_reset only works on the primary screen */
1155 if (old_height) /* this is not the first time through */
1156 {
1157 unsigned int ocol = ncol;
1158 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1159 curr_screen = scr_change_screen (PRIMARY);
1160 ncol = ocol;
1161 }
1162
1163 scr_reset (); 1127 scr_reset ();
1164 1128
1165 if (curr_screen >= 0) /* this is not the first time through */ 1129 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1166 { 1130 //scr_touch (false);
1167 scr_change_screen (curr_screen);
1168 selection_check (old_ncol != ncol ? 4 : 0);
1169 }
1170 }
1171 1131
1172 old_width = szHint.width; 1132#ifdef HAVE_BG_PIXMAP
1173 old_height = szHint.height; 1133// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1174 1134// if (bgPixmap.pixmap)
1175#ifdef XPM_BACKGROUND
1176 if (pixmap)
1177 scr_touch (false); 1135// scr_touch (false);
1178#endif 1136#endif
1179 1137
1180#ifdef USE_XIM 1138#ifdef USE_XIM
1181 IMSetStatusPosition (); 1139 IMSetPosition ();
1182#endif 1140#endif
1183} 1141}
1184 1142
1185/* 1143/*
1186 * Set the width/height of the vt window in characters. Units are pixels. 1144 * Set the width/height of the vt window in characters. Units are pixels.
… …
1191{ 1149{
1192 XWindowAttributes wattr; 1150 XWindowAttributes wattr;
1193 1151
1194 if (newwidth == 0 || newheight == 0) 1152 if (newwidth == 0 || newheight == 0)
1195 { 1153 {
1196 XGetWindowAttributes (display->display, display->root, &wattr); 1154 XGetWindowAttributes (dpy, display->root, &wattr);
1197 1155
1198 if (newwidth == 0) 1156 if (newwidth == 0)
1199 newwidth = wattr.width - szHint.base_width; 1157 newwidth = wattr.width - szHint.base_width;
1200 if (newheight == 0) 1158 if (newheight == 0)
1201 newheight = wattr.height - szHint.base_height; 1159 newheight = wattr.height - szHint.base_height;
… …
1215#ifdef USE_XIM 1173#ifdef USE_XIM
1216 1174
1217void 1175void
1218rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1176rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1219{ 1177{
1220 fg = pix_colors[Color_fg]; 1178 fg = pix_colors [Color_fg];
1221 bg = pix_colors[Color_bg]; 1179 bg = pix_colors [Color_bg];
1222} 1180}
1223 1181
1224void 1182void
1225rxvt_term::im_set_size (XRectangle &size) 1183rxvt_term::im_set_size (XRectangle &size)
1226{ 1184{
… …
1263 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1221 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1264 1222
1265 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1223 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1266 *p = '\0'; 1224 *p = '\0';
1267 1225
1268 atom = XInternAtom (display->display, server, False); 1226 atom = XInternAtom (dpy, server, False);
1269 win = XGetSelectionOwner (display->display, atom); 1227 win = XGetSelectionOwner (dpy, atom);
1270 1228
1271 if (win != None) 1229 if (win != None)
1272 return True; 1230 return True;
1273 } 1231 }
1274 1232
… …
1281 XPoint nspot; 1239 XPoint nspot;
1282 XVaNestedList preedit_attr; 1240 XVaNestedList preedit_attr;
1283 1241
1284 if (!Input_Context 1242 if (!Input_Context
1285 || !focus 1243 || !focus
1286 || !(input_style & XIMPreeditPosition)) 1244 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1287 return; 1245 return;
1288 1246
1289 im_set_position (nspot); 1247 im_set_position (nspot);
1290 1248
1291 if (nspot.x == spot.x && nspot.y == spot.y) 1249 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1310 input_method = 0; 1268 input_method = 0;
1311 } 1269 }
1312 1270
1313 Input_Context = 0; 1271 Input_Context = 0;
1314} 1272}
1273
1274#ifdef ENABLE_XIM_ONTHESPOT
1275
1276static void
1277xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1278{
1279 ((rxvt_term *)client_data)->make_current ();
1280 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1281}
1282
1283static void
1284xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1285{
1286 ((rxvt_term *)client_data)->make_current ();
1287 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1288}
1289
1290static void
1291xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1292{
1293 rxvt_term *term = (rxvt_term *)client_data;
1294 XIMText *text = call_data->text;
1295
1296 term->make_current ();
1297
1298 if (text)
1299 {
1300 void *str;
1301
1302 if (!text->encoding_is_wchar && text->string.multi_byte)
1303 {
1304 // of course, X makes it ugly again
1305 if (term->rs[Rs_imLocale])
1306 SET_LOCALE (term->rs[Rs_imLocale]);
1307
1308 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1309 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1310
1311 if (term->rs[Rs_imLocale])
1312 SET_LOCALE (term->locale);
1313 }
1314 else
1315 str = (void *)text->string.wide_char;
1316
1317 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1318 DT_INT, call_data->caret,
1319 DT_INT, call_data->chg_first,
1320 DT_INT, call_data->chg_length,
1321 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1322 DT_WCS_LEN, str, str ? (int)text->length : 0,
1323 DT_END));
1324 }
1325 else
1326 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1327 DT_INT, call_data->caret,
1328 DT_INT, call_data->chg_first,
1329 DT_INT, call_data->chg_length,
1330 DT_END));
1331}
1332
1333#if 0
1334static void
1335xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1336{
1337 ((rxvt_term *)client_data)->make_current ();
1338 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1339 DT_INT, call_data->position,
1340 DT_INT, call_data->direction,
1341 DT_INT, call_data->style,
1342 DT_END));
1343}
1344#endif
1345
1346#endif
1315 1347
1316/* 1348/*
1317 * Try to open a XIM with the current modifiers, then see if we can 1349 * Try to open a XIM with the current modifiers, then see if we can
1318 * open a suitable preedit type 1350 * open a suitable preedit type
1319 */ 1351 */
… …
1326 XRectangle rect, status_rect, needed_rect; 1358 XRectangle rect, status_rect, needed_rect;
1327 unsigned long fg, bg; 1359 unsigned long fg, bg;
1328 const char *p; 1360 const char *p;
1329 char **s; 1361 char **s;
1330 XIMStyles *xim_styles; 1362 XIMStyles *xim_styles;
1363#ifdef ENABLE_XIM_ONTHESPOT
1364 XIMCallback xcb[4];
1365#endif
1331 1366
1332 set_environ (envv); 1367 set_environ (envv);
1333 1368
1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1369 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1335 return false; 1370 return false;
1336 1371
1337 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1338 input_method = display->get_xim (locale, modifiers); 1372 input_method = display->get_xim (locale, modifiers);
1339 if (input_method == NULL) 1373 if (input_method == NULL)
1340 return false; 1374 return false;
1341 1375
1342 xim = input_method->xim; 1376 xim = input_method->xim;
… …
1362 s = rxvt_splitcommastring (p); 1396 s = rxvt_splitcommastring (p);
1363 1397
1364 for (i = found = 0; !found && s[i]; i++) 1398 for (i = found = 0; !found && s[i]; i++)
1365 { 1399 {
1366 if (!strcmp (s[i], "OverTheSpot")) 1400 if (!strcmp (s[i], "OverTheSpot"))
1367 input_style = (XIMPreeditPosition | XIMStatusNothing); 1401 input_style = XIMPreeditPosition | XIMStatusNothing;
1368 else if (!strcmp (s[i], "OffTheSpot")) 1402 else if (!strcmp (s[i], "OffTheSpot"))
1369 input_style = (XIMPreeditArea | XIMStatusArea); 1403 input_style = XIMPreeditArea | XIMStatusArea;
1370 else if (!strcmp (s[i], "Root")) 1404 else if (!strcmp (s[i], "Root"))
1371 input_style = (XIMPreeditNothing | XIMStatusNothing); 1405 input_style = XIMPreeditNothing | XIMStatusNothing;
1372 else if (!strcmp (s[i], "None")) 1406 else if (!strcmp (s[i], "None"))
1373 input_style = (XIMPreeditNone | XIMStatusNone); 1407 input_style = XIMPreeditNone | XIMStatusNone;
1408#ifdef ENABLE_XIM_ONTHESPOT
1409 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1410 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1411#endif
1412 else
1413 input_style = XIMPreeditNothing | XIMStatusNothing;
1374 1414
1375 for (j = 0; j < xim_styles->count_styles; j++) 1415 for (j = 0; j < xim_styles->count_styles; j++)
1376 if (input_style == xim_styles->supported_styles[j]) 1416 if (input_style == xim_styles->supported_styles[j])
1377 { 1417 {
1378 rxvt_freecommastring (s); 1418 rxvt_freecommastring (s);
… …
1416 "*", 1456 "*",
1417 fheight, 1457 fheight,
1418 fheight + 1, fheight - 1, 1458 fheight + 1, fheight - 1,
1419 fheight - 2, fheight + 2); 1459 fheight - 2, fheight + 2);
1420 1460
1421 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1461 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1422 &missing_charset_list, &missing_charset_count, &def_string); 1462 &missing_charset_list, &missing_charset_count, &def_string);
1423 1463
1424 if (missing_charset_list) 1464 if (missing_charset_list)
1425 XFreeStringList (missing_charset_list); 1465 XFreeStringList (missing_charset_list);
1426 1466
… …
1467 XNBackground, bg, 1507 XNBackground, bg,
1468 XNArea, &status_rect, 1508 XNArea, &status_rect,
1469 XNFontSet, fs, 1509 XNFontSet, fs,
1470 NULL); 1510 NULL);
1471 } 1511 }
1512#if ENABLE_XIM_ONTHESPOT
1513 else if (input_style & XIMPreeditCallbacks)
1514 {
1515 im_set_position (spot);
1516
1517 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1518 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1519 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1520# if 0
1521 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1522# endif
1523
1524 preedit_attr = XVaCreateNestedList (0,
1525 XNSpotLocation, &spot,
1526 XNPreeditStartCallback, &xcb[0],
1527 XNPreeditDoneCallback , &xcb[1],
1528 XNPreeditDrawCallback , &xcb[2],
1529# if 0
1530 XNPreeditCaretCallback, &xcb[3],
1531# endif
1532 NULL);
1533 }
1534#endif
1472 1535
1473 Input_Context = XCreateIC (xim, 1536 Input_Context = XCreateIC (xim,
1474 XNInputStyle, input_style, 1537 XNInputStyle, input_style,
1475 XNClientWindow, vt, 1538 XNClientWindow, vt,
1476 XNFocusWindow, parent[0], 1539 XNFocusWindow, parent[0],
… …
1478 preedit_attr, 1541 preedit_attr,
1479 status_attr ? XNStatusAttributes : NULL, 1542 status_attr ? XNStatusAttributes : NULL,
1480 status_attr, NULL); 1543 status_attr, NULL);
1481 1544
1482 if (preedit_attr) XFree (preedit_attr); 1545 if (preedit_attr) XFree (preedit_attr);
1483 if (status_attr) XFree (status_attr); 1546 if (status_attr) XFree (status_attr);
1484 if (fs) XFreeFontSet (display->display, fs); 1547 if (fs) XFreeFontSet (dpy, fs);
1485 1548
1486 if (Input_Context == NULL) 1549 if (Input_Context == NULL)
1487 { 1550 {
1488 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1551 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1489 im_destroy (); 1552 im_destroy ();
1490 return false; 1553 return false;
1491 } 1554 }
1492 1555
1493 if (input_style & XIMPreeditArea) 1556#if 0
1557 // unfortunately, only the focus window is used by XIM, hard to fix
1558 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1559 vt_select_input ();
1560#endif
1561
1494 IMSetStatusPosition (); 1562 IMSetPosition ();
1495 1563
1496 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1497 return true; 1564 return true;
1498} 1565}
1499 1566
1500void 1567void
1501rxvt_term::im_cb () 1568rxvt_term::im_cb ()
… …
1507 1574
1508 make_current (); 1575 make_current ();
1509 1576
1510 im_destroy (); 1577 im_destroy ();
1511 1578
1512 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1513 if (Input_Context) 1579 if (Input_Context)
1514 return; 1580 return;
1515 1581
1516#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1582#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1517 if (rs[Rs_imLocale]) 1583 if (rs[Rs_imLocale])
… …
1559 SET_LOCALE (locale); 1625 SET_LOCALE (locale);
1560#endif 1626#endif
1561} 1627}
1562 1628
1563void 1629void
1564rxvt_term::IMSetStatusPosition () 1630rxvt_term::IMSetPosition ()
1565{ 1631{
1566 XRectangle preedit_rect, status_rect, *needed_rect; 1632 XRectangle preedit_rect, status_rect, *needed_rect;
1567 XVaNestedList preedit_attr, status_attr; 1633 XVaNestedList preedit_attr, status_attr;
1568 1634
1569 if (!Input_Context 1635 if (!Input_Context
1570 || !focus 1636 || !focus
1571 || !(input_style & XIMPreeditArea) 1637 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1572 || !IMisRunning ()) 1638 || !IMisRunning ())
1573 return; 1639 return;
1574 1640
1641 if (input_style & XIMPreeditPosition)
1642 {
1643 im_set_size (preedit_rect);
1644 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1645
1646 XSetICValues (Input_Context,
1647 XNPreeditAttributes, preedit_attr, NULL);
1648 }
1649 else
1650 {
1575 /* Getting the necessary width of preedit area */ 1651 /* Getting the necessary width of preedit area */
1576 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1652 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1577 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1653 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1578 XFree (status_attr); 1654 XFree (status_attr);
1579 1655
1580 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1656 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1581 XFree (needed_rect); 1657 XFree (needed_rect);
1582 1658
1583 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1659 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1584 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1660 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1585 1661
1586 XSetICValues (Input_Context, 1662 XSetICValues (Input_Context,
1587 XNPreeditAttributes, preedit_attr, 1663 XNPreeditAttributes, preedit_attr,
1588 XNStatusAttributes, status_attr, NULL); 1664 XNStatusAttributes, status_attr,
1665 NULL);
1589 1666
1667 XFree (status_attr);
1668 }
1669
1590 XFree (preedit_attr); 1670 XFree (preedit_attr);
1591 XFree (status_attr);
1592} 1671}
1593#endif /* USE_XIM */ 1672#endif /* USE_XIM */
1673
1674void
1675rxvt_term::get_window_origin (int &x, int &y)
1676{
1677 Window cr;
1678 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1679/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1680}
1681
1682Pixmap
1683rxvt_term::get_pixmap_property (int prop_id)
1684{
1685 if (prop_id > 0 && prop_id < NUM_XA)
1686 if (xa[prop_id])
1687 {
1688 int aformat;
1689 unsigned long nitems, bytes_after;
1690 Atom atype;
1691 unsigned char *prop = NULL;
1692 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1693 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1694 &nitems, &bytes_after, &prop);
1695 if (result == Success && prop && atype == XA_PIXMAP)
1696 return *(Pixmap *)prop;
1697 }
1698
1699 return None;
1700}
1701
1702#ifdef HAVE_BG_PIXMAP
1703# if TRACE_PIXMAPS
1704# undef update_background
1705void
1706rxvt_term::trace_update_background (const char *file, int line)
1707{
1708 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1709 update_background ();
1710}
1711# endif
1712
1713void
1714rxvt_term::update_background ()
1715{
1716 if (update_background_ev.is_active ())
1717 return;
1718
1719 bgPixmap.invalidate ();
1720
1721 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1722
1723 if ( to_wait <= 0. )
1724 bgPixmap.render ();
1725 else
1726 update_background_ev.start (to_wait);
1727}
1728
1729void
1730rxvt_term::update_background_cb (ev::timer &w, int revents)
1731{
1732 make_current ();
1733
1734 update_background_ev.stop ();
1735 bgPixmap.render ();
1736 refresh_check ();
1737}
1738
1739#endif /* HAVE_BG_PIXMAP */
1594 1740
1595/*----------------------- end-of-file (C source) -----------------------*/ 1741/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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