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.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs.
Revision 1.380 by root, Tue Jun 5 11:35:58 2012 UTC

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

Diff Legend

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