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.225 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.390 by root, Thu May 22 18:54:33 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-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 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
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 BG_IMAGE_FROM_ROOT || ENABLE_PERL
174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
175#endif
176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
177#if USE_XIM
178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 179#endif
169#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 182#endif
172#ifdef USE_XIM
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
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
220 if (display) 235 if (display)
221 { 236 {
222 selection_clear (); 237 selection_clear ();
238 selection_clear (true);
223 239
224#ifdef USE_XIM 240#if USE_XIM
225 im_destroy (); 241 im_destroy ();
226#endif 242#endif
227#ifdef XTERM_SCROLLBAR 243 scrollBar.destroy ();
228 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); 244
229 if (ShadowGC) XFreeGC (dpy, ShadowGC); 245 if (gc)
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); 246 XFreeGC (dpy, gc);
252 247
253 delete drawable; 248 delete drawable;
249
254 // destroy all windows 250 // destroy all windows
255 if (parent[0]) 251 if (parent)
256 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
257 253
258 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
260 { 256 {
261 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
… …
263 pix_colors_unfocused [i].free (this); 259 pix_colors_unfocused [i].free (this);
264#endif 260#endif
265 } 261 }
266 262
267 clear (); 263 clear ();
268 }
269 264
270 delete pix_colors_focused; 265 display->flush (); /* ideally .put should do this */
271#if OFF_FOCUS_FADING
272 delete pix_colors_unfocused;
273#endif
274
275 displays.put (display); 266 displays.put (display);
267 }
276 268
277 scr_release (); 269 scr_release ();
278 270
279 /* clear all resources */ 271 /* clear all resources */
280 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
281 free (allocated [i]); 273 free (allocated [i]);
282 274
283 free (selection.text); 275 free (selection.text);
284 // TODO: manage env vars in child only(!) 276 free (selection.clip_text);
285 free (env_display);
286 free (env_term);
287 free (locale); 277 free (locale);
288 free (v_buffer); 278 free (v_buffer);
289 free (incr_buf); 279
280 delete selection_req;
290 281
291 delete envv; 282 delete envv;
292 delete argv; 283 delete argv;
293 284
294#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
295 delete keyboard; 286 delete keyboard;
296#endif 287#endif
288#ifndef NO_RESOURCES
289 XrmDestroyDatabase (option_db);
290#endif
297} 291}
298 292
299// child has exited, usually destroys 293// child has exited, usually destroys
300void 294void
301rxvt_term::child_cb (child_watcher &w, int status) 295rxvt_term::child_cb (ev::child &w, int status)
302{ 296{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 297 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 298
305 cmd_pid = 0; 299 cmd_pid = 0;
306 300
307 if (!OPTION (Opt_hold)) 301 if (!option (Opt_hold))
308 destroy (); 302 destroy ();
309} 303}
310 304
311void 305void
312rxvt_term::destroy () 306rxvt_term::destroy ()
313{ 307{
314 if (destroy_ev.active) 308 if (destroy_ev.is_active ())
315 return; 309 return;
316 310
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 311 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
318 312
319#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
… …
323 if (display) 317 if (display)
324 { 318 {
325#if USE_XIM 319#if USE_XIM
326 im_ev.stop (display); 320 im_ev.stop (display);
327#endif 321#endif
328#if HAVE_SCROLLBARS
329 scrollbar_ev.stop (display); 322 scrollbar_ev.stop (display);
330#endif 323#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
331#if TRANSPARENT
332 rootwin_ev.stop (display); 324 rootwin_ev.stop (display);
333#endif 325#endif
334 incr_ev.stop ();
335 termwin_ev.stop (display); 326 termwin_ev.stop (display);
336 vt_ev.stop (display); 327 vt_ev.stop (display);
337 } 328 }
338 329
339 check_ev.stop (); 330 flush_ev.stop ();
340 pty_ev.stop (); 331 pty_ev.stop ();
341#ifdef CURSOR_BLINK 332#ifdef CURSOR_BLINK
342 cursor_blink_ev.stop (); 333 cursor_blink_ev.stop ();
343#endif 334#endif
344#ifdef TEXT_BLINK 335#ifdef TEXT_BLINK
… …
352#endif 343#endif
353#ifdef POINTER_BLANK 344#ifdef POINTER_BLANK
354 pointer_ev.stop (); 345 pointer_ev.stop ();
355#endif 346#endif
356 347
357 destroy_ev.start (0); 348 destroy_ev.start ();
358} 349}
359 350
360void 351void
361rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (ev::idle &w, int revents)
362{ 353{
363 make_current (); 354 make_current ();
364 355
365 delete this; 356 delete this;
357}
358
359void
360rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
361{
362 if (!opt)
363 return;
364
365 uint8_t mask = 1 << (opt & 7);
366 uint8_t &val = options [opt >> 3];
367
368 val = val & ~mask | (set ? mask : 0);
366} 369}
367 370
368/*----------------------------------------------------------------------*/ 371/*----------------------------------------------------------------------*/
369/* 372/*
370 * Exit gracefully, clearing the utmp entry and restoring tty attributes 373 * 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 */ 374 */
373static XErrorHandler old_xerror_handler; 375static XErrorHandler old_xerror_handler;
374 376
375static void 377static void
376rxvt_emergency_cleanup () 378rxvt_emergency_cleanup ()
… …
378 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 380 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
379 (*t)->emergency_cleanup (); 381 (*t)->emergency_cleanup ();
380} 382}
381 383
382#if !ENABLE_MINIMAL 384#if !ENABLE_MINIMAL
383static void 385static void ecb_cold
384print_x_error (Display *dpy, XErrorEvent *event) 386print_x_error (Display *dpy, XErrorEvent *event)
385{ 387{
386 char buffer[BUFSIZ]; 388 char buffer[BUFSIZ];
387 char mesg[BUFSIZ]; 389 char mesg[BUFSIZ];
388 char number[32]; 390 char number[32];
389 char *mtype = "XlibMessage"; 391
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"); 392 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
393
394 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
396
397 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
398 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
393 rxvt_warn ("%s: %s\n", mesg, buffer); 399 rxvt_warn ("+ %s: %s\n", mesg, buffer);
400
394 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 401 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 402 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
396 sprintf(number, "%d", event->request_code); 403
397 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
398 rxvt_warn ("(which is %s)\n", buffer);
399 if (event->request_code >= 128) { 404 if (event->request_code >= 128)
400 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 405 {
401 mesg, BUFSIZ); 406#if 0
402 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 407 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
408 int nexts;
409 char **exts = XListExtensions (dpy, &nexts);
410
411 while (nexts)
412 {
413 char *extname = exts [nexts - 1];
414 int major, first_event, first_error;
415
416 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
417 {
418 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
419 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
420
421 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
422 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
423 rxvt_warn ("+ (which is %s)\n", buffer);
424
425 break;
426 }
427
428 printf ("nextss %d %s\n", nexts, extname);//D
429 --nexts;
430 ++exts;
431 }
432#else
433 int nexts = 0;
434 char **exts = 0;
435#endif
436
437 if (!nexts)
438 {
439 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
440
441 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
442 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
443
444#if 0
445 sprintf (number, "RENDER.%d", event->minor_code);
446 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
447 rxvt_warn ("+ (which is %s)\n", buffer);
448#endif
449 }
450
451 XFreeExtensionList (exts);
403 } 452 }
453 else
454 {
455 sprintf (number, "%d", event->request_code);
456 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
457 rxvt_warn ("+ (which is %s)\n", buffer);
458 }
459
404 if ((event->error_code == BadWindow) || 460 if (event->error_code == BadWindow
405 (event->error_code == BadPixmap) || 461 || event->error_code == BadPixmap
406 (event->error_code == BadCursor) || 462 || event->error_code == BadCursor
407 (event->error_code == BadFont) || 463 || event->error_code == BadFont
408 (event->error_code == BadDrawable) || 464 || event->error_code == BadDrawable
409 (event->error_code == BadColor) || 465 || event->error_code == BadColor
410 (event->error_code == BadGC) || 466 || event->error_code == BadGC
411 (event->error_code == BadIDChoice) || 467 || event->error_code == BadIDChoice
412 (event->error_code == BadValue) || 468 || event->error_code == BadValue
413 (event->error_code == BadAtom)) { 469 || event->error_code == BadAtom)
470 {
414 if (event->error_code == BadValue) 471 if (event->error_code == BadValue)
415 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 472 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
416 mesg, BUFSIZ);
417 else if (event->error_code == BadAtom) 473 else if (event->error_code == BadAtom)
418 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 474 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
419 mesg, BUFSIZ); 475 else
420 else
421 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 476 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 477
431int 478 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
479 }
480}
481#endif
482
483int ecb_cold
432rxvt_xerror_handler (Display *display, XErrorEvent *event) 484rxvt_xerror_handler (Display *display, XErrorEvent *event)
433{ 485{
434 if (GET_R->allowedxerror == -1) 486 if (GET_R->allowedxerror == -1)
435 GET_R->allowedxerror = event->error_code; 487 GET_R->allowedxerror = event->error_code;
436 else 488 else
… …
445 } 497 }
446 498
447 return 0; 499 return 0;
448} 500}
449 501
450int 502int ecb_cold
451rxvt_xioerror_handler (Display *display) 503rxvt_xioerror_handler (Display *display)
452{ 504{
453 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 505 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
454 DisplayString (display)); 506 DisplayString (display));
455 rxvt_emergency_cleanup (); 507 rxvt_emergency_cleanup ();
456 _exit (EXIT_FAILURE); 508 _exit (EXIT_FAILURE);
457} 509}
458 510
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 511static struct sig_handlers
540{ 512{
541 sig_watcher sw_term, sw_int; 513 ev::sig sw_term, sw_int;
542 514
543 /* 515 /*
544 * Catch a fatal signal and tidy up before quitting 516 * Catch a fatal signal and tidy up before quitting
545 */ 517 */
546 void 518 void sig_term (ev::sig &w, int revents);
547 sig_term (sig_watcher &w) 519
520 sig_handlers ()
548 { 521 {
549 rxvt_emergency_cleanup (); 522 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) 523 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
557 {
558 } 524 }
559} sig_handlers; 525} sig_handlers;
560 526
527void
528sig_handlers::sig_term (ev::sig &w, int revents)
529{
530 rxvt_emergency_cleanup ();
531 w.stop ();
532 kill (getpid (), w.signum);
533}
534
535static void
536rxvt_get_ttymode (struct termios *tio)
537{
538 if (tcgetattr (STDIN_FILENO, tio) < 0)
539 memset (tio, 0, sizeof (struct termios));
540
541 for (int i = 0; i < NCCS; i++)
542 tio->c_cc[i] = VDISABLE;
543
544 tio->c_cc[VINTR] = CINTR;
545 tio->c_cc[VQUIT] = CQUIT;
546 tio->c_cc[VERASE] = CERASE;
547#ifdef VERASE2
548 tio->c_cc[VERASE2] = CERASE2;
549#endif
550 tio->c_cc[VKILL] = CKILL;
551 tio->c_cc[VEOF] = CEOF;
552 tio->c_cc[VSTART] = CSTART;
553 tio->c_cc[VSTOP] = CSTOP;
554 tio->c_cc[VSUSP] = CSUSP;
555# ifdef VDSUSP
556 tio->c_cc[VDSUSP] = CDSUSP;
557# endif
558# ifdef VREPRINT
559 tio->c_cc[VREPRINT] = CRPRNT;
560# endif
561# ifdef VDISCRD
562 tio->c_cc[VDISCRD] = CFLUSH;
563# endif
564# ifdef VWERSE
565 tio->c_cc[VWERSE] = CWERASE;
566# endif
567# ifdef VLNEXT
568 tio->c_cc[VLNEXT] = CLNEXT;
569# endif
570# ifdef VSTATUS
571 tio->c_cc[VSTATUS] = CSTATUS;
572# endif
573
574# if VMIN != VEOF
575 tio->c_cc[VMIN] = 1;
576# endif
577# if VTIME != VEOL
578 tio->c_cc[VTIME] = 0;
579# endif
580
581 /* input modes */
582 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
583# ifdef IMAXBEL
584 | IMAXBEL
585# endif
586 | IXON);
587
588 /* output modes */
589 tio->c_oflag = (OPOST | ONLCR);
590
591 /* control modes */
592 tio->c_cflag = (CS8 | CREAD);
593
594 /* local modes */
595 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
596# if defined (ECHOCTL) && defined (ECHOKE)
597 | ECHOCTL | ECHOKE
598# endif
599 | ECHOE | ECHOK);
600}
601
561char **rxvt_environ; // startup environment 602char **rxvt_environ; // startup environment
562 603
563void 604void
564rxvt_init () 605rxvt_init ()
565{ 606{
566 ptytty::init (); 607 assert (("fontMask must not overlap other RS masks",
608 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
609
610 rxvt_get_ttymode (&rxvt_term::def_tio);
611
612 // get rid of stdin/stdout as we don't need them, to free resources
613 dup2 (STDERR_FILENO, STDIN_FILENO);
614 dup2 (STDERR_FILENO, STDOUT_FILENO);
615
616 if (!ev_default_loop ())
617 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
567 618
568 rxvt_environ = environ; 619 rxvt_environ = environ;
569 620
570 signal (SIGHUP, SIG_IGN); 621 signal (SIGHUP, SIG_IGN);
571 signal (SIGPIPE, SIG_IGN); 622 signal (SIGPIPE, SIG_IGN);
572 623
573 sig_handlers.sw_term.start (SIGTERM); 624 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
574 sig_handlers.sw_int.start (SIGINT); 625 sig_handlers.sw_int.start (SIGINT); ev_unref ();
575
576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
577 /* signal (SIGURG, SIG_DFL); */
578 626
579 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
580 // TODO: handle this with exceptions and tolerate the memory loss 628 // TODO: handle this with exceptions and tolerate the memory loss
581 XSetIOErrorHandler (rxvt_xioerror_handler); 629 XSetIOErrorHandler (rxvt_xioerror_handler);
582 630
583 XrmInitialize (); 631 XrmInitialize ();
584}
585 632
586/* ------------------------------------------------------------------------- * 633#if HAVE_PIXBUF
587 * MEMORY ALLOCATION WRAPPERS * 634 g_type_init ();
588 * ------------------------------------------------------------------------- */ 635#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} 636}
621 637
622/*----------------------------------------------------------------------*/ 638/*----------------------------------------------------------------------*/
623/* 639/*
624 * window size/position calculcations for XSizeHint and other storage. 640 * window size/position calculations for XSizeHint and other storage.
625 * if width/height are non-zero then override calculated width/height 641 * if width/height are non-zero then override calculated width/height
626 */ 642 */
627void 643void
628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 644rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629{ 645{
630 short recalc_x, recalc_y; 646 short recalc_x, recalc_y;
631 int x, y, sb_w, flags; 647 int x, y, flags;
632 unsigned int w, h; 648 unsigned int w, h;
633 unsigned int max_width, max_height; 649 unsigned int max_width, max_height;
634 650
635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 651 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
636 szHint.win_gravity = NorthWestGravity; 652 szHint.win_gravity = NorthWestGravity;
… …
646 if (rs[Rs_geometry]) 662 if (rs[Rs_geometry])
647 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 663 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
648 664
649 if (flags & WidthValue) 665 if (flags & WidthValue)
650 { 666 {
667 if (!w)
668 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
669
651 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 670 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
652 szHint.flags |= USSize; 671 szHint.flags |= USSize;
653 } 672 }
654 673
655 if (flags & HeightValue) 674 if (flags & HeightValue)
656 { 675 {
676 if (!h)
677 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
678
657 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 679 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
658 szHint.flags |= USSize; 680 szHint.flags |= USSize;
659 } 681 }
660 682
661 if (flags & XValue) 683 if (flags & XValue)
662 { 684 {
… …
693 max_width = MAX_COLS * fwidth; 715 max_width = MAX_COLS * fwidth;
694 max_height = MAX_ROWS * fheight; 716 max_height = MAX_ROWS * fheight;
695 717
696 szHint.base_width = szHint.base_height = 2 * int_bwidth; 718 szHint.base_width = szHint.base_height = 2 * int_bwidth;
697 719
698 sb_w = 0;
699 window_vt_x = window_vt_y = int_bwidth; 720 window_vt_x = window_vt_y = int_bwidth;
700 721
701 if (scrollBar.state) 722 if (scrollBar.state)
702 { 723 {
703 sb_w = scrollbar_TotalWidth (); 724 int sb_w = scrollBar.total_width ();
704 szHint.base_width += sb_w; 725 szHint.base_width += sb_w;
705 726
706 if (!OPTION (Opt_scrollBar_right)) 727 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 728 window_vt_x += sb_w;
708 } 729 }
709 730
710 szHint.width_inc = fwidth; 731 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 732 szHint.height_inc = fheight;
… …
732 { 753 {
733 min_it (height, max_height); 754 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 755 szHint.height = szHint.base_height + height;
735 } 756 }
736 757
737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w;
739
740 if (recalc_x) 758 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 759 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 760
743 if (recalc_y) 761 if (recalc_y)
744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 762 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
745 763
746 ncol = width / fwidth; 764 ncol = width / fwidth;
747 nrow = height / fheight; 765 nrow = height / fheight;
766
767 // When the size of the vt window is not a multiple of the cell
768 // size, i.e., when the wm does not honour our size hints, there are
769 // extra areas not covered by the terminal screen. Such gaps, when a
770 // bg pixmap is set, would have to be cleared manually to properly
771 // refresh the background. We take the simpler route and shrink the
772 // vt window so as to avoid creating gaps.
773 vt_width = ncol * fwidth;
774 vt_height = nrow * fheight;
748} 775}
749 776
750/*----------------------------------------------------------------------*/ 777/*----------------------------------------------------------------------*/
751/* 778/*
752 * Tell the teletype handler what size the window is. 779 * Tell the teletype handler what size the window is.
… …
760 787
761 struct winsize ws; 788 struct winsize ws;
762 789
763 ws.ws_col = ncol; 790 ws.ws_col = ncol;
764 ws.ws_row = nrow; 791 ws.ws_row = nrow;
765 ws.ws_xpixel = width; 792 ws.ws_xpixel = vt_width;
766 ws.ws_ypixel = height; 793 ws.ws_ypixel = vt_height;
767 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 794 ioctl (pty->pty, TIOCSWINSZ, &ws);
768 795
769#if 0 796#if 0
770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 797 // TIOCSWINSZ is supposed to do this automatically and correctly
771 if (cmd_pid) /* force through to the command */ 798 if (cmd_pid) /* force through to the command */
772 kill (-cmd_pid, SIGWINCH); 799 kill (-cmd_pid, SIGWINCH);
773#endif 800#endif
774} 801}
775 802
776/*----------------------------------------------------------------------*/ 803/*----------------------------------------------------------------------*/
777/* set_fonts () - load and set the various fonts 804/* 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 805bool
785rxvt_term::set_fonts () 806rxvt_term::set_fonts ()
786{ 807{
787 rxvt_fontset *fs = new rxvt_fontset (this); 808 rxvt_fontset *fs = new rxvt_fontset (this);
788 rxvt_fontprop prop; 809 rxvt_fontprop prop;
… …
802#endif 823#endif
803 824
804 delete fontset[0]; 825 delete fontset[0];
805 fontset[0] = fs; 826 fontset[0] = fs;
806 827
807 prop = (*fs)[1]->properties (); 828 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
808 prop.height += lineSpace; 829 prop.width = max (prop.width + letterSpace, 1);
830
809 fs->set_prop (prop); 831 fs->set_prop (prop, false);
810 832
811 fwidth = prop.width; 833 fwidth = prop.width;
812 fheight = prop.height; 834 fheight = prop.height + lineSpace;
813 fbase = prop.ascent; 835 fbase = prop.ascent;
814 836
815 for (int style = 1; style < 4; style++) 837 for (int style = 1; style < 4; style++)
816 { 838 {
817#if ENABLE_STYLES 839#if ENABLE_STYLES
… …
823 { 845 {
824 fontset[style] = fs = new rxvt_fontset (this); 846 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 847 rxvt_fontprop prop2 = prop;
826 848
827 if (res) 849 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 850 {
851 fs->populate (res);
852 fs->set_prop (prop2, false);
853 }
829 else 854 else
830 { 855 {
831 res = fontset[0]->fontdesc; 856 fs->populate (fontset[0]->fontdesc);
832 857
833 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 858 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; 859 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
860
861 fs->set_prop (prop2, true);
835 } 862 }
836 863
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 864 }
840#else 865#else
841 fontset[style] = fontset[0]; 866 fontset[style] = fontset[0];
842#endif 867#endif
843 } 868 }
844 869
845 if (parent[0]) 870 if (parent)
846 { 871 {
847 resize_all_windows (0, 0, 0); 872 resize_all_windows (0, 0, 0);
848 scr_remap_chars (); 873 scr_remap_chars ();
849 scr_touch (true); 874 scr_touch (true);
850 } 875 }
851 876
852 return true; 877 return true;
853} 878}
854 879
880void
855void rxvt_term::set_string_property (Atom prop, const char *str, int len) 881rxvt_term::set_string_property (Atom prop, const char *str, int len)
856{ 882{
857 XChangeProperty (dpy, parent[0], 883 XChangeProperty (dpy, parent,
858 prop, XA_STRING, 8, PropModeReplace, 884 prop, XA_STRING, 8, PropModeReplace,
859 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 885 (const unsigned char *)str, len >= 0 ? len : strlen (str));
860} 886}
861 887
888void
889rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
890{
891 XTextProperty ct;
892
893 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
894 {
895 XSetTextProperty (dpy, parent, &ct, prop);
896 XFree (ct.value);
897 }
898}
899
900void
862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 901rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
863{ 902{
864 wchar_t *ws = rxvt_mbstowcs (str, len); 903 wchar_t *ws = rxvt_mbstowcs (str, len);
865 char *s = rxvt_wcstoutf8 (ws); 904 char *s = rxvt_wcstoutf8 (ws);
866 905
867 XChangeProperty (dpy, parent[0], 906 XChangeProperty (dpy, parent,
868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 907 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
869 (const unsigned char *)s, strlen (s)); 908 (const unsigned char *)s, strlen (s));
870 909
871 free (s); 910 free (s);
872 free (ws); 911 free (ws);
… …
876/*----------------------------------------------------------------------*/ 915/*----------------------------------------------------------------------*/
877/* xterm sequences - title, iconName, color (exptl) */ 916/* xterm sequences - title, iconName, color (exptl) */
878void 917void
879rxvt_term::set_title (const char *str) 918rxvt_term::set_title (const char *str)
880{ 919{
881 set_string_property (XA_WM_NAME, str); 920 set_mbstring_property (XA_WM_NAME, str);
882#if ENABLE_EWMH 921#if ENABLE_EWMH
883 set_utf8_property (xa[XA_NET_WM_NAME], str); 922 set_utf8_property (xa[XA_NET_WM_NAME], str);
884#endif 923#endif
885} 924}
886 925
887void 926void
888rxvt_term::set_icon_name (const char *str) 927rxvt_term::set_icon_name (const char *str)
889{ 928{
890 set_string_property (XA_WM_ICON_NAME, str); 929 set_mbstring_property (XA_WM_ICON_NAME, str);
891#if ENABLE_EWMH 930#if ENABLE_EWMH
892 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 931 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
893#endif 932#endif
894} 933}
895 934
935void
936rxvt_term::set_window_color (int idx, const char *color)
937{
896#ifdef XTERM_COLOR_CHANGE 938#ifdef XTERM_COLOR_CHANGE
897void
898rxvt_term::set_window_color (int idx, const char *color)
899{
900 rxvt_color xcol; 939 rxvt_color xcol;
901 int i; 940
902
903 if (color == NULL || *color == '\0') 941 if (color == NULL || *color == '\0')
904 return; 942 return;
905 943
906 color = strdup (color); 944 color = strdup (color);
907 allocated.push_back ((void *)color); 945 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color; 946 rs[Rs_color + idx] = color;
909 947
910 /* handle color aliases */ 948 /* handle color aliases */
911 if (isdigit (*color)) 949 if (isdigit (*color))
912 { 950 {
913 i = atoi (color); 951 int i = atoi (color);
914 952
915 if (i >= 8 && i <= 15) 953 if (i >= 8 && i <= 15)
954 {
916 { /* bright colors */ 955 /* bright colors */
917 i -= 8;
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 956 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
919 goto done; 957 goto done;
920 } 958 }
921 959
922 if (i >= 0 && i <= 7) 960 if (i >= 0 && i <= 7)
961 {
923 { /* normal colors */ 962 /* normal colors */
924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 963 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
925 goto done; 964 goto done;
926 } 965 }
927 } 966 }
928 967
… …
933 * so just keep gobbling up the colormap 972 * so just keep gobbling up the colormap
934 */ 973 */
935 974
936 pix_colors_focused[idx] = xcol; 975 pix_colors_focused[idx] = xcol;
937 976
938 /* XSetWindowAttributes attr; */
939 /* Cursor cursor; */
940done: 977done:
941 /*TODO: handle Color_BD, scrollbar background, etc. */ 978 /*TODO: handle Color_BD, scrollbar background, etc. */
942 979
943 update_fade_color (idx); 980 update_fade_color (idx);
944 recolour_cursor (); 981 recolour_cursor ();
945 scr_recolour (); 982 scr_recolour ();
983#endif /* XTERM_COLOR_CHANGE */
946} 984}
947
948#else
949# define set_window_color (idx,color) ((void)0)
950#endif /* XTERM_COLOR_CHANGE */
951 985
952void 986void
953rxvt_term::recolour_cursor () 987rxvt_term::recolour_cursor ()
954{ 988{
955 XColor fg, bg; 989 XColor fg, bg;
… …
967 1001
968/*----------------------------------------------------------------------*/ 1002/*----------------------------------------------------------------------*/
969/* 1003/*
970 * find if fg/bg matches any of the normal (low-intensity) colors 1004 * find if fg/bg matches any of the normal (low-intensity) colors
971 */ 1005 */
972void 1006char *
973rxvt_term::set_colorfgbg () 1007rxvt_term::get_colorfgbg ()
974{ 1008{
975 unsigned int i; 1009 unsigned int i;
976 const char *xpmb = "\0"; 1010 const char *xpmb = "";
977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1011 char fstr[] = "default";
1012 char bstr[] = "default";
1013 char *env_colorfgbg;
978 1014
979 strcpy (fstr, "default");
980 strcpy (bstr, "default");
981 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
982 if (pix_colors[Color_fg] == pix_colors[i]) 1016 if (pix_colors[Color_fg] == pix_colors[i])
983 { 1017 {
984 sprintf (fstr, "%d", (i - Color_Black)); 1018 sprintf (fstr, "%d", i - Color_Black);
985 break; 1019 break;
986 } 1020 }
987 1021
988 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
989 if (pix_colors[Color_bg] == pix_colors[i]) 1023 if (pix_colors[Color_bg] == pix_colors[i])
990 { 1024 {
991 sprintf (bstr, "%d", (i - Color_Black)); 1025 sprintf (bstr, "%d", i - Color_Black);
992#ifdef XPM_BACKGROUND 1026#if BG_IMAGE_FROM_FILE
993 xpmb = "default;"; 1027 xpmb = "default;";
994#endif 1028#endif
995 break; 1029 break;
996 } 1030 }
997 1031
1032 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
998 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1033 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1034 return env_colorfgbg;
999} 1035}
1000 1036
1001/*----------------------------------------------------------------------*/ 1037/*----------------------------------------------------------------------*/
1002 1038
1003bool 1039bool
… …
1026 int old_width = szHint.width; 1062 int old_width = szHint.width;
1027 int old_height = szHint.height; 1063 int old_height = szHint.height;
1028 1064
1029 window_calc (newwidth, newheight); 1065 window_calc (newwidth, newheight);
1030 1066
1031 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1067 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1068
1069 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1070 if (set_hint)
1071 {
1072 szHint.flags &= ~(PBaseSize | PResizeInc);
1032 XSetWMNormalHints (dpy, parent[0], &szHint); 1073 XSetWMNormalHints (dpy, parent, &szHint);
1074 szHint.flags |= PBaseSize | PResizeInc;
1075 }
1033 1076
1034 if (!ignoreparent) 1077 if (!ignoreparent)
1035 { 1078 {
1036#ifdef SMART_RESIZE 1079#ifdef SMART_RESIZE
1037 /* 1080 /*
… …
1041 int x, y, x1, y1; 1084 int x, y, x1, y1;
1042 int dx, dy; 1085 int dx, dy;
1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1086 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1044 Window unused_cr; 1087 Window unused_cr;
1045 1088
1046 XTranslateCoordinates (dpy, parent[0], display->root, 1089 XTranslateCoordinates (dpy, parent, display->root,
1047 0, 0, &x, &y, &unused_cr); 1090 0, 0, &x, &y, &unused_cr);
1048 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1091 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1092 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1050 /* 1093 /*
1051 * if display->root isn't the parent window, a WM will probably have offset 1094 * if display->root isn't the parent window, a WM will probably have offset
1052 * our position for handles and decorations. Counter it 1095 * our position for handles and decorations. Counter it
1053 */ 1096 */
… …
1070 if (y < y1) /* top half */ 1113 if (y < y1) /* top half */
1071 dy = 0; 1114 dy = 0;
1072 else if (y == y1) /* exact center */ 1115 else if (y == y1) /* exact center */
1073 dy /= 2; 1116 dy /= 2;
1074 1117
1075 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1118 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1076 szHint.width, szHint.height); 1119 szHint.width, szHint.height);
1077#else 1120#else
1078 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1121 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1079#endif 1122#endif
1080 } 1123 }
1124
1125 if (set_hint)
1126 XSetWMNormalHints (dpy, parent, &szHint);
1081 1127
1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1128 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1083 1129
1084 if (fix_screen || newwidth != old_width || newheight != old_height) 1130 if (fix_screen || newwidth != old_width || newheight != old_height)
1085 { 1131 {
1086 if (scrollBar.state) 1132 if (scrollBar.state)
1087 { 1133 scrollBar.resize ();
1088 XMoveResizeWindow (dpy, scrollBar.win,
1089 window_sb_x, 0,
1090 scrollbar_TotalWidth (), szHint.height);
1091 resize_scrollbar ();
1092 }
1093 1134
1094 XMoveResizeWindow (dpy, vt, 1135 XMoveResizeWindow (dpy, vt,
1095 window_vt_x, window_vt_y, 1136 window_vt_x, window_vt_y,
1096 width, height); 1137 vt_width, vt_height);
1097 1138
1098 scr_clear (); 1139 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1099#ifdef XPM_BACKGROUND 1140
1100 resize_pixmap (); 1141#ifdef HAVE_BG_PIXMAP
1142 if (bg_window_size_sensitive ())
1143 update_background ();
1101#endif 1144#endif
1102 } 1145 }
1103 1146
1104 if (fix_screen || old_height == 0) 1147 if (fix_screen || old_height == 0)
1105 scr_reset (); 1148 scr_reset ();
1106 1149
1107 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1108 //scr_touch (false);
1109
1110#ifdef XPM_BACKGROUND
1111 if (pixmap)
1112 scr_touch (false);
1113#endif
1114
1115#ifdef USE_XIM 1150#if USE_XIM
1116 IMSetPosition (); 1151 im_set_position ();
1117#endif 1152#endif
1118} 1153}
1119 1154
1120/* 1155/*
1121 * Set the width/height of the vt window in characters. Units are pixels. 1156 * Set the width/height of the vt window in characters. Units are pixels.
… …
1134 newwidth = wattr.width - szHint.base_width; 1169 newwidth = wattr.width - szHint.base_width;
1135 if (newheight == 0) 1170 if (newheight == 0)
1136 newheight = wattr.height - szHint.base_height; 1171 newheight = wattr.height - szHint.base_height;
1137 } 1172 }
1138 1173
1139 if (newwidth != width || newheight != height) 1174 if (newwidth != vt_width || newheight != vt_height)
1140 { 1175 {
1141 newwidth += szHint.base_width; 1176 newwidth += szHint.base_width;
1142 newheight += szHint.base_height; 1177 newheight += szHint.base_height;
1143 resize_all_windows (newwidth, newheight, 0); 1178 resize_all_windows (newwidth, newheight, 0);
1144 } 1179 }
1145} 1180}
1146 1181
1147/* -------------------------------------------------------------------- * 1182/* -------------------------------------------------------------------- *
1148 * - X INPUT METHOD ROUTINES - * 1183 * - X INPUT METHOD ROUTINES - *
1149 * -------------------------------------------------------------------- */ 1184 * -------------------------------------------------------------------- */
1150#ifdef USE_XIM 1185#if USE_XIM
1151 1186
1152void 1187void
1153rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1188rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1154{ 1189{
1155 fg = pix_colors [Color_fg]; 1190 fg = pix_colors [Color_fg];
… …
1182 status_rect.height = fheight; 1217 status_rect.height = fheight;
1183} 1218}
1184 1219
1185/* Checking whether input method is running. */ 1220/* Checking whether input method is running. */
1186bool 1221bool
1187rxvt_term::IMisRunning () 1222rxvt_term::im_is_running ()
1188{ 1223{
1189 char *p;
1190 Atom atom; 1224 Atom atom;
1191 Window win; 1225 Window win;
1192 char server[IMBUFSIZ]; 1226 char server[IMBUFSIZ];
1193 1227
1194 /* get current locale modifier */ 1228 /* get current locale modifier */
1195 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1229 if (char *p = XSetLocaleModifiers (0))
1196 { 1230 {
1197 strcpy (server, "@server="); 1231 strcpy (server, "@server=");
1198 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1232 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1199 1233
1200 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1234 if (p = strchr (server + 1, '@')) /* first one only */
1201 *p = '\0'; 1235 *p = '\0';
1202 1236
1203 atom = XInternAtom (dpy, server, False); 1237 atom = XInternAtom (dpy, server, False);
1204 win = XGetSelectionOwner (dpy, atom); 1238 win = XGetSelectionOwner (dpy, atom);
1205 1239
1206 if (win != None) 1240 if (win != None)
1207 return True; 1241 return true;
1208 } 1242 }
1209 1243
1210 return False; 1244 return false;
1211} 1245}
1212 1246
1213void 1247void
1214rxvt_term::IMSendSpot () 1248rxvt_term::im_send_spot ()
1215{ 1249{
1216 XPoint nspot; 1250 XPoint nspot;
1217 XVaNestedList preedit_attr; 1251 XVaNestedList preedit_attr;
1218 1252
1219 if (!Input_Context 1253 if (!Input_Context
… …
1272 1306
1273 term->make_current (); 1307 term->make_current ();
1274 1308
1275 if (text) 1309 if (text)
1276 { 1310 {
1277 void *str; 1311 wchar_t *str;
1278 1312
1279 if (!text->encoding_is_wchar && text->string.multi_byte) 1313 if (!text->encoding_is_wchar && text->string.multi_byte)
1280 { 1314 {
1281 // of course, X makes it ugly again 1315 // of course, X makes it ugly again
1282 if (term->rs[Rs_imLocale]) 1316 if (term->rs[Rs_imLocale])
1283 SET_LOCALE (term->rs[Rs_imLocale]); 1317 SET_LOCALE (term->rs[Rs_imLocale]);
1284 1318
1285 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1319 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1286 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1320 mbstowcs (str, text->string.multi_byte, text->length + 1);
1287 1321
1288 if (term->rs[Rs_imLocale]) 1322 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->locale); 1323 SET_LOCALE (term->locale);
1290 } 1324 }
1291 else 1325 else
1292 str = (void *)text->string.wide_char; 1326 str = text->string.wide_char;
1293 1327
1294 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1328 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1295 DT_INT, call_data->caret, 1329 DT_INT, call_data->caret,
1296 DT_INT, call_data->chg_first, 1330 DT_INT, call_data->chg_first,
1297 DT_INT, call_data->chg_length, 1331 DT_INT, call_data->chg_length,
1298 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1332 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1325/* 1359/*
1326 * Try to open a XIM with the current modifiers, then see if we can 1360 * Try to open a XIM with the current modifiers, then see if we can
1327 * open a suitable preedit type 1361 * open a suitable preedit type
1328 */ 1362 */
1329bool 1363bool
1330rxvt_term::IM_get_IC (const char *modifiers) 1364rxvt_term::im_get_ic (const char *modifiers)
1331{ 1365{
1332 int i, j, found; 1366 int i, j, found;
1333 XIM xim; 1367 XIM xim;
1334 XPoint spot; 1368 XPoint spot;
1335 XRectangle rect, status_rect, needed_rect; 1369 XRectangle rect, status_rect, needed_rect;
1336 unsigned long fg, bg; 1370 unsigned long fg, bg;
1337 const char *p; 1371 const char *p;
1338 char **s; 1372 char **s;
1339 XIMStyles *xim_styles; 1373 XIMStyles *xim_styles;
1340#ifdef ENABLE_XIM_ONTHESPOT
1341 XIMCallback xcb[4];
1342#endif
1343 1374
1344 set_environ (envv); 1375 set_environ (envv);
1345 1376
1346 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1377 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1347 return false; 1378 return false;
1348 1379
1349 input_method = display->get_xim (locale, modifiers); 1380 input_method = display->get_xim (locale, modifiers);
1350 if (input_method == NULL) 1381 if (input_method == NULL)
1351 return false; 1382 return false;
… …
1368 p = pet[pi]; 1399 p = pet[pi];
1369 1400
1370 if (!p) 1401 if (!p)
1371 continue; 1402 continue;
1372 1403
1373 s = rxvt_splitcommastring (p); 1404 s = rxvt_strsplit (',', p);
1374 1405
1375 for (i = found = 0; !found && s[i]; i++) 1406 for (i = found = 0; !found && s[i]; i++)
1376 { 1407 {
1377 if (!strcmp (s[i], "OverTheSpot")) 1408 if (!strcmp (s[i], "OverTheSpot"))
1378 input_style = XIMPreeditPosition | XIMStatusNothing; 1409 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1390 input_style = XIMPreeditNothing | XIMStatusNothing; 1421 input_style = XIMPreeditNothing | XIMStatusNothing;
1391 1422
1392 for (j = 0; j < xim_styles->count_styles; j++) 1423 for (j = 0; j < xim_styles->count_styles; j++)
1393 if (input_style == xim_styles->supported_styles[j]) 1424 if (input_style == xim_styles->supported_styles[j])
1394 { 1425 {
1395 rxvt_freecommastring (s); 1426 rxvt_free_strsplit (s);
1396 1427
1397 found = 1; 1428 found = 1;
1398 goto foundpet; 1429 goto foundpet;
1399 } 1430 }
1400 1431
1401 } 1432 }
1402 1433
1403 rxvt_freecommastring (s); 1434 rxvt_free_strsplit (s);
1404 } 1435 }
1405 1436
1406foundpet: 1437foundpet:
1407 1438
1408 XFree (xim_styles); 1439 XFree (xim_styles);
… …
1487 NULL); 1518 NULL);
1488 } 1519 }
1489#if ENABLE_XIM_ONTHESPOT 1520#if ENABLE_XIM_ONTHESPOT
1490 else if (input_style & XIMPreeditCallbacks) 1521 else if (input_style & XIMPreeditCallbacks)
1491 { 1522 {
1523 XIMCallback xcb[4];
1524
1492 im_set_position (spot); 1525 im_set_position (spot);
1493 1526
1494 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1527 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1495 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1528 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1496 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1529 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1511#endif 1544#endif
1512 1545
1513 Input_Context = XCreateIC (xim, 1546 Input_Context = XCreateIC (xim,
1514 XNInputStyle, input_style, 1547 XNInputStyle, input_style,
1515 XNClientWindow, vt, 1548 XNClientWindow, vt,
1516 XNFocusWindow, parent[0], 1549 XNFocusWindow, parent,
1517 preedit_attr ? XNPreeditAttributes : NULL, 1550 preedit_attr ? XNPreeditAttributes : NULL,
1518 preedit_attr, 1551 preedit_attr,
1519 status_attr ? XNStatusAttributes : NULL, 1552 status_attr ? XNStatusAttributes : NULL,
1520 status_attr, NULL); 1553 status_attr, NULL);
1521 1554
… …
1534 // unfortunately, only the focus window is used by XIM, hard to fix 1567 // unfortunately, only the focus window is used by XIM, hard to fix
1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1568 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1536 vt_select_input (); 1569 vt_select_input ();
1537#endif 1570#endif
1538 1571
1539 IMSetPosition (); 1572 im_set_position ();
1540 1573
1541 return true; 1574 return true;
1542} 1575}
1543 1576
1544void 1577void
… …
1554 im_destroy (); 1587 im_destroy ();
1555 1588
1556 if (Input_Context) 1589 if (Input_Context)
1557 return; 1590 return;
1558 1591
1559#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1560 if (rs[Rs_imLocale]) 1592 if (rs[Rs_imLocale])
1561 SET_LOCALE (rs[Rs_imLocale]); 1593 SET_LOCALE (rs[Rs_imLocale]);
1562#endif
1563 1594
1564 p = rs[Rs_inputMethod]; 1595 p = rs[Rs_inputMethod];
1565 if (p && *p) 1596 if (p && *p)
1566 { 1597 {
1567 bool found = false; 1598 bool found = false;
1568 1599
1569 s = rxvt_splitcommastring (p); 1600 s = rxvt_strsplit (',', p);
1570 1601
1571 for (i = 0; s[i]; i++) 1602 for (i = 0; s[i]; i++)
1572 { 1603 {
1573 if (*s[i]) 1604 if (*s[i])
1574 { 1605 {
1575 strcpy (buf, "@im="); 1606 strcpy (buf, "@im=");
1576 strncat (buf, s[i], IMBUFSIZ - 5); 1607 strncat (buf, s[i], IMBUFSIZ - 5);
1577 if (IM_get_IC (buf)) 1608 if (im_get_ic (buf))
1578 { 1609 {
1579 found = true; 1610 found = true;
1580 break; 1611 break;
1581 } 1612 }
1582 } 1613 }
1583 } 1614 }
1584 1615
1585 rxvt_freecommastring (s); 1616 rxvt_free_strsplit (s);
1586 1617
1587 if (found) 1618 if (found)
1588 goto done; 1619 goto done;
1589 } 1620 }
1590 1621
1591 /* try with XMODIFIERS env. var. */ 1622 /* try with XMODIFIERS env. var. */
1592 if (IM_get_IC ("")) 1623 if (im_get_ic (""))
1593 goto done; 1624 goto done;
1594 1625
1595 /* try with no modifiers base IF the user didn't specify an IM */ 1626 /* try with no modifiers base IF the user didn't specify an IM */
1596 if (IM_get_IC ("@im=none")) 1627 if (im_get_ic ("@im=none"))
1597 goto done; 1628 goto done;
1598 1629
1599done: 1630done:
1600#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1601 if (rs[Rs_imLocale]) 1631 if (rs[Rs_imLocale])
1602 SET_LOCALE (locale); 1632 SET_LOCALE (locale);
1603#endif
1604} 1633}
1605 1634
1606void 1635void
1607rxvt_term::IMSetPosition () 1636rxvt_term::im_set_position ()
1608{ 1637{
1609 XRectangle preedit_rect, status_rect, *needed_rect; 1638 XRectangle preedit_rect, status_rect, *needed_rect;
1610 XVaNestedList preedit_attr, status_attr; 1639 XVaNestedList preedit_attr, status_attr;
1611 1640
1612 if (!Input_Context 1641 if (!Input_Context
1613 || !focus 1642 || !focus
1614 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1643 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1615 || !IMisRunning ()) 1644 || !im_is_running ())
1616 return; 1645 return;
1617 1646
1618 if (input_style & XIMPreeditPosition) 1647 if (input_style & XIMPreeditPosition)
1619 { 1648 {
1620 im_set_size (preedit_rect); 1649 im_set_size (preedit_rect);
1621 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1650 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1622 1651
1623 XSetICValues (Input_Context, 1652 XSetICValues (Input_Context,
1624 XNPreeditAttributes, preedit_attr, NULL); 1653 XNPreeditAttributes, preedit_attr, NULL);
1625 } 1654 }
1626 else 1655 else
1627 { 1656 {
… …
1644 XFree (status_attr); 1673 XFree (status_attr);
1645 } 1674 }
1646 1675
1647 XFree (preedit_attr); 1676 XFree (preedit_attr);
1648} 1677}
1649#endif /* USE_XIM */ 1678#endif /* USE_XIM */
1679
1680void
1681rxvt_term::get_window_origin (int &x, int &y)
1682{
1683 Window cr;
1684 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1685}
1686
1687#ifdef HAVE_BG_PIXMAP
1688
1689void
1690rxvt_term::update_background ()
1691{
1692 if (update_background_ev.is_active ())
1693 return;
1694
1695 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1696
1697 if (to_wait <= 0.)
1698 bg_render ();
1699 else
1700 update_background_ev.start (to_wait);
1701}
1702
1703void
1704rxvt_term::update_background_cb (ev::timer &w, int revents)
1705{
1706 make_current ();
1707
1708 update_background_ev.stop ();
1709 bg_render ();
1710 refresh_check ();
1711}
1712
1713#endif /* HAVE_BG_PIXMAP */
1650 1714
1651/*----------------------- end-of-file (C source) -----------------------*/ 1715/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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