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.230 by root, Sun Aug 27 10:10:25 2006 UTC vs.
Revision 1.395 by root, Sat Dec 13 11:58:23 2014 UTC

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

Diff Legend

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