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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines