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

Diff Legend

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