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.272 by root, Tue Dec 11 03:30:49 2007 UTC vs.
Revision 1.402 by sf-exg, Thu May 13 19:40:19 2021 UTC

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

Diff Legend

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