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.195 by root, Sun Jan 22 00:48:13 2006 UTC vs.
Revision 1.300 by root, Sat Jan 19 00:24:53 2008 UTC

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

Diff Legend

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