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

Diff Legend

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