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.223 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.381 by root, Tue Jun 5 12:04:33 2012 UTC

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

Diff Legend

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