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

Diff Legend

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