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.162 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.308 by ayin, Tue Feb 19 13:01:32 2008 UTC

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

Diff Legend

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