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.233 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.392 by sf-exg, Mon Nov 3 09:40:26 2014 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
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 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 45#include <termios.h>
49#endif
50 46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# include <locale.h>
52#endif
53
54struct termios rxvt_term::def_tio;
51vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
52 56
53// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
55 59
… …
88class rxvt_composite_vec rxvt_composite; 92class rxvt_composite_vec rxvt_composite;
89 93
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 95{
92 compose_char *cc; 96 compose_char *cc;
93 97
94 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
96 cc = (*this)[c1]; 100 cc = (*this)[c1];
97 while (cc) 101 while (cc)
98 { 102 {
99 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
100 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
101 } 105 }
102 106
103 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
104 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
105 {
106 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
107 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
108 }
109 111
110 // allocate a new combination 112 // allocate a new combination
111 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
112 { 114 {
113 static int seen; 115 static int seen;
114 116
115 if (!seen++) 117 if (!seen++)
116 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
117 119
118 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
119 } 121 }
120 122
121 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
147 149
148} 150}
149#endif 151#endif
150 152
151rxvt_term::rxvt_term () 153rxvt_term::rxvt_term ()
152 : 154{
153#if TRANSPARENT || ENABLE_PERL 155#if HAVE_BG_PIXMAP
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 156 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
155 check_our_aprents_ev(this, &rxvt_term::check_our_parents_cb),
156#endif
157#ifdef HAVE_SCROLLBARS
158 scrollbar_ev (this, &rxvt_term::x_cb),
159#endif 157#endif
160#ifdef CURSOR_BLINK 158#ifdef CURSOR_BLINK
161 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 159 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
162#endif 160#endif
163#ifdef TEXT_BLINK 161#ifdef TEXT_BLINK
164 text_blink_ev (this, &rxvt_term::text_blink_cb), 162 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
165#endif 163#endif
166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 164#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
167 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 165 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
168#endif 166#endif
169#ifdef SELECTION_SCROLLING 167#ifdef SELECTION_SCROLLING
170 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 169#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
172#endif
173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
175#endif
176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
177#if USE_XIM
178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
174#endif 179#endif
175#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
176 pointer_ev (this, &rxvt_term::pointer_cb), 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
177#endif 182#endif
178#ifdef USE_XIM
179 im_ev (this, &rxvt_term::im_cb),
180#endif
181#ifndef NO_BELL 183#ifndef NO_BELL
182 bell_ev (this, &rxvt_term::bell_cb), 184 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
183#endif 185#endif
184 termwin_ev (this, &rxvt_term::x_cb), 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
185 vt_ev (this, &rxvt_term::x_cb), 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
186 child_ev (this, &rxvt_term::child_cb), 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
187 check_ev (this, &rxvt_term::check_cb), 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
188 flush_ev (this, &rxvt_term::flush_cb), 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189 destroy_ev (this, &rxvt_term::destroy_cb), 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190 pty_ev (this, &rxvt_term::pty_cb), 192
191 incr_ev (this, &rxvt_term::incr_cb)
192{
193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
194 194
195 termlist.push_back (this); 195 termlist.push_back (this);
196 196
197#ifdef KEYSYM_RESOURCE 197#ifdef KEYSYM_RESOURCE
… …
199#endif 199#endif
200} 200}
201 201
202// clean up the most important stuff, do *not* call x or free mem etc. 202// clean up the most important stuff, do *not* call x or free mem etc.
203// for use before an emergency exit 203// for use before an emergency exit
204void
204void rxvt_term::emergency_cleanup () 205rxvt_term::emergency_cleanup ()
205{ 206{
206 if (cmd_pid) 207 if (cmd_pid)
207 kill (-cmd_pid, SIGHUP); 208 kill (-cmd_pid, SIGHUP);
208 209
209 pty_ev.stop (); 210 pty_ev.stop ();
… …
221 if (fontset[i] != fontset[0]) 222 if (fontset[i] != fontset[0])
222 delete fontset[i]; 223 delete fontset[i];
223#endif 224#endif
224 delete fontset[0]; 225 delete fontset[0];
225 226
227#ifdef HAVE_BG_PIXMAP
228 bg_destroy ();
229#endif
230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
226 if (display) 235 if (display)
227 { 236 {
228 selection_clear (); 237 selection_clear ();
238 selection_clear (true);
229 239
230#ifdef USE_XIM 240#if USE_XIM
231 im_destroy (); 241 im_destroy ();
232#endif 242#endif
233#ifdef XTERM_SCROLLBAR 243 scrollBar.destroy ();
234 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); 244
235 if (ShadowGC) XFreeGC (dpy, ShadowGC); 245 if (gc)
236#endif
237#ifdef PLAIN_SCROLLBAR
238 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
239#endif
240#ifdef NEXT_SCROLLBAR
241 if (blackGC) XFreeGC (dpy, blackGC);
242 if (whiteGC) XFreeGC (dpy, whiteGC);
243 if (grayGC) XFreeGC (dpy, grayGC);
244 if (darkGC) XFreeGC (dpy, darkGC);
245 if (stippleGC) XFreeGC (dpy, stippleGC);
246 if (dimple) XFreePixmap (dpy, dimple);
247 if (upArrow) XFreePixmap (dpy, upArrow);
248 if (downArrow) XFreePixmap (dpy, downArrow);
249 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
250 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
251#endif
252#ifdef RXVT_SCROLLBAR
253 if (topShadowGC) XFreeGC (dpy, topShadowGC);
254 if (botShadowGC) XFreeGC (dpy, botShadowGC);
255 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
256#endif
257 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
258 247
259 delete drawable; 248 delete drawable;
249
260 // destroy all windows 250 // destroy all windows
261 if (parent[0]) 251 if (parent)
262 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
263 253
264 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
265 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
266 { 256 {
267 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
… …
269 pix_colors_unfocused [i].free (this); 259 pix_colors_unfocused [i].free (this);
270#endif 260#endif
271 } 261 }
272 262
273 clear (); 263 clear ();
274 }
275 264
276 delete [] pix_colors_focused; 265 display->flush (); /* ideally .put should do this */
277#if OFF_FOCUS_FADING
278 delete [] pix_colors_unfocused;
279#endif
280
281 displays.put (display); 266 displays.put (display);
267 }
282 268
283 scr_release (); 269 scr_release ();
284 270
285 /* clear all resources */ 271 /* clear all resources */
286 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
287 free (allocated [i]); 273 free (allocated [i]);
288 274
289 free (selection.text); 275 free (selection.text);
290 // TODO: manage env vars in child only(!) 276 free (selection.clip_text);
291 free (env_display);
292 free (env_term);
293 free (locale); 277 free (locale);
294 free (v_buffer); 278 free (v_buffer);
295 free (incr_buf); 279
280 delete selection_req;
281
282 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
283 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
284
285 delete env;
296 286
297 delete envv; 287 delete envv;
298 delete argv; 288 delete argv;
299 289
300#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
301 delete keyboard; 291 delete keyboard;
302#endif 292#endif
293#ifndef NO_RESOURCES
294 XrmDestroyDatabase (option_db);
295#endif
303} 296}
304 297
305// child has exited, usually destroys 298// child has exited, usually destroys
306void 299void
307rxvt_term::child_cb (child_watcher &w, int status) 300rxvt_term::child_cb (ev::child &w, int status)
308{ 301{
309 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
310 303
311 cmd_pid = 0; 304 cmd_pid = 0;
312 305
… …
315} 308}
316 309
317void 310void
318rxvt_term::destroy () 311rxvt_term::destroy ()
319{ 312{
320 if (destroy_ev.active) 313 if (destroy_ev.is_active ())
321 return; 314 return;
322 315
323 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
324 317
325#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
… …
329 if (display) 322 if (display)
330 { 323 {
331#if USE_XIM 324#if USE_XIM
332 im_ev.stop (display); 325 im_ev.stop (display);
333#endif 326#endif
334#if HAVE_SCROLLBARS
335 scrollbar_ev.stop (display); 327 scrollbar_ev.stop (display);
336#endif 328#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
337#if TRANSPARENT || ENABLE_PERL
338 rootwin_ev.stop (display); 329 rootwin_ev.stop (display);
339#endif 330#endif
340 incr_ev.stop ();
341 termwin_ev.stop (display); 331 termwin_ev.stop (display);
342 vt_ev.stop (display); 332 vt_ev.stop (display);
343 } 333 }
344 334
345 check_ev.stop (); 335 flush_ev.stop ();
346 pty_ev.stop (); 336 pty_ev.stop ();
347#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
348 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
349#endif 339#endif
350#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
358#endif 348#endif
359#ifdef POINTER_BLANK 349#ifdef POINTER_BLANK
360 pointer_ev.stop (); 350 pointer_ev.stop ();
361#endif 351#endif
362 352
363 destroy_ev.start (0); 353 destroy_ev.start ();
364} 354}
365 355
366void 356void
367rxvt_term::destroy_cb (time_watcher &w) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
368{ 358{
369 make_current (); 359 make_current ();
370 360
371 delete this; 361 delete this;
362}
363
364void
365rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
366{
367 if (!opt)
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);
372} 374}
373 375
374/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
375/* 377/*
376 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
377 * TODO: if debugging, this should free up any known resources if we can
378 */ 379 */
379static XErrorHandler old_xerror_handler; 380static XErrorHandler old_xerror_handler;
380 381
381static void 382static void
382rxvt_emergency_cleanup () 383rxvt_emergency_cleanup ()
… …
384 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 385 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
385 (*t)->emergency_cleanup (); 386 (*t)->emergency_cleanup ();
386} 387}
387 388
388#if !ENABLE_MINIMAL 389#if !ENABLE_MINIMAL
389static void 390static void ecb_cold
390print_x_error (Display *dpy, XErrorEvent *event) 391print_x_error (Display *dpy, XErrorEvent *event)
391{ 392{
392 char buffer[BUFSIZ]; 393 char buffer[BUFSIZ];
393 char mesg[BUFSIZ]; 394 char mesg[BUFSIZ];
394 char number[32]; 395 char number[32];
395 char *mtype = "XlibMessage"; 396
396 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
397 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
398 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 397 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
398
399 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
400 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
401
402 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
403 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
399 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
400 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
401 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 407 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
402 sprintf(number, "%d", event->request_code); 408
403 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
404 rxvt_warn ("(which is %s)\n", buffer);
405 if (event->request_code >= 128) { 409 if (event->request_code >= 128)
406 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 {
407 mesg, BUFSIZ); 411#if 0
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 412 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
413 int nexts;
414 char **exts = XListExtensions (dpy, &nexts);
415
416 while (nexts)
417 {
418 char *extname = exts [nexts - 1];
419 int major, first_event, first_error;
420
421 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
422 {
423 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
424 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
425
426 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
427 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
428 rxvt_warn ("+ (which is %s)\n", buffer);
429
430 break;
431 }
432
433 printf ("nextss %d %s\n", nexts, extname);//D
434 --nexts;
435 ++exts;
436 }
437#else
438 int nexts = 0;
439 char **exts = 0;
440#endif
441
442 if (!nexts)
443 {
444 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
445
446 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
447 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
448
449#if 0
450 sprintf (number, "RENDER.%d", event->minor_code);
451 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
452 rxvt_warn ("+ (which is %s)\n", buffer);
453#endif
454 }
455
456 XFreeExtensionList (exts);
409 } 457 }
458 else
459 {
460 sprintf (number, "%d", event->request_code);
461 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
462 rxvt_warn ("+ (which is %s)\n", buffer);
463 }
464
410 if ((event->error_code == BadWindow) || 465 if (event->error_code == BadWindow
411 (event->error_code == BadPixmap) || 466 || event->error_code == BadPixmap
412 (event->error_code == BadCursor) || 467 || event->error_code == BadCursor
413 (event->error_code == BadFont) || 468 || event->error_code == BadFont
414 (event->error_code == BadDrawable) || 469 || event->error_code == BadDrawable
415 (event->error_code == BadColor) || 470 || event->error_code == BadColor
416 (event->error_code == BadGC) || 471 || event->error_code == BadGC
417 (event->error_code == BadIDChoice) || 472 || event->error_code == BadIDChoice
418 (event->error_code == BadValue) || 473 || event->error_code == BadValue
419 (event->error_code == BadAtom)) { 474 || event->error_code == BadAtom)
475 {
420 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
421 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
422 mesg, BUFSIZ);
423 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
424 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
425 mesg, BUFSIZ); 480 else
426 else
427 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
428 mesg, BUFSIZ);
429 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
430 }
431 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
432 mesg, BUFSIZ);
433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
434}
435#endif
436 482
437int 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
484 }
485}
486#endif
487
488int ecb_cold
438rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
439{ 490{
440 if (GET_R->allowedxerror == -1) 491 if (GET_R->allowedxerror == -1)
441 GET_R->allowedxerror = event->error_code; 492 GET_R->allowedxerror = event->error_code;
442 else 493 else
… …
451 } 502 }
452 503
453 return 0; 504 return 0;
454} 505}
455 506
456int 507int ecb_cold
457rxvt_xioerror_handler (Display *display) 508rxvt_xioerror_handler (Display *display)
458{ 509{
459 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 510 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
460 DisplayString (display)); 511 DisplayString (display));
461 rxvt_emergency_cleanup (); 512 rxvt_emergency_cleanup ();
462 _exit (EXIT_FAILURE); 513 _exit (EXIT_FAILURE);
463} 514}
464 515
465/*----------------------------------------------------------------------*/
466bool
467rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
468{
469 this->envv = envv;
470
471 SET_R (this);
472 set_locale ("");
473 set_environ (envv); // few things in X do not call setlocale :(
474
475 if (!init_vars ())
476 return false;
477
478 init_secondary ();
479
480 const char **cmd_argv = init_resources (argc, argv);
481
482#ifdef KEYSYM_RESOURCE
483 keyboard->register_done ();
484#endif
485
486#ifdef HAVE_SCROLLBARS
487 if (option (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */
489#endif
490
491 pty = ptytty::create ();
492
493 create_windows (argc, argv);
494
495 init_xlocale ();
496
497 scr_reset (); // initialize screen
498
499#if 0
500 XSynchronize (dpy, True);
501#endif
502
503#ifdef HAVE_SCROLLBARS
504 if (option (Opt_scrollBar))
505 resize_scrollbar (); /* create and map scrollbar */
506#endif
507#ifdef TRANSPARENT
508 if (option (Opt_transparent))
509 {
510 XSelectInput (dpy, display->root, PropertyChangeMask);
511 check_our_parents ();
512 rootwin_ev.start (display, display->root);
513 }
514#endif
515#if ENABLE_PERL
516 rootwin_ev.start (display, display->root);
517#endif
518
519 set_colorfgbg ();
520
521 init_command (cmd_argv);
522
523 free (cmd_argv);
524
525 if (pty->pty >= 0)
526 pty_ev.start (pty->pty, EVENT_READ);
527
528 check_ev.start ();
529
530 HOOK_INVOKE ((this, HOOK_START, DT_END));
531
532#if ENABLE_XEMBED
533 if (rs[Rs_embed])
534 {
535 long info[2] = { 0, XEMBED_MAPPED };
536
537 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
538 32, PropModeReplace, (unsigned char *)&info, 2);
539 }
540#endif
541
542 XMapWindow (dpy, vt);
543 XMapWindow (dpy, parent[0]);
544
545 return true;
546}
547
548static struct sig_handlers 516static struct sig_handlers
549{ 517{
550 sig_watcher sw_term, sw_int; 518 ev::sig sw_term, sw_int;
551 519
552 /* 520 /*
553 * Catch a fatal signal and tidy up before quitting 521 * Catch a fatal signal and tidy up before quitting
554 */ 522 */
555 void 523 void sig_term (ev::sig &w, int revents);
556 sig_term (sig_watcher &w) 524
525 sig_handlers ()
557 { 526 {
558 rxvt_emergency_cleanup (); 527 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
559 signal (w.signum, SIG_DFL);
560 kill (getpid (), w.signum);
561 }
562
563 sig_handlers ()
564 : sw_term (this, &sig_handlers::sig_term),
565 sw_int (this, &sig_handlers::sig_term) 528 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
566 {
567 } 529 }
568} sig_handlers; 530} sig_handlers;
569 531
532void
533sig_handlers::sig_term (ev::sig &w, int revents)
534{
535 rxvt_emergency_cleanup ();
536 w.stop ();
537 kill (getpid (), w.signum);
538}
539
540static void
541rxvt_get_ttymode (struct termios *tio)
542{
543 if (tcgetattr (STDIN_FILENO, tio) < 0)
544 memset (tio, 0, sizeof (struct termios));
545
546 for (int i = 0; i < NCCS; i++)
547 tio->c_cc[i] = VDISABLE;
548
549 tio->c_cc[VINTR] = CINTR;
550 tio->c_cc[VQUIT] = CQUIT;
551 tio->c_cc[VERASE] = CERASE;
552#ifdef VERASE2
553 tio->c_cc[VERASE2] = CERASE2;
554#endif
555 tio->c_cc[VKILL] = CKILL;
556 tio->c_cc[VEOF] = CEOF;
557 tio->c_cc[VSTART] = CSTART;
558 tio->c_cc[VSTOP] = CSTOP;
559 tio->c_cc[VSUSP] = CSUSP;
560# ifdef VDSUSP
561 tio->c_cc[VDSUSP] = CDSUSP;
562# endif
563# ifdef VREPRINT
564 tio->c_cc[VREPRINT] = CRPRNT;
565# endif
566# ifdef VDISCRD
567 tio->c_cc[VDISCRD] = CFLUSH;
568# endif
569# ifdef VWERSE
570 tio->c_cc[VWERSE] = CWERASE;
571# endif
572# ifdef VLNEXT
573 tio->c_cc[VLNEXT] = CLNEXT;
574# endif
575# ifdef VSTATUS
576 tio->c_cc[VSTATUS] = CSTATUS;
577# endif
578
579# if VMIN != VEOF
580 tio->c_cc[VMIN] = 1;
581# endif
582# if VTIME != VEOL
583 tio->c_cc[VTIME] = 0;
584# endif
585
586 /* input modes */
587 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
588# ifdef IMAXBEL
589 | IMAXBEL
590# endif
591 | IXON);
592
593 /* output modes */
594 tio->c_oflag = (OPOST | ONLCR);
595
596 /* control modes */
597 tio->c_cflag = (CS8 | CREAD);
598
599 /* local modes */
600 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
601# if defined (ECHOCTL) && defined (ECHOKE)
602 | ECHOCTL | ECHOKE
603# endif
604 | ECHOE | ECHOK);
605}
606
570char **rxvt_environ; // startup environment 607char **rxvt_environ; // startup environment
571 608
572void 609void
573rxvt_init () 610rxvt_init ()
574{ 611{
575 ptytty::init (); 612 assert (("fontMask must not overlap other RS masks",
613 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
614
615 rxvt_get_ttymode (&rxvt_term::def_tio);
616
617 // get rid of stdin/stdout as we don't need them, to free resources
618 dup2 (STDERR_FILENO, STDIN_FILENO);
619 dup2 (STDERR_FILENO, STDOUT_FILENO);
620
621 if (!ev_default_loop ())
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
576 623
577 rxvt_environ = environ; 624 rxvt_environ = environ;
578 625
579 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
580 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
581 628
582 sig_handlers.sw_term.start (SIGTERM); 629 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
583 sig_handlers.sw_int.start (SIGINT); 630 sig_handlers.sw_int.start (SIGINT); ev_unref ();
584
585 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
586 /* signal (SIGURG, SIG_DFL); */
587 631
588 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
589 // TODO: handle this with exceptions and tolerate the memory loss 633 // TODO: handle this with exceptions and tolerate the memory loss
590 XSetIOErrorHandler (rxvt_xioerror_handler); 634 XSetIOErrorHandler (rxvt_xioerror_handler);
591 635
592 XrmInitialize (); 636 XrmInitialize ();
593}
594 637
595/* ------------------------------------------------------------------------- * 638#if HAVE_PIXBUF
596 * MEMORY ALLOCATION WRAPPERS * 639 g_type_init ();
597 * ------------------------------------------------------------------------- */ 640#endif
598void *
599rxvt_malloc (size_t size)
600{
601 void *p = malloc (size);
602
603 if (!p)
604 rxvt_fatal ("memory allocation failure. aborting.\n");
605
606 return p;
607}
608
609void *
610rxvt_calloc (size_t number, size_t size)
611{
612 void *p = calloc (number, size);
613
614 if (!p)
615 rxvt_fatal ("memory allocation failure. aborting.\n");
616
617 return p;
618}
619
620void *
621rxvt_realloc (void *ptr, size_t size)
622{
623 void *p = realloc (ptr, size);
624
625 if (!p)
626 rxvt_fatal ("memory allocation failure. aborting.\n");
627
628 return p;
629} 641}
630 642
631/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
632/* 644/*
633 * window size/position calculcations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
634 * if width/height are non-zero then override calculated width/height 646 * if width/height are non-zero then override calculated width/height
635 */ 647 */
636void 648void
637rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
638{ 650{
639 short recalc_x, recalc_y; 651 short recalc_x, recalc_y;
640 int x, y, sb_w, flags; 652 int x, y, flags;
641 unsigned int w, h; 653 unsigned int w, h;
642 unsigned int max_width, max_height; 654 unsigned int max_width, max_height;
643 655
644 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 656 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
645 szHint.win_gravity = NorthWestGravity; 657 szHint.win_gravity = NorthWestGravity;
… …
655 if (rs[Rs_geometry]) 667 if (rs[Rs_geometry])
656 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 668 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
657 669
658 if (flags & WidthValue) 670 if (flags & WidthValue)
659 { 671 {
672 if (!w)
673 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
674
660 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 675 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
661 szHint.flags |= USSize; 676 szHint.flags |= USSize;
662 } 677 }
663 678
664 if (flags & HeightValue) 679 if (flags & HeightValue)
665 { 680 {
681 if (!h)
682 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
683
666 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 684 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
667 szHint.flags |= USSize; 685 szHint.flags |= USSize;
668 } 686 }
669 687
670 if (flags & XValue) 688 if (flags & XValue)
671 { 689 {
… …
702 max_width = MAX_COLS * fwidth; 720 max_width = MAX_COLS * fwidth;
703 max_height = MAX_ROWS * fheight; 721 max_height = MAX_ROWS * fheight;
704 722
705 szHint.base_width = szHint.base_height = 2 * int_bwidth; 723 szHint.base_width = szHint.base_height = 2 * int_bwidth;
706 724
707 sb_w = 0;
708 window_vt_x = window_vt_y = int_bwidth; 725 window_vt_x = window_vt_y = int_bwidth;
709 726
710 if (scrollBar.state) 727 if (scrollBar.state)
711 { 728 {
712 sb_w = scrollbar_TotalWidth (); 729 int sb_w = scrollBar.total_width ();
713 szHint.base_width += sb_w; 730 szHint.base_width += sb_w;
714 731
715 if (!option (Opt_scrollBar_right)) 732 if (!option (Opt_scrollBar_right))
716 window_vt_x += sb_w; 733 window_vt_x += sb_w;
717 } 734 }
… …
741 { 758 {
742 min_it (height, max_height); 759 min_it (height, max_height);
743 szHint.height = szHint.base_height + height; 760 szHint.height = szHint.base_height + height;
744 } 761 }
745 762
746 if (scrollBar.state && option (Opt_scrollBar_right))
747 window_sb_x = szHint.width - sb_w;
748
749 if (recalc_x) 763 if (recalc_x)
750 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 764 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
751 765
752 if (recalc_y) 766 if (recalc_y)
753 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
754 768
755 ncol = width / fwidth; 769 ncol = width / fwidth;
756 nrow = height / fheight; 770 nrow = height / fheight;
771
772 // When the size of the vt window is not a multiple of the cell
773 // size, i.e., when the wm does not honour our size hints, there are
774 // extra areas not covered by the terminal screen. Such gaps, when a
775 // bg pixmap is set, would have to be cleared manually to properly
776 // refresh the background. We take the simpler route and shrink the
777 // vt window so as to avoid creating gaps.
778 vt_width = ncol * fwidth;
779 vt_height = nrow * fheight;
757} 780}
758 781
759/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
760/* 783/*
761 * Tell the teletype handler what size the window is. 784 * Tell the teletype handler what size the window is.
… …
769 792
770 struct winsize ws; 793 struct winsize ws;
771 794
772 ws.ws_col = ncol; 795 ws.ws_col = ncol;
773 ws.ws_row = nrow; 796 ws.ws_row = nrow;
774 ws.ws_xpixel = width; 797 ws.ws_xpixel = vt_width;
775 ws.ws_ypixel = height; 798 ws.ws_ypixel = vt_height;
776 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 799 ioctl (pty->pty, TIOCSWINSZ, &ws);
777 800
778#if 0 801#if 0
779 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 802 // TIOCSWINSZ is supposed to do this automatically and correctly
780 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
781 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
782#endif 805#endif
783} 806}
784 807
785/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
786/* set_fonts () - load and set the various fonts 809/* load and set the various fonts */
787 *
788 * init = 1 - initialize
789 *
790 * fontname == FONT_UP - switch to bigger font
791 * fontname == FONT_DN - switch to smaller font
792 */
793bool 810bool
794rxvt_term::set_fonts () 811rxvt_term::set_fonts ()
795{ 812{
796 rxvt_fontset *fs = new rxvt_fontset (this); 813 rxvt_fontset *fs = new rxvt_fontset (this);
797 rxvt_fontprop prop; 814 rxvt_fontprop prop;
… …
811#endif 828#endif
812 829
813 delete fontset[0]; 830 delete fontset[0];
814 fontset[0] = fs; 831 fontset[0] = fs;
815 832
816 prop = (*fs)[1]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
817 prop.height += lineSpace; 834 prop.width = max (prop.width + letterSpace, 1);
818 835
819 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
820 837
821 fwidth = prop.width; 838 fwidth = prop.width;
822 fheight = prop.height; 839 fheight = prop.height + lineSpace;
823 fbase = prop.ascent; 840 fbase = prop.ascent;
824 841
825 for (int style = 1; style < 4; style++) 842 for (int style = 1; style < 4; style++)
826 { 843 {
827#if ENABLE_STYLES 844#if ENABLE_STYLES
… …
853#else 870#else
854 fontset[style] = fontset[0]; 871 fontset[style] = fontset[0];
855#endif 872#endif
856 } 873 }
857 874
858 if (parent[0]) 875 if (parent)
859 { 876 {
860 resize_all_windows (0, 0, 0); 877 resize_all_windows (0, 0, 0);
861 scr_remap_chars (); 878 scr_remap_chars ();
862 scr_touch (true); 879 scr_touch (true);
863 } 880 }
864 881
865 return true; 882 return true;
866} 883}
867 884
885void
868void rxvt_term::set_string_property (Atom prop, const char *str, int len) 886rxvt_term::set_string_property (Atom prop, const char *str, int len)
869{ 887{
870 XChangeProperty (dpy, parent[0], 888 XChangeProperty (dpy, parent,
871 prop, XA_STRING, 8, PropModeReplace, 889 prop, XA_STRING, 8, PropModeReplace,
872 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 890 (const unsigned char *)str, len >= 0 ? len : strlen (str));
873} 891}
874 892
893void
894rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
895{
896 XTextProperty ct;
897
898 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
899 {
900 XSetTextProperty (dpy, parent, &ct, prop);
901 XFree (ct.value);
902 }
903}
904
905void
875void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 906rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
876{ 907{
877 wchar_t *ws = rxvt_mbstowcs (str, len); 908 wchar_t *ws = rxvt_mbstowcs (str, len);
878 char *s = rxvt_wcstoutf8 (ws); 909 char *s = rxvt_wcstoutf8 (ws);
879 910
880 XChangeProperty (dpy, parent[0], 911 XChangeProperty (dpy, parent,
881 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
882 (const unsigned char *)s, strlen (s)); 913 (const unsigned char *)s, strlen (s));
883 914
884 free (s); 915 free (s);
885 free (ws); 916 free (ws);
… …
889/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
890/* xterm sequences - title, iconName, color (exptl) */ 921/* xterm sequences - title, iconName, color (exptl) */
891void 922void
892rxvt_term::set_title (const char *str) 923rxvt_term::set_title (const char *str)
893{ 924{
894 set_string_property (XA_WM_NAME, str); 925 set_mbstring_property (XA_WM_NAME, str);
895#if ENABLE_EWMH 926#if ENABLE_EWMH
896 set_utf8_property (xa[XA_NET_WM_NAME], str); 927 set_utf8_property (xa[XA_NET_WM_NAME], str);
897#endif 928#endif
898} 929}
899 930
900void 931void
901rxvt_term::set_icon_name (const char *str) 932rxvt_term::set_icon_name (const char *str)
902{ 933{
903 set_string_property (XA_WM_ICON_NAME, str); 934 set_mbstring_property (XA_WM_ICON_NAME, str);
904#if ENABLE_EWMH 935#if ENABLE_EWMH
905 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 936 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
906#endif 937#endif
907} 938}
908 939
940void
941rxvt_term::set_window_color (int idx, const char *color)
942{
909#ifdef XTERM_COLOR_CHANGE 943#ifdef XTERM_COLOR_CHANGE
910void
911rxvt_term::set_window_color (int idx, const char *color)
912{
913 rxvt_color xcol; 944 rxvt_color xcol;
914 int i; 945
915
916 if (color == NULL || *color == '\0') 946 if (color == NULL || *color == '\0')
917 return; 947 return;
918 948
919 color = strdup (color); 949 color = strdup (color);
920 allocated.push_back ((void *)color); 950 allocated.push_back ((void *)color);
921 rs[Rs_color + idx] = color; 951 rs[Rs_color + idx] = color;
922 952
923 /* handle color aliases */ 953 /* handle color aliases */
924 if (isdigit (*color)) 954 if (isdigit (*color))
925 { 955 {
926 i = atoi (color); 956 int i = atoi (color);
927 957
928 if (i >= 8 && i <= 15) 958 if (i >= 8 && i <= 15)
959 {
929 { /* bright colors */ 960 /* bright colors */
930 i -= 8;
931 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 961 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
932 goto done; 962 goto done;
933 } 963 }
934 964
935 if (i >= 0 && i <= 7) 965 if (i >= 0 && i <= 7)
966 {
936 { /* normal colors */ 967 /* normal colors */
937 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 968 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
938 goto done; 969 goto done;
939 } 970 }
940 } 971 }
941 972
… …
946 * so just keep gobbling up the colormap 977 * so just keep gobbling up the colormap
947 */ 978 */
948 979
949 pix_colors_focused[idx] = xcol; 980 pix_colors_focused[idx] = xcol;
950 981
951 /* XSetWindowAttributes attr; */
952 /* Cursor cursor; */
953done: 982done:
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 983 /*TODO: handle Color_BD, scrollbar background, etc. */
955 984
956 update_fade_color (idx); 985 update_fade_color (idx);
957 recolour_cursor (); 986 recolour_cursor ();
958 scr_recolour (); 987 scr_recolour ();
988#endif /* XTERM_COLOR_CHANGE */
959} 989}
960
961#else
962# define set_window_color (idx,color) ((void)0)
963#endif /* XTERM_COLOR_CHANGE */
964 990
965void 991void
966rxvt_term::recolour_cursor () 992rxvt_term::recolour_cursor ()
967{ 993{
968 XColor fg, bg; 994 XColor fg, bg;
… …
980 1006
981/*----------------------------------------------------------------------*/ 1007/*----------------------------------------------------------------------*/
982/* 1008/*
983 * find if fg/bg matches any of the normal (low-intensity) colors 1009 * find if fg/bg matches any of the normal (low-intensity) colors
984 */ 1010 */
985void 1011char *
986rxvt_term::set_colorfgbg () 1012rxvt_term::get_colorfgbg ()
987{ 1013{
988 unsigned int i; 1014 unsigned int i;
989 const char *xpmb = "\0"; 1015 const char *xpmb = "";
990 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1016 char fstr[] = "default";
1017 char bstr[] = "default";
1018 char *env_colorfgbg;
991 1019
992 strcpy (fstr, "default");
993 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 1020 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 1021 if (pix_colors[Color_fg] == pix_colors[i])
996 { 1022 {
997 sprintf (fstr, "%d", (i - Color_Black)); 1023 sprintf (fstr, "%d", i - Color_Black);
998 break; 1024 break;
999 } 1025 }
1000 1026
1001 for (i = Color_Black; i <= Color_White; i++) 1027 for (i = Color_Black; i <= Color_White; i++)
1002 if (pix_colors[Color_bg] == pix_colors[i]) 1028 if (pix_colors[Color_bg] == pix_colors[i])
1003 { 1029 {
1004 sprintf (bstr, "%d", (i - Color_Black)); 1030 sprintf (bstr, "%d", i - Color_Black);
1005#ifdef XPM_BACKGROUND 1031#if BG_IMAGE_FROM_FILE
1006 xpmb = "default;"; 1032 xpmb = "default;";
1007#endif 1033#endif
1008 break; 1034 break;
1009 } 1035 }
1010 1036
1037 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1011 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1038 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1039 return env_colorfgbg;
1012} 1040}
1013 1041
1014/*----------------------------------------------------------------------*/ 1042/*----------------------------------------------------------------------*/
1015 1043
1016bool 1044bool
… …
1039 int old_width = szHint.width; 1067 int old_width = szHint.width;
1040 int old_height = szHint.height; 1068 int old_height = szHint.height;
1041 1069
1042 window_calc (newwidth, newheight); 1070 window_calc (newwidth, newheight);
1043 1071
1044 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1072 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1073
1074 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1075 if (set_hint)
1076 {
1077 szHint.flags &= ~(PBaseSize | PResizeInc);
1045 XSetWMNormalHints (dpy, parent[0], &szHint); 1078 XSetWMNormalHints (dpy, parent, &szHint);
1079 szHint.flags |= PBaseSize | PResizeInc;
1080 }
1046 1081
1047 if (!ignoreparent) 1082 if (!ignoreparent)
1048 { 1083 {
1049#ifdef SMART_RESIZE 1084#ifdef SMART_RESIZE
1050 /* 1085 /*
… …
1054 int x, y, x1, y1; 1089 int x, y, x1, y1;
1055 int dx, dy; 1090 int dx, dy;
1056 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1091 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1057 Window unused_cr; 1092 Window unused_cr;
1058 1093
1059 XTranslateCoordinates (dpy, parent[0], display->root, 1094 XTranslateCoordinates (dpy, parent, display->root,
1060 0, 0, &x, &y, &unused_cr); 1095 0, 0, &x, &y, &unused_cr);
1061 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1096 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1062 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1097 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1063 /* 1098 /*
1064 * if display->root isn't the parent window, a WM will probably have offset 1099 * if display->root isn't the parent window, a WM will probably have offset
1065 * our position for handles and decorations. Counter it 1100 * our position for handles and decorations. Counter it
1066 */ 1101 */
… …
1083 if (y < y1) /* top half */ 1118 if (y < y1) /* top half */
1084 dy = 0; 1119 dy = 0;
1085 else if (y == y1) /* exact center */ 1120 else if (y == y1) /* exact center */
1086 dy /= 2; 1121 dy /= 2;
1087 1122
1088 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1123 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1089 szHint.width, szHint.height); 1124 szHint.width, szHint.height);
1090#else 1125#else
1091 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1126 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1092#endif 1127#endif
1093 } 1128 }
1129
1130 if (set_hint)
1131 XSetWMNormalHints (dpy, parent, &szHint);
1094 1132
1095 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1096 1134
1097 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
1098 { 1136 {
1099 if (scrollBar.state) 1137 if (scrollBar.state)
1100 { 1138 scrollBar.resize ();
1101 XMoveResizeWindow (dpy, scrollBar.win,
1102 window_sb_x, 0,
1103 scrollbar_TotalWidth (), szHint.height);
1104 resize_scrollbar ();
1105 }
1106 1139
1107 XMoveResizeWindow (dpy, vt, 1140 XMoveResizeWindow (dpy, vt,
1108 window_vt_x, window_vt_y, 1141 window_vt_x, window_vt_y,
1109 width, height); 1142 vt_width, vt_height);
1110 1143
1111 scr_clear (); 1144 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1112#ifdef XPM_BACKGROUND 1145
1113 resize_pixmap (); 1146#ifdef HAVE_BG_PIXMAP
1147 if (bg_window_size_sensitive ())
1148 update_background ();
1114#endif 1149#endif
1115 } 1150 }
1116 1151
1117 if (fix_screen || old_height == 0) 1152 if (fix_screen || old_height == 0)
1118 scr_reset (); 1153 scr_reset ();
1119 1154
1120 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1121 //scr_touch (false);
1122
1123#ifdef XPM_BACKGROUND
1124 if (pixmap)
1125 scr_touch (false);
1126#endif
1127
1128#ifdef USE_XIM 1155#if USE_XIM
1129 IMSetPosition (); 1156 im_set_position ();
1130#endif 1157#endif
1131} 1158}
1132 1159
1133/* 1160/*
1134 * Set the width/height of the vt window in characters. Units are pixels. 1161 * Set the width/height of the vt window in characters. Units are pixels.
… …
1147 newwidth = wattr.width - szHint.base_width; 1174 newwidth = wattr.width - szHint.base_width;
1148 if (newheight == 0) 1175 if (newheight == 0)
1149 newheight = wattr.height - szHint.base_height; 1176 newheight = wattr.height - szHint.base_height;
1150 } 1177 }
1151 1178
1152 if (newwidth != width || newheight != height) 1179 if (newwidth != vt_width || newheight != vt_height)
1153 { 1180 {
1154 newwidth += szHint.base_width; 1181 newwidth += szHint.base_width;
1155 newheight += szHint.base_height; 1182 newheight += szHint.base_height;
1156 resize_all_windows (newwidth, newheight, 0); 1183 resize_all_windows (newwidth, newheight, 0);
1157 } 1184 }
1158} 1185}
1159 1186
1160/* -------------------------------------------------------------------- * 1187/* -------------------------------------------------------------------- *
1161 * - X INPUT METHOD ROUTINES - * 1188 * - X INPUT METHOD ROUTINES - *
1162 * -------------------------------------------------------------------- */ 1189 * -------------------------------------------------------------------- */
1163#ifdef USE_XIM 1190#if USE_XIM
1164 1191
1165void 1192void
1166rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1193rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1167{ 1194{
1168 fg = pix_colors [Color_fg]; 1195 fg = pix_colors [Color_fg];
… …
1195 status_rect.height = fheight; 1222 status_rect.height = fheight;
1196} 1223}
1197 1224
1198/* Checking whether input method is running. */ 1225/* Checking whether input method is running. */
1199bool 1226bool
1200rxvt_term::IMisRunning () 1227rxvt_term::im_is_running ()
1201{ 1228{
1202 char *p;
1203 Atom atom; 1229 Atom atom;
1204 Window win; 1230 Window win;
1205 char server[IMBUFSIZ]; 1231 char server[IMBUFSIZ];
1206 1232
1207 /* get current locale modifier */ 1233 /* get current locale modifier */
1208 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1234 if (char *p = XSetLocaleModifiers (0))
1209 { 1235 {
1210 strcpy (server, "@server="); 1236 strcpy (server, "@server=");
1211 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1237 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1212 1238
1213 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1239 if (p = strchr (server + 1, '@')) /* first one only */
1214 *p = '\0'; 1240 *p = '\0';
1215 1241
1216 atom = XInternAtom (dpy, server, False); 1242 atom = XInternAtom (dpy, server, False);
1217 win = XGetSelectionOwner (dpy, atom); 1243 win = XGetSelectionOwner (dpy, atom);
1218 1244
1219 if (win != None) 1245 if (win != None)
1220 return True; 1246 return true;
1221 } 1247 }
1222 1248
1223 return False; 1249 return false;
1224} 1250}
1225 1251
1226void 1252void
1227rxvt_term::IMSendSpot () 1253rxvt_term::im_send_spot ()
1228{ 1254{
1229 XPoint nspot; 1255 XPoint nspot;
1230 XVaNestedList preedit_attr; 1256 XVaNestedList preedit_attr;
1231 1257
1232 if (!Input_Context 1258 if (!Input_Context
… …
1285 1311
1286 term->make_current (); 1312 term->make_current ();
1287 1313
1288 if (text) 1314 if (text)
1289 { 1315 {
1290 void *str; 1316 wchar_t *str;
1291 1317
1292 if (!text->encoding_is_wchar && text->string.multi_byte) 1318 if (!text->encoding_is_wchar && text->string.multi_byte)
1293 { 1319 {
1294 // of course, X makes it ugly again 1320 // of course, X makes it ugly again
1295 if (term->rs[Rs_imLocale]) 1321 if (term->rs[Rs_imLocale])
1296 SET_LOCALE (term->rs[Rs_imLocale]); 1322 SET_LOCALE (term->rs[Rs_imLocale]);
1297 1323
1298 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1324 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1299 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1325 mbstowcs (str, text->string.multi_byte, text->length + 1);
1300 1326
1301 if (term->rs[Rs_imLocale]) 1327 if (term->rs[Rs_imLocale])
1302 SET_LOCALE (term->locale); 1328 SET_LOCALE (term->locale);
1303 } 1329 }
1304 else 1330 else
1305 str = (void *)text->string.wide_char; 1331 str = text->string.wide_char;
1306 1332
1307 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1333 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1308 DT_INT, call_data->caret, 1334 DT_INT, call_data->caret,
1309 DT_INT, call_data->chg_first, 1335 DT_INT, call_data->chg_first,
1310 DT_INT, call_data->chg_length, 1336 DT_INT, call_data->chg_length,
1311 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1337 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1338/* 1364/*
1339 * Try to open a XIM with the current modifiers, then see if we can 1365 * Try to open a XIM with the current modifiers, then see if we can
1340 * open a suitable preedit type 1366 * open a suitable preedit type
1341 */ 1367 */
1342bool 1368bool
1343rxvt_term::IM_get_IC (const char *modifiers) 1369rxvt_term::im_get_ic (const char *modifiers)
1344{ 1370{
1345 int i, j, found; 1371 int i, j, found;
1346 XIM xim; 1372 XIM xim;
1347 XPoint spot; 1373 XPoint spot;
1348 XRectangle rect, status_rect, needed_rect; 1374 XRectangle rect, status_rect, needed_rect;
1349 unsigned long fg, bg; 1375 unsigned long fg, bg;
1350 const char *p; 1376 const char *p;
1351 char **s; 1377 char **s;
1352 XIMStyles *xim_styles; 1378 XIMStyles *xim_styles;
1353#ifdef ENABLE_XIM_ONTHESPOT
1354 XIMCallback xcb[4];
1355#endif
1356 1379
1357 set_environ (envv); 1380 set_environ (env);
1358 1381
1359 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1382 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1360 return false; 1383 return false;
1361 1384
1362 input_method = display->get_xim (locale, modifiers); 1385 input_method = display->get_xim (locale, modifiers);
1363 if (input_method == NULL) 1386 if (input_method == NULL)
1364 return false; 1387 return false;
… …
1381 p = pet[pi]; 1404 p = pet[pi];
1382 1405
1383 if (!p) 1406 if (!p)
1384 continue; 1407 continue;
1385 1408
1386 s = rxvt_splitcommastring (p); 1409 s = rxvt_strsplit (',', p);
1387 1410
1388 for (i = found = 0; !found && s[i]; i++) 1411 for (i = found = 0; !found && s[i]; i++)
1389 { 1412 {
1390 if (!strcmp (s[i], "OverTheSpot")) 1413 if (!strcmp (s[i], "OverTheSpot"))
1391 input_style = XIMPreeditPosition | XIMStatusNothing; 1414 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1403 input_style = XIMPreeditNothing | XIMStatusNothing; 1426 input_style = XIMPreeditNothing | XIMStatusNothing;
1404 1427
1405 for (j = 0; j < xim_styles->count_styles; j++) 1428 for (j = 0; j < xim_styles->count_styles; j++)
1406 if (input_style == xim_styles->supported_styles[j]) 1429 if (input_style == xim_styles->supported_styles[j])
1407 { 1430 {
1408 rxvt_freecommastring (s); 1431 rxvt_free_strsplit (s);
1409 1432
1410 found = 1; 1433 found = 1;
1411 goto foundpet; 1434 goto foundpet;
1412 } 1435 }
1413 1436
1414 } 1437 }
1415 1438
1416 rxvt_freecommastring (s); 1439 rxvt_free_strsplit (s);
1417 } 1440 }
1418 1441
1419foundpet: 1442foundpet:
1420 1443
1421 XFree (xim_styles); 1444 XFree (xim_styles);
… …
1500 NULL); 1523 NULL);
1501 } 1524 }
1502#if ENABLE_XIM_ONTHESPOT 1525#if ENABLE_XIM_ONTHESPOT
1503 else if (input_style & XIMPreeditCallbacks) 1526 else if (input_style & XIMPreeditCallbacks)
1504 { 1527 {
1528 XIMCallback xcb[4];
1529
1505 im_set_position (spot); 1530 im_set_position (spot);
1506 1531
1507 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1532 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1508 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1533 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1509 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1534 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1524#endif 1549#endif
1525 1550
1526 Input_Context = XCreateIC (xim, 1551 Input_Context = XCreateIC (xim,
1527 XNInputStyle, input_style, 1552 XNInputStyle, input_style,
1528 XNClientWindow, vt, 1553 XNClientWindow, vt,
1529 XNFocusWindow, parent[0], 1554 XNFocusWindow, parent,
1530 preedit_attr ? XNPreeditAttributes : NULL, 1555 preedit_attr ? XNPreeditAttributes : NULL,
1531 preedit_attr, 1556 preedit_attr,
1532 status_attr ? XNStatusAttributes : NULL, 1557 status_attr ? XNStatusAttributes : NULL,
1533 status_attr, NULL); 1558 status_attr, NULL);
1534 1559
… …
1547 // unfortunately, only the focus window is used by XIM, hard to fix 1572 // unfortunately, only the focus window is used by XIM, hard to fix
1548 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1573 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1549 vt_select_input (); 1574 vt_select_input ();
1550#endif 1575#endif
1551 1576
1552 IMSetPosition (); 1577 im_set_position ();
1553 1578
1554 return true; 1579 return true;
1555} 1580}
1556 1581
1557void 1582void
… …
1567 im_destroy (); 1592 im_destroy ();
1568 1593
1569 if (Input_Context) 1594 if (Input_Context)
1570 return; 1595 return;
1571 1596
1572#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1573 if (rs[Rs_imLocale]) 1597 if (rs[Rs_imLocale])
1574 SET_LOCALE (rs[Rs_imLocale]); 1598 SET_LOCALE (rs[Rs_imLocale]);
1575#endif
1576 1599
1577 p = rs[Rs_inputMethod]; 1600 p = rs[Rs_inputMethod];
1578 if (p && *p) 1601 if (p && *p)
1579 { 1602 {
1580 bool found = false; 1603 bool found = false;
1581 1604
1582 s = rxvt_splitcommastring (p); 1605 s = rxvt_strsplit (',', p);
1583 1606
1584 for (i = 0; s[i]; i++) 1607 for (i = 0; s[i]; i++)
1585 { 1608 {
1586 if (*s[i]) 1609 if (*s[i])
1587 { 1610 {
1588 strcpy (buf, "@im="); 1611 strcpy (buf, "@im=");
1589 strncat (buf, s[i], IMBUFSIZ - 5); 1612 strncat (buf, s[i], IMBUFSIZ - 5);
1590 if (IM_get_IC (buf)) 1613 if (im_get_ic (buf))
1591 { 1614 {
1592 found = true; 1615 found = true;
1593 break; 1616 break;
1594 } 1617 }
1595 } 1618 }
1596 } 1619 }
1597 1620
1598 rxvt_freecommastring (s); 1621 rxvt_free_strsplit (s);
1599 1622
1600 if (found) 1623 if (found)
1601 goto done; 1624 goto done;
1602 } 1625 }
1603 1626
1604 /* try with XMODIFIERS env. var. */ 1627 /* try with XMODIFIERS env. var. */
1605 if (IM_get_IC ("")) 1628 if (im_get_ic (""))
1606 goto done; 1629 goto done;
1607 1630
1608 /* try with no modifiers base IF the user didn't specify an IM */ 1631 /* try with no modifiers base IF the user didn't specify an IM */
1609 if (IM_get_IC ("@im=none")) 1632 if (im_get_ic ("@im=none"))
1610 goto done; 1633 goto done;
1611 1634
1612done: 1635done:
1613#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1614 if (rs[Rs_imLocale]) 1636 if (rs[Rs_imLocale])
1615 SET_LOCALE (locale); 1637 SET_LOCALE (locale);
1616#endif
1617} 1638}
1618 1639
1619void 1640void
1620rxvt_term::IMSetPosition () 1641rxvt_term::im_set_position ()
1621{ 1642{
1622 XRectangle preedit_rect, status_rect, *needed_rect; 1643 XRectangle preedit_rect, status_rect, *needed_rect;
1623 XVaNestedList preedit_attr, status_attr; 1644 XVaNestedList preedit_attr, status_attr;
1624 1645
1625 if (!Input_Context 1646 if (!Input_Context
1626 || !focus 1647 || !focus
1627 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1648 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1628 || !IMisRunning ()) 1649 || !im_is_running ())
1629 return; 1650 return;
1630 1651
1631 if (input_style & XIMPreeditPosition) 1652 if (input_style & XIMPreeditPosition)
1632 { 1653 {
1633 im_set_size (preedit_rect); 1654 im_set_size (preedit_rect);
1634 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1655 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1635 1656
1636 XSetICValues (Input_Context, 1657 XSetICValues (Input_Context,
1637 XNPreeditAttributes, preedit_attr, NULL); 1658 XNPreeditAttributes, preedit_attr, NULL);
1638 } 1659 }
1639 else 1660 else
1640 { 1661 {
… …
1657 XFree (status_attr); 1678 XFree (status_attr);
1658 } 1679 }
1659 1680
1660 XFree (preedit_attr); 1681 XFree (preedit_attr);
1661} 1682}
1662#endif /* USE_XIM */ 1683#endif /* USE_XIM */
1684
1685void
1686rxvt_term::get_window_origin (int &x, int &y)
1687{
1688 Window cr;
1689 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1690}
1691
1692#ifdef HAVE_BG_PIXMAP
1693
1694void
1695rxvt_term::update_background ()
1696{
1697 if (update_background_ev.is_active ())
1698 return;
1699
1700 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1701
1702 if (to_wait <= 0.)
1703 bg_render ();
1704 else
1705 update_background_ev.start (to_wait);
1706}
1707
1708void
1709rxvt_term::update_background_cb (ev::timer &w, int revents)
1710{
1711 make_current ();
1712
1713 update_background_ev.stop ();
1714 bg_render ();
1715 refresh_check ();
1716}
1717
1718#endif /* HAVE_BG_PIXMAP */
1663 1719
1664/*----------------------- end-of-file (C source) -----------------------*/ 1720/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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