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.160 by root, Wed Jan 4 05:35:34 2006 UTC vs.
Revision 1.253 by ayin, Mon Oct 15 07:33:48 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines