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.261 by root, Mon Nov 19 15:33:34 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
… …
180#endif 181#endif
181#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
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),
187#endif
188#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb),
186#endif 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{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
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
289 bgPixmap.destroy ();
279 displays.put (display); 290 displays.put (display);
280 291
281 scr_release (); 292 scr_release ();
282 293
283 /* clear all resources */ 294 /* clear all resources */
284 for (int i = 0; i < allocated.size (); i++) 295 for (int i = 0; i < allocated.size (); i++)
285 free (allocated [i]); 296 free (allocated [i]);
286 297
287 free (selection.text); 298 free (selection.text);
288 // TODO: manage env vars in child only(!) 299 // TODO: manage env vars in child only(!)
289 free (env_windowid);
290 free (env_display); 300 free (env_display);
291 free (env_term); 301 free (env_term);
292 free (env_colorfgbg);
293 free (locale); 302 free (locale);
294 free (v_buffer); 303 free (v_buffer);
295 free (incr_buf); 304 free (incr_buf);
296 305
297 delete envv; 306 delete envv;
… …
300#ifdef KEYSYM_RESOURCE 309#ifdef KEYSYM_RESOURCE
301 delete keyboard; 310 delete keyboard;
302#endif 311#endif
303} 312}
304 313
314// child has exited, usually destroys
305void 315void
306rxvt_term::child_exit () 316rxvt_term::child_cb (ev::child &w, int status)
307{ 317{
318 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
319
308 cmd_pid = 0; 320 cmd_pid = 0;
309 321
310 if (!OPTION (Opt_hold)) 322 if (!option (Opt_hold))
311 destroy (); 323 destroy ();
312} 324}
313 325
314void 326void
315rxvt_term::destroy () 327rxvt_term::destroy ()
316{ 328{
317 if (destroy_ev.active) 329 if (destroy_ev.active)
318 return; 330 return;
319 331
332 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
333
320#if ENABLE_OVERLAY 334#if ENABLE_OVERLAY
321 scr_overlay_off (); 335 scr_overlay_off ();
322#endif 336#endif
323 337
324 if (display) 338 if (display)
… …
327 im_ev.stop (display); 341 im_ev.stop (display);
328#endif 342#endif
329#if HAVE_SCROLLBARS 343#if HAVE_SCROLLBARS
330 scrollbar_ev.stop (display); 344 scrollbar_ev.stop (display);
331#endif 345#endif
332#if TRANSPARENT 346#if ENABLE_TRANSPARENCY || ENABLE_PERL
333 rootwin_ev.stop (display); 347 rootwin_ev.stop (display);
334#endif 348#endif
335 incr_ev.stop (); 349 incr_ev.stop ();
336 termwin_ev.stop (display); 350 termwin_ev.stop (display);
337 vt_ev.stop (display); 351 vt_ev.stop (display);
338 } 352 }
339 353
340 check_ev.stop (); 354 prepare_ev.stop ();
341 pty_ev.stop (); 355 pty_ev.stop ();
342#ifdef CURSOR_BLINK 356#ifdef CURSOR_BLINK
343 cursor_blink_ev.stop (); 357 cursor_blink_ev.stop ();
344#endif 358#endif
345#ifdef TEXT_BLINK 359#ifdef TEXT_BLINK
… …
353#endif 367#endif
354#ifdef POINTER_BLANK 368#ifdef POINTER_BLANK
355 pointer_ev.stop (); 369 pointer_ev.stop ();
356#endif 370#endif
357 371
358 destroy_ev.start (0); 372 destroy_ev.start ();
359} 373}
360 374
361void 375void
362rxvt_term::destroy_cb (time_watcher &w) 376rxvt_term::destroy_cb (ev::idle &w, int revents)
363{ 377{
364 make_current (); 378 make_current ();
365 379
366 delete this; 380 delete this;
367} 381}
… …
378{ 392{
379 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 393 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380 (*t)->emergency_cleanup (); 394 (*t)->emergency_cleanup ();
381} 395}
382 396
383#if ENABLE_FRILLS 397#if !ENABLE_MINIMAL
384static void 398static void
385print_x_error (Display *dpy, XErrorEvent *event) 399print_x_error (Display *dpy, XErrorEvent *event)
386{ 400{
387 char buffer[BUFSIZ]; 401 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 402 char mesg[BUFSIZ];
… …
421 else 435 else
422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 436 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
423 mesg, BUFSIZ); 437 mesg, BUFSIZ);
424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 438 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
425 } 439 }
426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 440 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
427 mesg, BUFSIZ); 441 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 442 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
429} 443}
430#endif 444#endif
431 445
… …
436 GET_R->allowedxerror = event->error_code; 450 GET_R->allowedxerror = event->error_code;
437 else 451 else
438 { 452 {
439 // GET_R is most likely not the terminal which caused the error, 453 // GET_R is most likely not the terminal which caused the error,
440 // so just output the error and continue 454 // so just output the error and continue
441#if ENABLE_FRILLS 455#if ENABLE_MINIMAL
456 old_xerror_handler (display, event);
457#else
442 print_x_error (display, event); 458 print_x_error (display, event);
443#else
444 old_xerror_handler (display, event);
445#endif 459#endif
446 } 460 }
447 461
448 return 0; 462 return 0;
449} 463}
… …
457 _exit (EXIT_FAILURE); 471 _exit (EXIT_FAILURE);
458} 472}
459 473
460/*----------------------------------------------------------------------*/ 474/*----------------------------------------------------------------------*/
461bool 475bool
462rxvt_term::init (int argc, const char *const *argv) 476rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
463{ 477{
478 this->envv = envv;
479
464 SET_R (this); 480 SET_R (this);
465 set_locale (""); 481 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :( 482 set_environ (envv); // few things in X do not call setlocale :(
467 483
468 if (!init_vars ()) 484 if (!init_vars ())
… …
475#ifdef KEYSYM_RESOURCE 491#ifdef KEYSYM_RESOURCE
476 keyboard->register_done (); 492 keyboard->register_done ();
477#endif 493#endif
478 494
479#ifdef HAVE_SCROLLBARS 495#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar)) 496 if (option (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */ 497 scrollBar.setIdle (); /* set existence for size calculations */
482#endif 498#endif
483 499
500 pty = ptytty::create ();
501
502 create_windows (argc, argv);
503
504 init_xlocale ();
505
506 scr_reset (); // initialize screen
507
508#if 0
509 XSynchronize (dpy, True);
510#endif
511
512#ifdef HAVE_SCROLLBARS
513 if (option (Opt_scrollBar))
514 resize_scrollbar (); /* create and map scrollbar */
515#endif
516#ifdef HAVE_BG_PIXMAP
517 {
518 bgPixmap.set_target (this);
519
520#ifdef ENABLE_TRANSPARENCY
521 if (option (Opt_transparent))
522 {
523 bgPixmap.set_transparent ();
524#ifdef HAVE_AFTERIMAGE
525 if (rs [Rs_blurradius])
526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527#endif
528 if (ISSET_PIXCOLOR (Color_tint))
529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530 if (rs [Rs_shade])
531 bgPixmap.set_shade (rs [Rs_shade]);
532
533 bgPixmap.set_root_pixmap ();
534 XSelectInput (dpy, display->root, PropertyChangeMask);
535 rootwin_ev.start (display, display->root);
536 }
537#endif
538
539#ifdef BG_IMAGE_FROM_FILE
540 if (rs[Rs_backgroundPixmap] != NULL)
541 {
542 const char *p = rs[Rs_backgroundPixmap];
543
544 if ((p = strchr (p, ';')) != NULL)
545 {
546 p++;
547 bgPixmap.set_geometry (p);
548 }
549 else
550 bgPixmap.set_defaultGeometry ();
551
552 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553 if (!bgPixmap.window_position_sensitive ())
554 update_background ();
555 }
556#endif
557 }
558#endif
559
484#if ENABLE_PERL 560#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); 561 rootwin_ev.start (display, display->root);
534 }
535#endif 562#endif
536
537 XMapWindow (disp, vt);
538 XMapWindow (disp, parent[0]);
539 563
540 set_colorfgbg (); 564 set_colorfgbg ();
541 565
542 init_command (cmd_argv); 566 init_command (cmd_argv);
543 567
544 free (cmd_argv); 568 free (cmd_argv);
545 569
546 if (pty->pty >= 0) 570 if (pty->pty >= 0)
547 pty_ev.start (pty->pty, EVENT_READ); 571 pty_ev.start (pty->pty, ev::READ);
548 572
549 check_ev.start (); 573 prepare_ev.start ();
550 574
551 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
552 576
577#if ENABLE_XEMBED
578 if (rs[Rs_embed])
579 {
580 long info[2] = { 0, XEMBED_MAPPED };
581
582 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
583 32, PropModeReplace, (unsigned char *)&info, 2);
584 }
585#endif
586
587 XMapWindow (dpy, vt);
588 XMapWindow (dpy, parent[0]);
589
553 return true; 590 return true;
554} 591}
555 592
556static struct sig_handlers 593static struct sig_handlers
557{ 594{
558 sig_watcher sw_chld, sw_term, sw_int; 595 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 596
574 /* 597 /*
575 * Catch a fatal signal and tidy up before quitting 598 * Catch a fatal signal and tidy up before quitting
576 */ 599 */
577 void 600 void
578 sig_term (sig_watcher &w) 601 sig_term (ev::sig &w, int revents)
579 { 602 {
580#ifdef DEBUG_CMD
581 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
582#endif
583 rxvt_emergency_cleanup (); 603 rxvt_emergency_cleanup ();
584 signal (w.signum, SIG_DFL); 604 w.stop ();
585 kill (getpid (), w.signum); 605 kill (getpid (), w.signum);
586 } 606 }
587 607
588 sig_handlers () 608 sig_handlers ()
589 : sw_chld (this, &sig_handlers::sig_chld),
590 sw_term (this, &sig_handlers::sig_term), 609 : sw_term (this, &sig_handlers::sig_term),
591 sw_int (this, &sig_handlers::sig_term) 610 sw_int (this, &sig_handlers::sig_term)
592 { 611 {
593 } 612 }
594} sig_handlers; 613} sig_handlers;
595 614
596char **rxvt_environ; // startup environment 615char **rxvt_environ; // startup environment
597 616
598void 617void
599rxvt_init () 618rxvt_init ()
600{ 619{
601 uid_t uid = getuid (); 620 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 621
616 // drop privileges 622 if (!ev::ev_default_loop (0))
617#if HAVE_SETRESUID 623 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 624
633 rxvt_environ = environ; 625 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 626
645 signal (SIGHUP, SIG_IGN); 627 signal (SIGHUP, SIG_IGN);
646 signal (SIGPIPE, SIG_IGN); 628 signal (SIGPIPE, SIG_IGN);
647 629
648 sig_handlers.sw_chld.start (SIGCHLD);
649 sig_handlers.sw_term.start (SIGTERM); 630 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
650 sig_handlers.sw_int.start (SIGINT); 631 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
651 632
652 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
653 /* signal (SIGURG, SIG_DFL); */ 634 /* signal (SIGURG, SIG_DFL); */
654 635
655 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
682 rxvt_fatal ("memory allocation failure. aborting.\n"); 663 rxvt_fatal ("memory allocation failure. aborting.\n");
683 664
684 return p; 665 return p;
685} 666}
686 667
687void * 668void *
688rxvt_realloc (void *ptr, size_t size) 669rxvt_realloc (void *ptr, size_t size)
689{ 670{
690 void *p = realloc (ptr, size); 671 void *p = realloc (ptr, size);
691 672
692 if (!p) 673 if (!p)
693 rxvt_fatal ("memory allocation failure. aborting.\n"); 674 rxvt_fatal ("memory allocation failure. aborting.\n");
694 675
695 return p; 676 return p;
696} 677}
697 678
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/*----------------------------------------------------------------------*/ 679/*----------------------------------------------------------------------*/
749/* 680/*
750 * window size/position calculcations for XSizeHint and other storage. 681 * window size/position calculations for XSizeHint and other storage.
751 * if width/height are non-zero then override calculated width/height 682 * if width/height are non-zero then override calculated width/height
752 */ 683 */
753void 684void
754rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 685rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
755{ 686{
756 short recalc_x, recalc_y; 687 short recalc_x, recalc_y;
757 int x, y, sb_w, flags; 688 int x, y, sb_w, flags;
758 unsigned int w, h; 689 unsigned int w, h;
759 unsigned int max_width, max_height; 690 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 691
765 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 692 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
766 szHint.win_gravity = NorthWestGravity; 693 szHint.win_gravity = NorthWestGravity;
767 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 694 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
768 695
… …
830 757
831 if (scrollBar.state) 758 if (scrollBar.state)
832 { 759 {
833 sb_w = scrollbar_TotalWidth (); 760 sb_w = scrollbar_TotalWidth ();
834 szHint.base_width += sb_w; 761 szHint.base_width += sb_w;
762
835 if (!OPTION (Opt_scrollBar_right)) 763 if (!option (Opt_scrollBar_right))
836 window_vt_x += sb_w; 764 window_vt_x += sb_w;
837 } 765 }
838 766
839 szHint.width_inc = fwidth; 767 szHint.width_inc = fwidth;
840 szHint.height_inc = fheight; 768 szHint.height_inc = fheight;
841 szHint.min_width = szHint.base_width + szHint.width_inc; 769 szHint.min_width = szHint.base_width + szHint.width_inc;
842 szHint.min_height = szHint.base_height + szHint.height_inc; 770 szHint.min_height = szHint.base_height + szHint.height_inc;
843 771
844 if (newwidth && newwidth - szHint.base_width < max_width) 772 if (newwidth && newwidth - szHint.base_width < max_width)
845 { 773 {
846 szHint.width = newwidth; 774 szHint.width = newwidth;
… …
861 { 789 {
862 min_it (height, max_height); 790 min_it (height, max_height);
863 szHint.height = szHint.base_height + height; 791 szHint.height = szHint.base_height + height;
864 } 792 }
865 793
866 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 794 if (scrollBar.state && option (Opt_scrollBar_right))
867 window_sb_x = szHint.width - sb_w; 795 window_sb_x = szHint.width - sb_w;
868 796
869 if (recalc_x) 797 if (recalc_x)
870 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 798 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
799
871 if (recalc_y) 800 if (recalc_y)
872 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 801 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
873 802
874 ncol = width / fwidth; 803 ncol = width / fwidth;
875 nrow = height / fheight; 804 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} 805}
881 806
882/*----------------------------------------------------------------------*/ 807/*----------------------------------------------------------------------*/
883/* 808/*
884 * Tell the teletype handler what size the window is. 809 * Tell the teletype handler what size the window is.
… …
936 delete fontset[0]; 861 delete fontset[0];
937 fontset[0] = fs; 862 fontset[0] = fs;
938 863
939 prop = (*fs)[1]->properties (); 864 prop = (*fs)[1]->properties ();
940 prop.height += lineSpace; 865 prop.height += lineSpace;
866
941 fs->set_prop (prop); 867 fs->set_prop (prop, false);
942 868
943 fwidth = prop.width; 869 fwidth = prop.width;
944 fheight = prop.height; 870 fheight = prop.height;
945 fbase = prop.ascent; 871 fbase = prop.ascent;
946 872
… …
955 { 881 {
956 fontset[style] = fs = new rxvt_fontset (this); 882 fontset[style] = fs = new rxvt_fontset (this);
957 rxvt_fontprop prop2 = prop; 883 rxvt_fontprop prop2 = prop;
958 884
959 if (res) 885 if (res)
960 prop2.weight = prop2.slant = rxvt_fontprop::unset; 886 {
887 fs->populate (res);
888 fs->set_prop (prop2, false);
889 }
961 else 890 else
962 { 891 {
963 res = fontset[0]->fontdesc; 892 fs->populate (fontset[0]->fontdesc);
964 893
965 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 894 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; 895 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
896
897 fs->set_prop (prop2, true);
967 } 898 }
968 899
969 fs->populate (res);
970 fs->set_prop (prop2);
971 } 900 }
972#else 901#else
973 fontset[style] = fontset[0]; 902 fontset[style] = fontset[0];
974#endif 903#endif
975 } 904 }
… …
977 if (parent[0]) 906 if (parent[0])
978 { 907 {
979 resize_all_windows (0, 0, 0); 908 resize_all_windows (0, 0, 0);
980 scr_remap_chars (); 909 scr_remap_chars ();
981 scr_touch (true); 910 scr_touch (true);
982 } 911 }
983 912
984 return true; 913 return true;
985} 914}
986 915
916void
987void rxvt_term::set_string_property (Atom prop, const char *str, int len) 917rxvt_term::set_string_property (Atom prop, const char *str, int len)
988{ 918{
989 XChangeProperty (display->display, parent[0], 919 XChangeProperty (dpy, parent[0],
990 prop, XA_STRING, 8, PropModeReplace, 920 prop, XA_STRING, 8, PropModeReplace,
991 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 921 (const unsigned char *)str, len >= 0 ? len : strlen (str));
992} 922}
993 923
924void
994void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 925rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
995{ 926{
996 wchar_t *ws = rxvt_mbstowcs (str, len); 927 wchar_t *ws = rxvt_mbstowcs (str, len);
997 char *s = rxvt_wcstoutf8 (ws); 928 char *s = rxvt_wcstoutf8 (ws);
998 929
999 XChangeProperty (display->display, parent[0], 930 XChangeProperty (dpy, parent[0],
1000 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 931 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1001 (const unsigned char *)s, strlen (s)); 932 (const unsigned char *)s, strlen (s));
1002 933
1003 free (s); 934 free (s);
1004 free (ws); 935 free (ws);
… …
1023#if ENABLE_EWMH 954#if ENABLE_EWMH
1024 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 955 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
1025#endif 956#endif
1026} 957}
1027 958
959void
960rxvt_term::set_window_color (int idx, const char *color)
961{
1028#ifdef XTERM_COLOR_CHANGE 962#ifdef XTERM_COLOR_CHANGE
1029void
1030rxvt_term::set_window_color (int idx, const char *color)
1031{
1032 rxvt_color xcol; 963 rxvt_color xcol;
1033 int i; 964 int i;
1034 965
1035 if (color == NULL || *color == '\0') 966 if (color == NULL || *color == '\0')
1036 return; 967 return;
968
969 color = strdup (color);
970 allocated.push_back ((void *)color);
971 rs[Rs_color + idx] = color;
1037 972
1038 /* handle color aliases */ 973 /* handle color aliases */
1039 if (isdigit (*color)) 974 if (isdigit (*color))
1040 { 975 {
1041 i = atoi (color); 976 i = atoi (color);
1042 977
1043 if (i >= 8 && i <= 15) 978 if (i >= 8 && i <= 15)
1044 { /* bright colors */ 979 { /* bright colors */
1045 i -= 8; 980 i -= 8;
1046 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 981 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1047 SET_PIXCOLOR (idx);
1048 goto done; 982 goto done;
1049 } 983 }
1050 984
1051 if (i >= 0 && i <= 7) 985 if (i >= 0 && i <= 7)
1052 { /* normal colors */ 986 { /* normal colors */
1053 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 987 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1054 SET_PIXCOLOR (idx);
1055 goto done; 988 goto done;
1056 } 989 }
1057 } 990 }
1058 991
1059 if (!rXParseAllocColor (&xcol, color)) 992 set_color (xcol, color);
1060 return;
1061
1062 /* XStoreColor (display->display, display->cmap, XColor*); */
1063 993
1064 /* 994 /*
1065 * FIXME: should free colors here, but no idea how to do it so instead, 995 * FIXME: should free colors here, but no idea how to do it so instead,
1066 * so just keep gobbling up the colormap 996 * so just keep gobbling up the colormap
1067 */ 997 */
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 998
1080 pix_colors_focused[idx] = xcol; 999 pix_colors_focused[idx] = xcol;
1081 SET_PIXCOLOR (idx);
1082 1000
1083 /* XSetWindowAttributes attr; */ 1001 /* XSetWindowAttributes attr; */
1084 /* Cursor cursor; */ 1002 /* Cursor cursor; */
1085done: 1003done:
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. */ 1004 /*TODO: handle Color_BD, scrollbar background, etc. */
1093 1005
1006 update_fade_color (idx);
1094 recolour_cursor (); 1007 recolour_cursor ();
1095 scr_recolour (); 1008 scr_recolour ();
1009#endif /* XTERM_COLOR_CHANGE */
1096} 1010}
1097
1098#else
1099# define set_window_color (idx,color) ((void)0)
1100#endif /* XTERM_COLOR_CHANGE */
1101 1011
1102void 1012void
1103rxvt_term::recolour_cursor () 1013rxvt_term::recolour_cursor ()
1104{ 1014{
1105 XColor xcol[2]; 1015 XColor fg, bg;
1106 1016
1107 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1017 (ISSET_PIXCOLOR (Color_pointer_fg)
1108 ? pix_colors_focused[Color_pointer_fg] 1018 ? pix_colors_focused[Color_pointer_fg]
1109 : pix_colors_focused[Color_fg]; 1019 : pix_colors_focused[Color_fg]).get (fg);
1020
1110 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1021 (ISSET_PIXCOLOR (Color_pointer_bg)
1111 ? pix_colors_focused[Color_pointer_bg] 1022 ? pix_colors_focused[Color_pointer_bg]
1112 : pix_colors_focused[Color_bg]; 1023 : pix_colors_focused[Color_bg]).get (bg);
1113 1024
1114 XQueryColors (display->display, display->cmap, xcol, 2); 1025 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1115 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1116} 1026}
1117 1027
1118/*----------------------------------------------------------------------*/ 1028/*----------------------------------------------------------------------*/
1119/* 1029/*
1120 * find if fg/bg matches any of the normal (low-intensity) colors 1030 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1124{ 1034{
1125 unsigned int i; 1035 unsigned int i;
1126 const char *xpmb = "\0"; 1036 const char *xpmb = "\0";
1127 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1037 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1128 1038
1129 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1130 strcpy (fstr, "default"); 1039 strcpy (fstr, "default");
1131 strcpy (bstr, "default"); 1040 strcpy (bstr, "default");
1132 for (i = Color_Black; i <= Color_White; i++) 1041 for (i = Color_Black; i <= Color_White; i++)
1133 if (pix_colors[Color_fg] == pix_colors[i]) 1042 if (pix_colors[Color_fg] == pix_colors[i])
1134 { 1043 {
… …
1138 1047
1139 for (i = Color_Black; i <= Color_White; i++) 1048 for (i = Color_Black; i <= Color_White; i++)
1140 if (pix_colors[Color_bg] == pix_colors[i]) 1049 if (pix_colors[Color_bg] == pix_colors[i])
1141 { 1050 {
1142 sprintf (bstr, "%d", (i - Color_Black)); 1051 sprintf (bstr, "%d", (i - Color_Black));
1143#ifdef XPM_BACKGROUND 1052#ifdef BG_IMAGE_FROM_FILE
1144 xpmb = "default;"; 1053 xpmb = "default;";
1145#endif 1054#endif
1146 break; 1055 break;
1147 } 1056 }
1148 1057
1149 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1058 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1150} 1059}
1151 1060
1152/*----------------------------------------------------------------------*/ 1061/*----------------------------------------------------------------------*/
1153 1062
1154int 1063bool
1155rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1064rxvt_term::set_color (rxvt_color &color, const char *name)
1156{ 1065{
1157 if (!screen_in_out->set (display, colour)) 1066 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; 1067 return true;
1068
1069 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1070 return false;
1071}
1072
1073void
1074rxvt_term::alias_color (int dst, int src)
1075{
1076 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1164} 1077}
1165 1078
1166/* -------------------------------------------------------------------- * 1079/* -------------------------------------------------------------------- *
1167 * - WINDOW RESIZING - * 1080 * - WINDOW RESIZING - *
1168 * -------------------------------------------------------------------- */ 1081 * -------------------------------------------------------------------- */
1169void 1082void
1170rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1083rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1171{ 1084{
1172 int fix_screen; 1085 int fix_screen;
1173 int old_width = szHint.width, old_height = szHint.height; 1086 int old_width = szHint.width;
1174 dDisp; 1087 int old_height = szHint.height;
1175 1088
1176 window_calc (newwidth, newheight); 1089 window_calc (newwidth, newheight);
1090
1091 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1177 XSetWMNormalHints (disp, parent[0], &szHint); 1092 XSetWMNormalHints (dpy, parent[0], &szHint);
1178 1093
1179 if (!ignoreparent) 1094 if (!ignoreparent)
1180 { 1095 {
1181#ifdef SMART_RESIZE 1096#ifdef SMART_RESIZE
1182 /* 1097 /*
… …
1186 int x, y, x1, y1; 1101 int x, y, x1, y1;
1187 int dx, dy; 1102 int dx, dy;
1188 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1103 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1189 Window unused_cr; 1104 Window unused_cr;
1190 1105
1191 XTranslateCoordinates (disp, parent[0], display->root, 1106 XTranslateCoordinates (dpy, parent[0], display->root,
1192 0, 0, &x, &y, &unused_cr); 1107 0, 0, &x, &y, &unused_cr);
1193 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1108 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1194 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1109 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1195 /* 1110 /*
1196 * if display->root isn't the parent window, a WM will probably have offset 1111 * if display->root isn't the parent window, a WM will probably have offset
1197 * our position for handles and decorations. Counter it 1112 * our position for handles and decorations. Counter it
1198 */ 1113 */
… …
1200 { 1115 {
1201 x -= x1; 1116 x -= x1;
1202 y -= y1; 1117 y -= y1;
1203 } 1118 }
1204 1119
1205 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1120 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1206 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1121 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1207 dx = old_width - szHint.width; 1122 dx = old_width - szHint.width;
1208 dy = old_height - szHint.height; 1123 dy = old_height - szHint.height;
1209 1124
1210 /* Check position of the center of the window */ 1125 /* Check position of the center of the window */
1211 if (x < x1) /* left half */ 1126 if (x < x1) /* left half */
1212 dx = 0; 1127 dx = 0;
… …
1215 if (y < y1) /* top half */ 1130 if (y < y1) /* top half */
1216 dy = 0; 1131 dy = 0;
1217 else if (y == y1) /* exact center */ 1132 else if (y == y1) /* exact center */
1218 dy /= 2; 1133 dy /= 2;
1219 1134
1220 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1135 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1221 szHint.width, szHint.height); 1136 szHint.width, szHint.height);
1222#else 1137#else
1223 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1138 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1224#endif 1139#endif
1225 } 1140 }
1226 1141
1227 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1142 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1228 1143
1229 if (fix_screen || newwidth != old_width || newheight != old_height) 1144 if (fix_screen || newwidth != old_width || newheight != old_height)
1230 { 1145 {
1231 if (scrollBar.state) 1146 if (scrollBar.state)
1232 { 1147 {
1233 XMoveResizeWindow (disp, scrollBar.win, 1148 XMoveResizeWindow (dpy, scrollBar.win,
1234 window_sb_x, 0, 1149 window_sb_x, 0,
1235 scrollbar_TotalWidth (), szHint.height); 1150 scrollbar_TotalWidth (), szHint.height);
1236 resize_scrollbar (); 1151 resize_scrollbar ();
1237 } 1152 }
1238 1153
1239 XMoveResizeWindow (disp, vt, 1154 XMoveResizeWindow (dpy, vt,
1240 window_vt_x, window_vt_y, 1155 window_vt_x, window_vt_y,
1241 width, height); 1156 width, height);
1242 1157
1158#ifdef HAVE_BG_PIXMAP
1159 if (bgPixmap.window_size_sensitive ())
1160 update_background ();
1161#endif
1162
1243 scr_clear (); 1163 scr_clear ();
1244#ifdef XPM_BACKGROUND
1245 resize_pixmap ();
1246#endif
1247 } 1164 }
1248 1165
1249 if (fix_screen || old_height == 0) 1166 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 (); 1167 scr_reset ();
1264 1168
1265 if (curr_screen >= 0) /* this is not the first time through */ 1169 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1266 { 1170 //scr_touch (false);
1267 scr_change_screen (curr_screen);
1268 selection_check (old_ncol != ncol ? 4 : 0);
1269 }
1270 }
1271 1171
1272 old_width = szHint.width; 1172#ifdef HAVE_BG_PIXMAP
1273 old_height = szHint.height; 1173// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1274 1174// if (bgPixmap.pixmap)
1275#ifdef XPM_BACKGROUND
1276 if (pixmap)
1277 scr_touch (false); 1175// scr_touch (false);
1278#endif 1176#endif
1279 1177
1280#ifdef USE_XIM 1178#ifdef USE_XIM
1281 IMSetStatusPosition (); 1179 IMSetPosition ();
1282#endif 1180#endif
1283} 1181}
1284 1182
1285/* 1183/*
1286 * Set the width/height of the vt window in characters. Units are pixels. 1184 * Set the width/height of the vt window in characters. Units are pixels.
… …
1291{ 1189{
1292 XWindowAttributes wattr; 1190 XWindowAttributes wattr;
1293 1191
1294 if (newwidth == 0 || newheight == 0) 1192 if (newwidth == 0 || newheight == 0)
1295 { 1193 {
1296 XGetWindowAttributes (display->display, display->root, &wattr); 1194 XGetWindowAttributes (dpy, display->root, &wattr);
1297 1195
1298 if (newwidth == 0) 1196 if (newwidth == 0)
1299 newwidth = wattr.width - szHint.base_width; 1197 newwidth = wattr.width - szHint.base_width;
1300 if (newheight == 0) 1198 if (newheight == 0)
1301 newheight = wattr.height - szHint.base_height; 1199 newheight = wattr.height - szHint.base_height;
… …
1315#ifdef USE_XIM 1213#ifdef USE_XIM
1316 1214
1317void 1215void
1318rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1216rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1319{ 1217{
1320 fg = pix_colors[Color_fg]; 1218 fg = pix_colors [Color_fg];
1321 bg = pix_colors[Color_bg]; 1219 bg = pix_colors [Color_bg];
1322} 1220}
1323 1221
1324void 1222void
1325rxvt_term::im_set_size (XRectangle &size) 1223rxvt_term::im_set_size (XRectangle &size)
1326{ 1224{
… …
1363 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1261 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1364 1262
1365 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1263 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1366 *p = '\0'; 1264 *p = '\0';
1367 1265
1368 atom = XInternAtom (display->display, server, False); 1266 atom = XInternAtom (dpy, server, False);
1369 win = XGetSelectionOwner (display->display, atom); 1267 win = XGetSelectionOwner (dpy, atom);
1370 1268
1371 if (win != None) 1269 if (win != None)
1372 return True; 1270 return True;
1373 } 1271 }
1374 1272
… …
1381 XPoint nspot; 1279 XPoint nspot;
1382 XVaNestedList preedit_attr; 1280 XVaNestedList preedit_attr;
1383 1281
1384 if (!Input_Context 1282 if (!Input_Context
1385 || !focus 1283 || !focus
1386 || !(input_style & XIMPreeditPosition)) 1284 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1387 return; 1285 return;
1388 1286
1389 im_set_position (nspot); 1287 im_set_position (nspot);
1390 1288
1391 if (nspot.x == spot.x && nspot.y == spot.y) 1289 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1410 input_method = 0; 1308 input_method = 0;
1411 } 1309 }
1412 1310
1413 Input_Context = 0; 1311 Input_Context = 0;
1414} 1312}
1313
1314#ifdef ENABLE_XIM_ONTHESPOT
1315
1316static void
1317xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1318{
1319 ((rxvt_term *)client_data)->make_current ();
1320 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1321}
1322
1323static void
1324xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1325{
1326 ((rxvt_term *)client_data)->make_current ();
1327 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1328}
1329
1330static void
1331xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1332{
1333 rxvt_term *term = (rxvt_term *)client_data;
1334 XIMText *text = call_data->text;
1335
1336 term->make_current ();
1337
1338 if (text)
1339 {
1340 void *str;
1341
1342 if (!text->encoding_is_wchar && text->string.multi_byte)
1343 {
1344 // of course, X makes it ugly again
1345 if (term->rs[Rs_imLocale])
1346 SET_LOCALE (term->rs[Rs_imLocale]);
1347
1348 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1349 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1350
1351 if (term->rs[Rs_imLocale])
1352 SET_LOCALE (term->locale);
1353 }
1354 else
1355 str = (void *)text->string.wide_char;
1356
1357 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1358 DT_INT, call_data->caret,
1359 DT_INT, call_data->chg_first,
1360 DT_INT, call_data->chg_length,
1361 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1362 DT_WCS_LEN, str, str ? (int)text->length : 0,
1363 DT_END));
1364 }
1365 else
1366 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1367 DT_INT, call_data->caret,
1368 DT_INT, call_data->chg_first,
1369 DT_INT, call_data->chg_length,
1370 DT_END));
1371}
1372
1373#if 0
1374static void
1375xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1376{
1377 ((rxvt_term *)client_data)->make_current ();
1378 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1379 DT_INT, call_data->position,
1380 DT_INT, call_data->direction,
1381 DT_INT, call_data->style,
1382 DT_END));
1383}
1384#endif
1385
1386#endif
1415 1387
1416/* 1388/*
1417 * Try to open a XIM with the current modifiers, then see if we can 1389 * Try to open a XIM with the current modifiers, then see if we can
1418 * open a suitable preedit type 1390 * open a suitable preedit type
1419 */ 1391 */
… …
1426 XRectangle rect, status_rect, needed_rect; 1398 XRectangle rect, status_rect, needed_rect;
1427 unsigned long fg, bg; 1399 unsigned long fg, bg;
1428 const char *p; 1400 const char *p;
1429 char **s; 1401 char **s;
1430 XIMStyles *xim_styles; 1402 XIMStyles *xim_styles;
1403#ifdef ENABLE_XIM_ONTHESPOT
1404 XIMCallback xcb[4];
1405#endif
1431 1406
1432 set_environ (envv); 1407 set_environ (envv);
1433 1408
1434 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1409 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1435 return false; 1410 return false;
1436 1411
1437 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1438 input_method = display->get_xim (locale, modifiers); 1412 input_method = display->get_xim (locale, modifiers);
1439 if (input_method == NULL) 1413 if (input_method == NULL)
1440 return false; 1414 return false;
1441 1415
1442 xim = input_method->xim; 1416 xim = input_method->xim;
… …
1462 s = rxvt_splitcommastring (p); 1436 s = rxvt_splitcommastring (p);
1463 1437
1464 for (i = found = 0; !found && s[i]; i++) 1438 for (i = found = 0; !found && s[i]; i++)
1465 { 1439 {
1466 if (!strcmp (s[i], "OverTheSpot")) 1440 if (!strcmp (s[i], "OverTheSpot"))
1467 input_style = (XIMPreeditPosition | XIMStatusNothing); 1441 input_style = XIMPreeditPosition | XIMStatusNothing;
1468 else if (!strcmp (s[i], "OffTheSpot")) 1442 else if (!strcmp (s[i], "OffTheSpot"))
1469 input_style = (XIMPreeditArea | XIMStatusArea); 1443 input_style = XIMPreeditArea | XIMStatusArea;
1470 else if (!strcmp (s[i], "Root")) 1444 else if (!strcmp (s[i], "Root"))
1471 input_style = (XIMPreeditNothing | XIMStatusNothing); 1445 input_style = XIMPreeditNothing | XIMStatusNothing;
1472 else if (!strcmp (s[i], "None")) 1446 else if (!strcmp (s[i], "None"))
1473 input_style = (XIMPreeditNone | XIMStatusNone); 1447 input_style = XIMPreeditNone | XIMStatusNone;
1448#ifdef ENABLE_XIM_ONTHESPOT
1449 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1450 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1451#endif
1452 else
1453 input_style = XIMPreeditNothing | XIMStatusNothing;
1474 1454
1475 for (j = 0; j < xim_styles->count_styles; j++) 1455 for (j = 0; j < xim_styles->count_styles; j++)
1476 if (input_style == xim_styles->supported_styles[j]) 1456 if (input_style == xim_styles->supported_styles[j])
1477 { 1457 {
1478 rxvt_freecommastring (s); 1458 rxvt_freecommastring (s);
… …
1516 "*", 1496 "*",
1517 fheight, 1497 fheight,
1518 fheight + 1, fheight - 1, 1498 fheight + 1, fheight - 1,
1519 fheight - 2, fheight + 2); 1499 fheight - 2, fheight + 2);
1520 1500
1521 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1501 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1522 &missing_charset_list, &missing_charset_count, &def_string); 1502 &missing_charset_list, &missing_charset_count, &def_string);
1523 1503
1524 if (missing_charset_list) 1504 if (missing_charset_list)
1525 XFreeStringList (missing_charset_list); 1505 XFreeStringList (missing_charset_list);
1526 1506
… …
1567 XNBackground, bg, 1547 XNBackground, bg,
1568 XNArea, &status_rect, 1548 XNArea, &status_rect,
1569 XNFontSet, fs, 1549 XNFontSet, fs,
1570 NULL); 1550 NULL);
1571 } 1551 }
1552#if ENABLE_XIM_ONTHESPOT
1553 else if (input_style & XIMPreeditCallbacks)
1554 {
1555 im_set_position (spot);
1556
1557 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1558 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1559 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1560# if 0
1561 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1562# endif
1563
1564 preedit_attr = XVaCreateNestedList (0,
1565 XNSpotLocation, &spot,
1566 XNPreeditStartCallback, &xcb[0],
1567 XNPreeditDoneCallback , &xcb[1],
1568 XNPreeditDrawCallback , &xcb[2],
1569# if 0
1570 XNPreeditCaretCallback, &xcb[3],
1571# endif
1572 NULL);
1573 }
1574#endif
1572 1575
1573 Input_Context = XCreateIC (xim, 1576 Input_Context = XCreateIC (xim,
1574 XNInputStyle, input_style, 1577 XNInputStyle, input_style,
1575 XNClientWindow, vt, 1578 XNClientWindow, vt,
1576 XNFocusWindow, parent[0], 1579 XNFocusWindow, parent[0],
… …
1578 preedit_attr, 1581 preedit_attr,
1579 status_attr ? XNStatusAttributes : NULL, 1582 status_attr ? XNStatusAttributes : NULL,
1580 status_attr, NULL); 1583 status_attr, NULL);
1581 1584
1582 if (preedit_attr) XFree (preedit_attr); 1585 if (preedit_attr) XFree (preedit_attr);
1583 if (status_attr) XFree (status_attr); 1586 if (status_attr) XFree (status_attr);
1584 if (fs) XFreeFontSet (display->display, fs); 1587 if (fs) XFreeFontSet (dpy, fs);
1585 1588
1586 if (Input_Context == NULL) 1589 if (Input_Context == NULL)
1587 { 1590 {
1588 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1591 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1589 im_destroy (); 1592 im_destroy ();
1590 return false; 1593 return false;
1591 } 1594 }
1592 1595
1593 if (input_style & XIMPreeditArea) 1596#if 0
1597 // unfortunately, only the focus window is used by XIM, hard to fix
1598 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1599 vt_select_input ();
1600#endif
1601
1594 IMSetStatusPosition (); 1602 IMSetPosition ();
1595 1603
1596 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1597 return true; 1604 return true;
1598} 1605}
1599 1606
1600void 1607void
1601rxvt_term::im_cb () 1608rxvt_term::im_cb ()
… …
1607 1614
1608 make_current (); 1615 make_current ();
1609 1616
1610 im_destroy (); 1617 im_destroy ();
1611 1618
1612 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1613 if (Input_Context) 1619 if (Input_Context)
1614 return; 1620 return;
1615 1621
1616#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1622#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1617 if (rs[Rs_imLocale]) 1623 if (rs[Rs_imLocale])
… …
1659 SET_LOCALE (locale); 1665 SET_LOCALE (locale);
1660#endif 1666#endif
1661} 1667}
1662 1668
1663void 1669void
1664rxvt_term::IMSetStatusPosition () 1670rxvt_term::IMSetPosition ()
1665{ 1671{
1666 XRectangle preedit_rect, status_rect, *needed_rect; 1672 XRectangle preedit_rect, status_rect, *needed_rect;
1667 XVaNestedList preedit_attr, status_attr; 1673 XVaNestedList preedit_attr, status_attr;
1668 1674
1669 if (!Input_Context 1675 if (!Input_Context
1670 || !focus 1676 || !focus
1671 || !(input_style & XIMPreeditArea) 1677 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1672 || !IMisRunning ()) 1678 || !IMisRunning ())
1673 return; 1679 return;
1674 1680
1681 if (input_style & XIMPreeditPosition)
1682 {
1683 im_set_size (preedit_rect);
1684 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1685
1686 XSetICValues (Input_Context,
1687 XNPreeditAttributes, preedit_attr, NULL);
1688 }
1689 else
1690 {
1675 /* Getting the necessary width of preedit area */ 1691 /* Getting the necessary width of preedit area */
1676 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1692 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1677 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1693 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1678 XFree (status_attr); 1694 XFree (status_attr);
1679 1695
1680 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1696 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1681 XFree (needed_rect); 1697 XFree (needed_rect);
1682 1698
1683 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1699 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1684 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1700 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1685 1701
1686 XSetICValues (Input_Context, 1702 XSetICValues (Input_Context,
1687 XNPreeditAttributes, preedit_attr, 1703 XNPreeditAttributes, preedit_attr,
1688 XNStatusAttributes, status_attr, NULL); 1704 XNStatusAttributes, status_attr,
1705 NULL);
1689 1706
1707 XFree (status_attr);
1708 }
1709
1690 XFree (preedit_attr); 1710 XFree (preedit_attr);
1691 XFree (status_attr);
1692} 1711}
1693#endif /* USE_XIM */ 1712#endif /* USE_XIM */
1694 1713
1695/*----------------------------------------------------------------------*/ 1714void
1696rxvt_t rxvt_current_term; 1715rxvt_term::get_window_origin (int &x, int &y)
1716{
1717 Window cr;
1718 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1719/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1720}
1721
1722Pixmap
1723rxvt_term::get_pixmap_property (int prop_id)
1724{
1725 if (prop_id > 0 && prop_id < NUM_XA)
1726 if (xa[prop_id])
1727 {
1728 int aformat;
1729 unsigned long nitems, bytes_after;
1730 Atom atype;
1731 unsigned char *prop = NULL;
1732 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1733 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1734 &nitems, &bytes_after, &prop);
1735 if (result == Success && prop && atype == XA_PIXMAP)
1736 {
1737 return *(Pixmap *)prop;
1738 }
1739 }
1740 return None;
1741}
1742
1743#ifdef HAVE_BG_PIXMAP
1744# if TRACE_PIXMAPS
1745# undef update_background
1746int rxvt_term::trace_update_background (const char* file, int line)
1747{
1748 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1749 update_background ();
1750}
1751# endif
1752int
1753rxvt_term::update_background ()
1754{
1755 bgPixmap.invalidate ();
1756
1757 /* no chance of real time refresh if we are blurring! */
1758 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1759 bgPixmap.render ();
1760 else
1761 {
1762 update_background_ev.stop ();
1763
1764 if (!bgPixmap.need_client_side_rendering())
1765 update_background_ev.start (.05);
1766 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1767 update_background_ev.start (.20); /* very slow !!! */
1768 else
1769 update_background_ev.start (.07);
1770 }
1771
1772 return 0;
1773}
1774
1775void
1776rxvt_term::update_background_cb (ev::timer &w, int revents)
1777{
1778 bgPixmap.render ();
1779}
1780
1781#endif /* HAVE_BG_PIXMAP */
1697 1782
1698/*----------------------- end-of-file (C source) -----------------------*/ 1783/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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