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

Diff Legend

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