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.236 by ayin, Sat Jun 23 18:29:08 2007 UTC vs.
Revision 1.394 by root, Sat Dec 13 10:07:30 2014 UTC

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

Diff Legend

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