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.94 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.389 by root, Sun Feb 17 00:52:04 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines