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.76 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.303 by ayin, Sun Jan 27 22:48:33 2008 UTC

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

Diff Legend

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