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.248 by sasha, Wed Sep 12 19:51:41 2007 UTC vs.
Revision 1.397 by root, Sat Dec 13 12:24:32 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 ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if HAVE_BG_PIXMAP 155#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_cb), 156 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif 157#endif
162#ifdef CURSOR_BLINK 158#ifdef CURSOR_BLINK
163 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);
164#endif 160#endif
165#ifdef TEXT_BLINK 161#ifdef TEXT_BLINK
166 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);
167#endif 163#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 164#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 165 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
170#endif 166#endif
171#ifdef SELECTION_SCROLLING 167#ifdef SELECTION_SCROLLING
172 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
173#endif 169#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 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),
176#endif 179#endif
177#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb), 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179#endif 182#endif
180#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL 183#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 184 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185#endif 185#endif
186 termwin_ev (this, &rxvt_term::x_cb), 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187 vt_ev (this, &rxvt_term::x_cb), 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188 child_ev (this, &rxvt_term::child_cb), 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 192
193 incr_ev (this, &rxvt_term::incr_cb)
194{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 194
197 termlist.push_back (this); 195 termlist.push_back (this);
198 196
199#ifdef KEYSYM_RESOURCE 197#ifdef KEYSYM_RESOURCE
… …
201#endif 199#endif
202} 200}
203 201
204// 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.
205// for use before an emergency exit 203// for use before an emergency exit
204void
206void rxvt_term::emergency_cleanup () 205rxvt_term::emergency_cleanup ()
207{ 206{
208 if (cmd_pid) 207 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 208 kill (-cmd_pid, SIGHUP);
210 209
211 pty_ev.stop (); 210 pty_ev.stop ();
… …
223 if (fontset[i] != fontset[0]) 222 if (fontset[i] != fontset[0])
224 delete fontset[i]; 223 delete fontset[i];
225#endif 224#endif
226 delete fontset[0]; 225 delete fontset[0];
227 226
227#ifdef HAVE_BG_PIXMAP
228 bg_destroy ();
229#endif
230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
228 if (display) 235 if (display)
229 { 236 {
230 selection_clear (); 237 selection_clear ();
238 selection_clear (true);
231 239
232#ifdef USE_XIM 240#if USE_XIM
233 im_destroy (); 241 im_destroy ();
234#endif 242#endif
235#ifdef XTERM_SCROLLBAR 243 scrollBar.destroy ();
236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); 244
237 if (ShadowGC) XFreeGC (dpy, ShadowGC); 245 if (gc)
238#endif
239#ifdef PLAIN_SCROLLBAR
240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
241#endif
242#ifdef NEXT_SCROLLBAR
243 if (blackGC) XFreeGC (dpy, blackGC);
244 if (whiteGC) XFreeGC (dpy, whiteGC);
245 if (grayGC) XFreeGC (dpy, grayGC);
246 if (darkGC) XFreeGC (dpy, darkGC);
247 if (stippleGC) XFreeGC (dpy, stippleGC);
248 if (dimple) XFreePixmap (dpy, dimple);
249 if (upArrow) XFreePixmap (dpy, upArrow);
250 if (downArrow) XFreePixmap (dpy, downArrow);
251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
253#endif
254#ifdef RXVT_SCROLLBAR
255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
258#endif
259 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
260 247
261 delete drawable; 248 delete drawable;
249
262 // destroy all windows 250 // destroy all windows
263 if (parent[0]) 251 if (parent)
264 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
265 253
266 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
267 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
268 { 256 {
269 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
270#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
259 if (rs[Rs_fade])
271 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
272#endif 261#endif
273 } 262 }
274 263
275 clear (); 264 clear ();
276 }
277 265
278 delete [] pix_colors_focused; 266 display->flush (); /* ideally .put should do this */
279#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused;
281#endif
282
283 displays.put (display); 267 displays.put (display);
268 }
284 269
285 scr_release (); 270 scr_release ();
286 271
287 /* clear all resources */ 272 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 274 free (allocated [i]);
290 275
291 free (selection.text); 276 free (selection.text);
292 // TODO: manage env vars in child only(!) 277 free (selection.clip_text);
293 free (env_display);
294 free (env_term);
295 free (locale); 278 free (locale);
296 free (v_buffer); 279 free (v_buffer);
297 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;
298 287
299 delete envv; 288 delete envv;
300 delete argv; 289 delete argv;
301 290
302#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
303 delete keyboard; 292 delete keyboard;
304#endif 293#endif
294#ifndef NO_RESOURCES
295 XrmDestroyDatabase (option_db);
296#endif
297
298 SET_R ((rxvt_term *)0);
305} 299}
306 300
307// child has exited, usually destroys 301// child has exited, usually destroys
308void 302void
309rxvt_term::child_cb (child_watcher &w, int status) 303rxvt_term::child_cb (ev::child &w, int status)
310{ 304{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 305 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 306
313 cmd_pid = 0; 307 cmd_pid = 0;
314 308
… …
317} 311}
318 312
319void 313void
320rxvt_term::destroy () 314rxvt_term::destroy ()
321{ 315{
322 if (destroy_ev.active) 316 if (destroy_ev.is_active ())
323 return; 317 return;
324 318
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 319 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326 320
327#if ENABLE_OVERLAY 321#if ENABLE_OVERLAY
… …
331 if (display) 325 if (display)
332 { 326 {
333#if USE_XIM 327#if USE_XIM
334 im_ev.stop (display); 328 im_ev.stop (display);
335#endif 329#endif
336#if HAVE_SCROLLBARS
337 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
338#endif 331#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
339#if ENABLE_TRANSPARENCY || ENABLE_PERL
340 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
341#endif 333#endif
342 incr_ev.stop ();
343 termwin_ev.stop (display); 334 termwin_ev.stop (display);
344 vt_ev.stop (display); 335 vt_ev.stop (display);
345 } 336 }
346 337
347 check_ev.stop (); 338 flush_ev.stop ();
348 pty_ev.stop (); 339 pty_ev.stop ();
349#ifdef CURSOR_BLINK 340#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 341 cursor_blink_ev.stop ();
351#endif 342#endif
352#ifdef TEXT_BLINK 343#ifdef TEXT_BLINK
… …
360#endif 351#endif
361#ifdef POINTER_BLANK 352#ifdef POINTER_BLANK
362 pointer_ev.stop (); 353 pointer_ev.stop ();
363#endif 354#endif
364 355
365 destroy_ev.start (0); 356 destroy_ev.start ();
366} 357}
367 358
368void 359void
369rxvt_term::destroy_cb (time_watcher &w) 360rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 361{
371 make_current (); 362 make_current ();
372 363
373 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);
374} 377}
375 378
376/*----------------------------------------------------------------------*/ 379/*----------------------------------------------------------------------*/
377/* 380/*
378 * Exit gracefully, clearing the utmp entry and restoring tty attributes 381 * Exit gracefully, clearing the utmp entry and restoring tty attributes
379 * TODO: if debugging, this should free up any known resources if we can
380 */ 382 */
381static XErrorHandler old_xerror_handler; 383static XErrorHandler old_xerror_handler;
382 384
383static void 385static void
384rxvt_emergency_cleanup () 386rxvt_emergency_cleanup ()
… …
386 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++)
387 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
388} 390}
389 391
390#if !ENABLE_MINIMAL 392#if !ENABLE_MINIMAL
391static void 393static void ecb_cold
392print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
393{ 395{
394 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
396 char number[32]; 398 char number[32];
397 char *mtype = "XlibMessage"; 399
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 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);
401 rxvt_warn ("%s: %s\n", mesg, buffer); 407 rxvt_warn ("+ %s: %s\n", mesg, buffer);
408
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 409 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 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 {
404 sprintf(number, "%d", event->request_code); 463 sprintf (number, "%d", event->request_code);
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 464 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer); 465 rxvt_warn ("+ (which is %s)\n", buffer);
407 if (event->request_code >= 128) {
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
409 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
411 } 466 }
467
412 if ((event->error_code == BadWindow) || 468 if (event->error_code == BadWindow
413 (event->error_code == BadPixmap) || 469 || event->error_code == BadPixmap
414 (event->error_code == BadCursor) || 470 || event->error_code == BadCursor
415 (event->error_code == BadFont) || 471 || event->error_code == BadFont
416 (event->error_code == BadDrawable) || 472 || event->error_code == BadDrawable
417 (event->error_code == BadColor) || 473 || event->error_code == BadColor
418 (event->error_code == BadGC) || 474 || event->error_code == BadGC
419 (event->error_code == BadIDChoice) || 475 || event->error_code == BadIDChoice
420 (event->error_code == BadValue) || 476 || event->error_code == BadValue
421 (event->error_code == BadAtom)) { 477 || event->error_code == BadAtom)
478 {
422 if (event->error_code == BadValue) 479 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 480 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
424 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 481 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 482 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
427 mesg, BUFSIZ); 483 else
428 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 484 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
430 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436}
437#endif
438 485
439int 486 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
487 }
488}
489#endif
490
491int ecb_cold
440rxvt_xerror_handler (Display *display, XErrorEvent *event) 492rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{ 493{
442 if (GET_R->allowedxerror == -1) 494 if (GET_R && GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code; 495 GET_R->allowedxerror = event->error_code;
444 else 496 else
445 { 497 {
446 // 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,
447 // so just output the error and continue 499 // so just output the error and continue
… …
453 } 505 }
454 506
455 return 0; 507 return 0;
456} 508}
457 509
458int 510int ecb_cold
459rxvt_xioerror_handler (Display *display) 511rxvt_xioerror_handler (Display *display)
460{ 512{
461 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",
462 DisplayString (display)); 514 DisplayString (display));
463 rxvt_emergency_cleanup (); 515 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE); 516 _exit (EXIT_FAILURE);
465} 517}
466 518
467/*----------------------------------------------------------------------*/
468bool
469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{
471 this->envv = envv;
472
473 SET_R (this);
474 set_locale ("");
475 set_environ (envv); // few things in X do not call setlocale :(
476
477 if (!init_vars ())
478 return false;
479
480 init_secondary ();
481
482 const char **cmd_argv = init_resources (argc, argv);
483
484#ifdef KEYSYM_RESOURCE
485 keyboard->register_done ();
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (option (Opt_scrollBar))
490 scrollBar.setIdle (); /* set existence for size calculations */
491#endif
492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
513#ifdef ENABLE_TRANSPARENCY
514 if (option (Opt_transparent))
515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
527 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root);
529 }
530#endif
531
532#ifdef XPM_BACKGROUND
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!bgPixmap.window_position_sensitive ())
547 update_background ();
548 }
549#endif
550 }
551#endif
552
553#if ENABLE_PERL
554 rootwin_ev.start (display, display->root);
555#endif
556
557 set_colorfgbg ();
558
559 init_command (cmd_argv);
560
561 free (cmd_argv);
562
563 if (pty->pty >= 0)
564 pty_ev.start (pty->pty, EVENT_READ);
565
566 check_ev.start ();
567
568 HOOK_INVOKE ((this, HOOK_START, DT_END));
569
570#if ENABLE_XEMBED
571 if (rs[Rs_embed])
572 {
573 long info[2] = { 0, XEMBED_MAPPED };
574
575 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
576 32, PropModeReplace, (unsigned char *)&info, 2);
577 }
578#endif
579
580 XMapWindow (dpy, vt);
581 XMapWindow (dpy, parent[0]);
582
583 return true;
584}
585
586static struct sig_handlers 519static struct sig_handlers
587{ 520{
588 sig_watcher sw_term, sw_int; 521 ev::sig sw_term, sw_int;
589 522
590 /* 523 /*
591 * Catch a fatal signal and tidy up before quitting 524 * Catch a fatal signal and tidy up before quitting
592 */ 525 */
593 void 526 void sig_term (ev::sig &w, int revents);
594 sig_term (sig_watcher &w) 527
528 sig_handlers ()
595 { 529 {
596 rxvt_emergency_cleanup (); 530 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
597 signal (w.signum, SIG_DFL);
598 kill (getpid (), w.signum);
599 }
600
601 sig_handlers ()
602 : sw_term (this, &sig_handlers::sig_term),
603 sw_int (this, &sig_handlers::sig_term) 531 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
604 {
605 } 532 }
606} sig_handlers; 533} sig_handlers;
607 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
608char **rxvt_environ; // startup environment 610char **rxvt_environ; // startup environment
609 611
610void 612void
611rxvt_init () 613rxvt_init ()
612{ 614{
613 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");
614 626
615 rxvt_environ = environ; 627 rxvt_environ = environ;
616 628
617 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 630 signal (SIGPIPE, SIG_IGN);
619 631
620 sig_handlers.sw_term.start (SIGTERM); 632 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
621 sig_handlers.sw_int.start (SIGINT); 633 sig_handlers.sw_int.start (SIGINT); ev_unref ();
622
623 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
624 /* signal (SIGURG, SIG_DFL); */
625 634
626 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
627 // TODO: handle this with exceptions and tolerate the memory loss 636 // TODO: handle this with exceptions and tolerate the memory loss
628 XSetIOErrorHandler (rxvt_xioerror_handler); 637 XSetIOErrorHandler (rxvt_xioerror_handler);
629 638
630 XrmInitialize (); 639 XrmInitialize ();
631}
632 640
633/* ------------------------------------------------------------------------- * 641#if HAVE_PIXBUF
634 * MEMORY ALLOCATION WRAPPERS * 642 g_type_init ();
635 * ------------------------------------------------------------------------- */ 643#endif
636void *
637rxvt_malloc (size_t size)
638{
639 void *p = malloc (size);
640
641 if (!p)
642 rxvt_fatal ("memory allocation failure. aborting.\n");
643
644 return p;
645}
646
647void *
648rxvt_calloc (size_t number, size_t size)
649{
650 void *p = calloc (number, size);
651
652 if (!p)
653 rxvt_fatal ("memory allocation failure. aborting.\n");
654
655 return p;
656}
657
658void *
659rxvt_realloc (void *ptr, size_t size)
660{
661 void *p = realloc (ptr, size);
662
663 if (!p)
664 rxvt_fatal ("memory allocation failure. aborting.\n");
665
666 return p;
667} 644}
668 645
669/*----------------------------------------------------------------------*/ 646/*----------------------------------------------------------------------*/
670/* 647/*
671 * window size/position calculations for XSizeHint and other storage. 648 * window size/position calculations for XSizeHint and other storage.
… …
673 */ 650 */
674void 651void
675rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 652rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
676{ 653{
677 short recalc_x, recalc_y; 654 short recalc_x, recalc_y;
678 int x, y, sb_w, flags; 655 int x, y, flags;
679 unsigned int w, h; 656 unsigned int w, h;
680 unsigned int max_width, max_height; 657 unsigned int max_width, max_height;
681 658
682 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 659 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
683 szHint.win_gravity = NorthWestGravity; 660 szHint.win_gravity = NorthWestGravity;
… …
693 if (rs[Rs_geometry]) 670 if (rs[Rs_geometry])
694 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 671 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
695 672
696 if (flags & WidthValue) 673 if (flags & WidthValue)
697 { 674 {
675 if (!w)
676 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
677
698 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 678 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
699 szHint.flags |= USSize; 679 szHint.flags |= USSize;
700 } 680 }
701 681
702 if (flags & HeightValue) 682 if (flags & HeightValue)
703 { 683 {
684 if (!h)
685 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
686
704 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 687 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
705 szHint.flags |= USSize; 688 szHint.flags |= USSize;
706 } 689 }
707 690
708 if (flags & XValue) 691 if (flags & XValue)
709 { 692 {
… …
740 max_width = MAX_COLS * fwidth; 723 max_width = MAX_COLS * fwidth;
741 max_height = MAX_ROWS * fheight; 724 max_height = MAX_ROWS * fheight;
742 725
743 szHint.base_width = szHint.base_height = 2 * int_bwidth; 726 szHint.base_width = szHint.base_height = 2 * int_bwidth;
744 727
745 sb_w = 0;
746 window_vt_x = window_vt_y = int_bwidth; 728 window_vt_x = window_vt_y = int_bwidth;
747 729
748 if (scrollBar.state) 730 if (scrollBar.state)
749 { 731 {
750 sb_w = scrollbar_TotalWidth (); 732 int sb_w = scrollBar.total_width ();
751 szHint.base_width += sb_w; 733 szHint.base_width += sb_w;
752 734
753 if (!option (Opt_scrollBar_right)) 735 if (!option (Opt_scrollBar_right))
754 window_vt_x += sb_w; 736 window_vt_x += sb_w;
755 } 737 }
… …
779 { 761 {
780 min_it (height, max_height); 762 min_it (height, max_height);
781 szHint.height = szHint.base_height + height; 763 szHint.height = szHint.base_height + height;
782 } 764 }
783 765
784 if (scrollBar.state && option (Opt_scrollBar_right))
785 window_sb_x = szHint.width - sb_w;
786
787 if (recalc_x) 766 if (recalc_x)
788 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 767 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
789 768
790 if (recalc_y) 769 if (recalc_y)
791 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 770 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
792 771
793 ncol = width / fwidth; 772 ncol = width / fwidth;
794 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;
795} 783}
796 784
797/*----------------------------------------------------------------------*/ 785/*----------------------------------------------------------------------*/
798/* 786/*
799 * Tell the teletype handler what size the window is. 787 * Tell the teletype handler what size the window is.
… …
807 795
808 struct winsize ws; 796 struct winsize ws;
809 797
810 ws.ws_col = ncol; 798 ws.ws_col = ncol;
811 ws.ws_row = nrow; 799 ws.ws_row = nrow;
812 ws.ws_xpixel = width; 800 ws.ws_xpixel = vt_width;
813 ws.ws_ypixel = height; 801 ws.ws_ypixel = vt_height;
814 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 802 ioctl (pty->pty, TIOCSWINSZ, &ws);
815 803
816#if 0 804#if 0
817 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 805 // TIOCSWINSZ is supposed to do this automatically and correctly
818 if (cmd_pid) /* force through to the command */ 806 if (cmd_pid) /* force through to the command */
819 kill (-cmd_pid, SIGWINCH); 807 kill (-cmd_pid, SIGWINCH);
820#endif 808#endif
821} 809}
822 810
823/*----------------------------------------------------------------------*/ 811/*----------------------------------------------------------------------*/
824/* set_fonts () - load and set the various fonts 812/* load and set the various fonts */
825 *
826 * init = 1 - initialize
827 *
828 * fontname == FONT_UP - switch to bigger font
829 * fontname == FONT_DN - switch to smaller font
830 */
831bool 813bool
832rxvt_term::set_fonts () 814rxvt_term::set_fonts ()
833{ 815{
834 rxvt_fontset *fs = new rxvt_fontset (this); 816 rxvt_fontset *fs = new rxvt_fontset (this);
835 rxvt_fontprop prop; 817 rxvt_fontprop prop;
… …
849#endif 831#endif
850 832
851 delete fontset[0]; 833 delete fontset[0];
852 fontset[0] = fs; 834 fontset[0] = fs;
853 835
854 prop = (*fs)[1]->properties (); 836 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
855 prop.height += lineSpace; 837 prop.width = max (prop.width + letterSpace, 1);
856 838
857 fs->set_prop (prop, false); 839 fs->set_prop (prop, false);
858 840
859 fwidth = prop.width; 841 fwidth = prop.width;
860 fheight = prop.height; 842 fheight = prop.height + lineSpace;
861 fbase = prop.ascent; 843 fbase = prop.ascent;
862 844
863 for (int style = 1; style < 4; style++) 845 for (int style = 1; style < 4; style++)
864 { 846 {
865#if ENABLE_STYLES 847#if ENABLE_STYLES
… …
891#else 873#else
892 fontset[style] = fontset[0]; 874 fontset[style] = fontset[0];
893#endif 875#endif
894 } 876 }
895 877
896 if (parent[0]) 878 if (parent)
897 { 879 {
898 resize_all_windows (0, 0, 0); 880 resize_all_windows (0, 0, 0);
899 scr_remap_chars (); 881 scr_remap_chars ();
900 scr_touch (true); 882 scr_touch (true);
901 } 883 }
902 884
903 return true; 885 return true;
904} 886}
905 887
888void
906void rxvt_term::set_string_property (Atom prop, const char *str, int len) 889rxvt_term::set_string_property (Atom prop, const char *str, int len)
907{ 890{
908 XChangeProperty (dpy, parent[0], 891 XChangeProperty (dpy, parent,
909 prop, XA_STRING, 8, PropModeReplace, 892 prop, XA_STRING, 8, PropModeReplace,
910 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 893 (const unsigned char *)str, len >= 0 ? len : strlen (str));
911} 894}
912 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
913void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 909rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
914{ 910{
915 wchar_t *ws = rxvt_mbstowcs (str, len); 911 wchar_t *ws = rxvt_mbstowcs (str, len);
916 char *s = rxvt_wcstoutf8 (ws); 912 char *s = rxvt_wcstoutf8 (ws);
917 913
918 XChangeProperty (dpy, parent[0], 914 XChangeProperty (dpy, parent,
919 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 915 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
920 (const unsigned char *)s, strlen (s)); 916 (const unsigned char *)s, strlen (s));
921 917
922 free (s); 918 free (s);
923 free (ws); 919 free (ws);
… …
927/*----------------------------------------------------------------------*/ 923/*----------------------------------------------------------------------*/
928/* xterm sequences - title, iconName, color (exptl) */ 924/* xterm sequences - title, iconName, color (exptl) */
929void 925void
930rxvt_term::set_title (const char *str) 926rxvt_term::set_title (const char *str)
931{ 927{
932 set_string_property (XA_WM_NAME, str); 928 set_mbstring_property (XA_WM_NAME, str);
933#if ENABLE_EWMH 929#if ENABLE_EWMH
934 set_utf8_property (xa[XA_NET_WM_NAME], str); 930 set_utf8_property (xa[XA_NET_WM_NAME], str);
935#endif 931#endif
936} 932}
937 933
938void 934void
939rxvt_term::set_icon_name (const char *str) 935rxvt_term::set_icon_name (const char *str)
940{ 936{
941 set_string_property (XA_WM_ICON_NAME, str); 937 set_mbstring_property (XA_WM_ICON_NAME, str);
942#if ENABLE_EWMH 938#if ENABLE_EWMH
943 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 939 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
944#endif 940#endif
945} 941}
946 942
943void
944rxvt_term::set_window_color (int idx, const char *color)
945{
947#ifdef XTERM_COLOR_CHANGE 946#ifdef XTERM_COLOR_CHANGE
948void
949rxvt_term::set_window_color (int idx, const char *color)
950{
951 rxvt_color xcol;
952 int i;
953
954 if (color == NULL || *color == '\0') 947 if (color == NULL || *color == '\0')
955 return; 948 return;
956 949
957 color = strdup (color); 950 color = strdup (color);
958 allocated.push_back ((void *)color); 951 allocated.push_back ((void *)color);
959 rs[Rs_color + idx] = color; 952 rs[Rs_color + idx] = color;
960 953
961 /* handle color aliases */ 954 /* handle color aliases */
962 if (isdigit (*color)) 955 if (isdigit (*color))
963 { 956 {
964 i = atoi (color); 957 int i = atoi (color);
965 958
966 if (i >= 8 && i <= 15) 959 if (i >= 8 && i <= 15)
960 {
967 { /* bright colors */ 961 /* bright colors */
968 i -= 8; 962 alias_color (idx, minBrightCOLOR + i - 8);
969 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
970 goto done; 963 goto done;
971 } 964 }
972 965
973 if (i >= 0 && i <= 7) 966 if (i >= 0 && i <= 7)
967 {
974 { /* normal colors */ 968 /* normal colors */
975 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 969 alias_color (idx, minCOLOR + i);
976 goto done; 970 goto done;
977 } 971 }
978 } 972 }
979 973
980 set_color (xcol, color); 974 pix_colors_focused[idx].free (this);
975 set_color (pix_colors_focused[idx], color);
981 976
982 /*
983 * FIXME: should free colors here, but no idea how to do it so instead,
984 * so just keep gobbling up the colormap
985 */
986
987 pix_colors_focused[idx] = xcol;
988
989 /* XSetWindowAttributes attr; */
990 /* Cursor cursor; */
991done: 977done:
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 978 /*TODO: handle Color_BD, scrollbar background, etc. */
993 979
994 update_fade_color (idx); 980 update_fade_color (idx);
995 recolour_cursor (); 981 recolor_cursor ();
996 scr_recolour (); 982 scr_recolor ();
983#endif /* XTERM_COLOR_CHANGE */
997} 984}
998 985
999#else
1000# define set_window_color (idx,color) ((void)0)
1001#endif /* XTERM_COLOR_CHANGE */
1002
1003void 986void
1004rxvt_term::recolour_cursor () 987rxvt_term::recolor_cursor ()
1005{ 988{
1006 XColor fg, bg; 989 XColor fg, bg;
1007 990
1008 (ISSET_PIXCOLOR (Color_pointer_fg) 991 (ISSET_PIXCOLOR (Color_pointer_fg)
1009 ? pix_colors_focused[Color_pointer_fg] 992 ? pix_colors_focused[Color_pointer_fg]
… …
1018 1001
1019/*----------------------------------------------------------------------*/ 1002/*----------------------------------------------------------------------*/
1020/* 1003/*
1021 * find if fg/bg matches any of the normal (low-intensity) colors 1004 * find if fg/bg matches any of the normal (low-intensity) colors
1022 */ 1005 */
1023void 1006char *
1024rxvt_term::set_colorfgbg () 1007rxvt_term::get_colorfgbg ()
1025{ 1008{
1026 unsigned int i; 1009 unsigned int i;
1027 const char *xpmb = "\0"; 1010 const char *xpmb = "";
1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1011 char fstr[] = "default";
1012 char bstr[] = "default";
1013 char *env_colorfgbg;
1029 1014
1030 strcpy (fstr, "default");
1031 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
1033 if (pix_colors[Color_fg] == pix_colors[i]) 1016 if (pix_colors[Color_fg] == pix_colors[i])
1034 { 1017 {
1035 sprintf (fstr, "%d", (i - Color_Black)); 1018 sprintf (fstr, "%d", i - Color_Black);
1036 break; 1019 break;
1037 } 1020 }
1038 1021
1039 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
1040 if (pix_colors[Color_bg] == pix_colors[i]) 1023 if (pix_colors[Color_bg] == pix_colors[i])
1041 { 1024 {
1042 sprintf (bstr, "%d", (i - Color_Black)); 1025 sprintf (bstr, "%d", i - Color_Black);
1043#ifdef XPM_BACKGROUND 1026#if BG_IMAGE_FROM_FILE
1044 xpmb = "default;"; 1027 xpmb = "default;";
1045#endif 1028#endif
1046 break; 1029 break;
1047 } 1030 }
1048 1031
1032 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1033 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1034 return env_colorfgbg;
1050} 1035}
1051 1036
1052/*----------------------------------------------------------------------*/ 1037/*----------------------------------------------------------------------*/
1053 1038
1054bool 1039bool
… …
1062} 1047}
1063 1048
1064void 1049void
1065rxvt_term::alias_color (int dst, int src) 1050rxvt_term::alias_color (int dst, int src)
1066{ 1051{
1052 pix_colors[dst].free (this);
1067 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1053 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1068} 1054}
1069 1055
1070/* -------------------------------------------------------------------- * 1056/* -------------------------------------------------------------------- *
1071 * - WINDOW RESIZING - * 1057 * - WINDOW RESIZING - *
… …
1077 int old_width = szHint.width; 1063 int old_width = szHint.width;
1078 int old_height = szHint.height; 1064 int old_height = szHint.height;
1079 1065
1080 window_calc (newwidth, newheight); 1066 window_calc (newwidth, newheight);
1081 1067
1082 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1068 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1069
1070 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1071 if (set_hint)
1072 {
1073 szHint.flags &= ~(PBaseSize | PResizeInc);
1083 XSetWMNormalHints (dpy, parent[0], &szHint); 1074 XSetWMNormalHints (dpy, parent, &szHint);
1075 szHint.flags |= PBaseSize | PResizeInc;
1076 }
1084 1077
1085 if (!ignoreparent) 1078 if (!ignoreparent)
1086 { 1079 {
1087#ifdef SMART_RESIZE 1080#ifdef SMART_RESIZE
1088 /* 1081 /*
… …
1092 int x, y, x1, y1; 1085 int x, y, x1, y1;
1093 int dx, dy; 1086 int dx, dy;
1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1087 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1095 Window unused_cr; 1088 Window unused_cr;
1096 1089
1097 XTranslateCoordinates (dpy, parent[0], display->root, 1090 XTranslateCoordinates (dpy, parent, display->root,
1098 0, 0, &x, &y, &unused_cr); 1091 0, 0, &x, &y, &unused_cr);
1099 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1092 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1093 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1101 /* 1094 /*
1102 * if display->root isn't the parent window, a WM will probably have offset 1095 * if display->root isn't the parent window, a WM will probably have offset
1103 * our position for handles and decorations. Counter it 1096 * our position for handles and decorations. Counter it
1104 */ 1097 */
… …
1121 if (y < y1) /* top half */ 1114 if (y < y1) /* top half */
1122 dy = 0; 1115 dy = 0;
1123 else if (y == y1) /* exact center */ 1116 else if (y == y1) /* exact center */
1124 dy /= 2; 1117 dy /= 2;
1125 1118
1126 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1119 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1127 szHint.width, szHint.height); 1120 szHint.width, szHint.height);
1128#else 1121#else
1129 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1122 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1130#endif 1123#endif
1131 } 1124 }
1125
1126 if (set_hint)
1127 XSetWMNormalHints (dpy, parent, &szHint);
1132 1128
1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1129 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1134 1130
1135 if (fix_screen || newwidth != old_width || newheight != old_height) 1131 if (fix_screen || newwidth != old_width || newheight != old_height)
1136 { 1132 {
1137 if (scrollBar.state) 1133 if (scrollBar.state)
1138 { 1134 scrollBar.resize ();
1139 XMoveResizeWindow (dpy, scrollBar.win,
1140 window_sb_x, 0,
1141 scrollbar_TotalWidth (), szHint.height);
1142 resize_scrollbar ();
1143 }
1144 1135
1145 XMoveResizeWindow (dpy, vt, 1136 XMoveResizeWindow (dpy, vt,
1146 window_vt_x, window_vt_y, 1137 window_vt_x, window_vt_y,
1147 width, height); 1138 vt_width, vt_height);
1139
1140 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1148 1141
1149#ifdef HAVE_BG_PIXMAP 1142#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ()) 1143 if (bg_window_size_sensitive ())
1151 update_background (); 1144 update_background ();
1152#endif 1145#endif
1153
1154 scr_clear ();
1155 } 1146 }
1156 1147
1157 if (fix_screen || old_height == 0) 1148 if (fix_screen || old_height == 0)
1158 scr_reset (); 1149 scr_reset ();
1159 1150
1160 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1161 //scr_touch (false);
1162
1163#ifdef HAVE_BG_PIXMAP
1164// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1165// if (bgPixmap.pixmap)
1166// scr_touch (false);
1167#endif
1168
1169#ifdef USE_XIM 1151#if USE_XIM
1170 IMSetPosition (); 1152 im_set_position ();
1171#endif 1153#endif
1172} 1154}
1173 1155
1174/* 1156/*
1175 * Set the width/height of the vt window in characters. Units are pixels. 1157 * Set the width/height of the vt window in characters. Units are pixels.
… …
1188 newwidth = wattr.width - szHint.base_width; 1170 newwidth = wattr.width - szHint.base_width;
1189 if (newheight == 0) 1171 if (newheight == 0)
1190 newheight = wattr.height - szHint.base_height; 1172 newheight = wattr.height - szHint.base_height;
1191 } 1173 }
1192 1174
1193 if (newwidth != width || newheight != height) 1175 if (newwidth != vt_width || newheight != vt_height)
1194 { 1176 {
1195 newwidth += szHint.base_width; 1177 newwidth += szHint.base_width;
1196 newheight += szHint.base_height; 1178 newheight += szHint.base_height;
1197 resize_all_windows (newwidth, newheight, 0); 1179 resize_all_windows (newwidth, newheight, 0);
1198 } 1180 }
1199} 1181}
1200 1182
1201/* -------------------------------------------------------------------- * 1183/* -------------------------------------------------------------------- *
1202 * - X INPUT METHOD ROUTINES - * 1184 * - X INPUT METHOD ROUTINES - *
1203 * -------------------------------------------------------------------- */ 1185 * -------------------------------------------------------------------- */
1204#ifdef USE_XIM 1186#if USE_XIM
1205 1187
1206void 1188void
1207rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1189rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1208{ 1190{
1209 fg = pix_colors [Color_fg]; 1191 fg = pix_colors [Color_fg];
… …
1236 status_rect.height = fheight; 1218 status_rect.height = fheight;
1237} 1219}
1238 1220
1239/* Checking whether input method is running. */ 1221/* Checking whether input method is running. */
1240bool 1222bool
1241rxvt_term::IMisRunning () 1223rxvt_term::im_is_running ()
1242{ 1224{
1243 char *p;
1244 Atom atom; 1225 Atom atom;
1245 Window win; 1226 Window win;
1246 char server[IMBUFSIZ]; 1227 char server[IMBUFSIZ];
1247 1228
1248 /* get current locale modifier */ 1229 /* get current locale modifier */
1249 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1230 if (char *p = XSetLocaleModifiers (0))
1250 { 1231 {
1251 strcpy (server, "@server="); 1232 strcpy (server, "@server=");
1252 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1233 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1253 1234
1254 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1235 if (p = strchr (server + 1, '@')) /* first one only */
1255 *p = '\0'; 1236 *p = '\0';
1256 1237
1257 atom = XInternAtom (dpy, server, False); 1238 atom = XInternAtom (dpy, server, False);
1258 win = XGetSelectionOwner (dpy, atom); 1239 win = XGetSelectionOwner (dpy, atom);
1259 1240
1260 if (win != None) 1241 if (win != None)
1261 return True; 1242 return true;
1262 } 1243 }
1263 1244
1264 return False; 1245 return false;
1265} 1246}
1266 1247
1267void 1248void
1268rxvt_term::IMSendSpot () 1249rxvt_term::im_send_spot ()
1269{ 1250{
1270 XPoint nspot; 1251 XPoint nspot;
1271 XVaNestedList preedit_attr; 1252 XVaNestedList preedit_attr;
1272 1253
1273 if (!Input_Context 1254 if (!Input_Context
… …
1326 1307
1327 term->make_current (); 1308 term->make_current ();
1328 1309
1329 if (text) 1310 if (text)
1330 { 1311 {
1331 void *str; 1312 wchar_t *str;
1332 1313
1333 if (!text->encoding_is_wchar && text->string.multi_byte) 1314 if (!text->encoding_is_wchar && text->string.multi_byte)
1334 { 1315 {
1335 // of course, X makes it ugly again 1316 // of course, X makes it ugly again
1336 if (term->rs[Rs_imLocale]) 1317 if (term->rs[Rs_imLocale])
1337 SET_LOCALE (term->rs[Rs_imLocale]); 1318 SET_LOCALE (term->rs[Rs_imLocale]);
1338 1319
1339 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1320 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1340 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1321 mbstowcs (str, text->string.multi_byte, text->length + 1);
1341 1322
1342 if (term->rs[Rs_imLocale]) 1323 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale); 1324 SET_LOCALE (term->locale);
1344 } 1325 }
1345 else 1326 else
1346 str = (void *)text->string.wide_char; 1327 str = text->string.wide_char;
1347 1328
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1329 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret, 1330 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first, 1331 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length, 1332 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1333 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1379/* 1360/*
1380 * Try to open a XIM with the current modifiers, then see if we can 1361 * Try to open a XIM with the current modifiers, then see if we can
1381 * open a suitable preedit type 1362 * open a suitable preedit type
1382 */ 1363 */
1383bool 1364bool
1384rxvt_term::IM_get_IC (const char *modifiers) 1365rxvt_term::im_get_ic (const char *modifiers)
1385{ 1366{
1386 int i, j, found; 1367 int i, j, found;
1387 XIM xim; 1368 XIM xim;
1388 XPoint spot; 1369 XPoint spot;
1389 XRectangle rect, status_rect, needed_rect; 1370 XRectangle rect, status_rect, needed_rect;
1390 unsigned long fg, bg; 1371 unsigned long fg, bg;
1391 const char *p; 1372 const char *p;
1392 char **s; 1373 char **s;
1393 XIMStyles *xim_styles; 1374 XIMStyles *xim_styles;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 XIMCallback xcb[4];
1396#endif
1397 1375
1398 set_environ (envv); 1376 set_environ (env);
1399 1377
1400 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1378 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1401 return false; 1379 return false;
1402 1380
1403 input_method = display->get_xim (locale, modifiers); 1381 input_method = display->get_xim (locale, modifiers);
1404 if (input_method == NULL) 1382 if (input_method == NULL)
1405 return false; 1383 return false;
… …
1422 p = pet[pi]; 1400 p = pet[pi];
1423 1401
1424 if (!p) 1402 if (!p)
1425 continue; 1403 continue;
1426 1404
1427 s = rxvt_splitcommastring (p); 1405 s = rxvt_strsplit (',', p);
1428 1406
1429 for (i = found = 0; !found && s[i]; i++) 1407 for (i = found = 0; !found && s[i]; i++)
1430 { 1408 {
1431 if (!strcmp (s[i], "OverTheSpot")) 1409 if (!strcmp (s[i], "OverTheSpot"))
1432 input_style = XIMPreeditPosition | XIMStatusNothing; 1410 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1444 input_style = XIMPreeditNothing | XIMStatusNothing; 1422 input_style = XIMPreeditNothing | XIMStatusNothing;
1445 1423
1446 for (j = 0; j < xim_styles->count_styles; j++) 1424 for (j = 0; j < xim_styles->count_styles; j++)
1447 if (input_style == xim_styles->supported_styles[j]) 1425 if (input_style == xim_styles->supported_styles[j])
1448 { 1426 {
1449 rxvt_freecommastring (s); 1427 rxvt_free_strsplit (s);
1450 1428
1451 found = 1; 1429 found = 1;
1452 goto foundpet; 1430 goto foundpet;
1453 } 1431 }
1454 1432
1455 } 1433 }
1456 1434
1457 rxvt_freecommastring (s); 1435 rxvt_free_strsplit (s);
1458 } 1436 }
1459 1437
1460foundpet: 1438foundpet:
1461 1439
1462 XFree (xim_styles); 1440 XFree (xim_styles);
… …
1541 NULL); 1519 NULL);
1542 } 1520 }
1543#if ENABLE_XIM_ONTHESPOT 1521#if ENABLE_XIM_ONTHESPOT
1544 else if (input_style & XIMPreeditCallbacks) 1522 else if (input_style & XIMPreeditCallbacks)
1545 { 1523 {
1524 XIMCallback xcb[4];
1525
1546 im_set_position (spot); 1526 im_set_position (spot);
1547 1527
1548 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1528 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1549 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1529 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1550 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1530 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1565#endif 1545#endif
1566 1546
1567 Input_Context = XCreateIC (xim, 1547 Input_Context = XCreateIC (xim,
1568 XNInputStyle, input_style, 1548 XNInputStyle, input_style,
1569 XNClientWindow, vt, 1549 XNClientWindow, vt,
1570 XNFocusWindow, parent[0], 1550 XNFocusWindow, parent,
1571 preedit_attr ? XNPreeditAttributes : NULL, 1551 preedit_attr ? XNPreeditAttributes : NULL,
1572 preedit_attr, 1552 preedit_attr,
1573 status_attr ? XNStatusAttributes : NULL, 1553 status_attr ? XNStatusAttributes : NULL,
1574 status_attr, NULL); 1554 status_attr, NULL);
1575 1555
… …
1588 // unfortunately, only the focus window is used by XIM, hard to fix 1568 // unfortunately, only the focus window is used by XIM, hard to fix
1589 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1569 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1590 vt_select_input (); 1570 vt_select_input ();
1591#endif 1571#endif
1592 1572
1593 IMSetPosition (); 1573 im_set_position ();
1594 1574
1595 return true; 1575 return true;
1596} 1576}
1597 1577
1598void 1578void
… …
1608 im_destroy (); 1588 im_destroy ();
1609 1589
1610 if (Input_Context) 1590 if (Input_Context)
1611 return; 1591 return;
1612 1592
1613#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1614 if (rs[Rs_imLocale]) 1593 if (rs[Rs_imLocale])
1615 SET_LOCALE (rs[Rs_imLocale]); 1594 SET_LOCALE (rs[Rs_imLocale]);
1616#endif
1617 1595
1618 p = rs[Rs_inputMethod]; 1596 p = rs[Rs_inputMethod];
1619 if (p && *p) 1597 if (p && *p)
1620 { 1598 {
1621 bool found = false; 1599 bool found = false;
1622 1600
1623 s = rxvt_splitcommastring (p); 1601 s = rxvt_strsplit (',', p);
1624 1602
1625 for (i = 0; s[i]; i++) 1603 for (i = 0; s[i]; i++)
1626 { 1604 {
1627 if (*s[i]) 1605 if (*s[i])
1628 { 1606 {
1629 strcpy (buf, "@im="); 1607 strcpy (buf, "@im=");
1630 strncat (buf, s[i], IMBUFSIZ - 5); 1608 strncat (buf, s[i], IMBUFSIZ - 5);
1631 if (IM_get_IC (buf)) 1609 if (im_get_ic (buf))
1632 { 1610 {
1633 found = true; 1611 found = true;
1634 break; 1612 break;
1635 } 1613 }
1636 } 1614 }
1637 } 1615 }
1638 1616
1639 rxvt_freecommastring (s); 1617 rxvt_free_strsplit (s);
1640 1618
1641 if (found) 1619 if (found)
1642 goto done; 1620 goto done;
1643 } 1621 }
1644 1622
1645 /* try with XMODIFIERS env. var. */ 1623 /* try with XMODIFIERS env. var. */
1646 if (IM_get_IC ("")) 1624 if (im_get_ic (""))
1647 goto done; 1625 goto done;
1648 1626
1649 /* try with no modifiers base IF the user didn't specify an IM */ 1627 /* try with no modifiers base IF the user didn't specify an IM */
1650 if (IM_get_IC ("@im=none")) 1628 if (im_get_ic ("@im=none"))
1651 goto done; 1629 goto done;
1652 1630
1653done: 1631done:
1654#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1655 if (rs[Rs_imLocale]) 1632 if (rs[Rs_imLocale])
1656 SET_LOCALE (locale); 1633 SET_LOCALE (locale);
1657#endif
1658} 1634}
1659 1635
1660void 1636void
1661rxvt_term::IMSetPosition () 1637rxvt_term::im_set_position ()
1662{ 1638{
1663 XRectangle preedit_rect, status_rect, *needed_rect; 1639 XRectangle preedit_rect, status_rect, *needed_rect;
1664 XVaNestedList preedit_attr, status_attr; 1640 XVaNestedList preedit_attr, status_attr;
1665 1641
1666 if (!Input_Context 1642 if (!Input_Context
1667 || !focus 1643 || !focus
1668 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1644 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1669 || !IMisRunning ()) 1645 || !im_is_running ())
1670 return; 1646 return;
1671 1647
1672 if (input_style & XIMPreeditPosition) 1648 if (input_style & XIMPreeditPosition)
1673 { 1649 {
1674 im_set_size (preedit_rect); 1650 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1651 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676 1652
1677 XSetICValues (Input_Context, 1653 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL); 1654 XNPreeditAttributes, preedit_attr, NULL);
1679 } 1655 }
1680 else 1656 else
1681 { 1657 {
… …
1698 XFree (status_attr); 1674 XFree (status_attr);
1699 } 1675 }
1700 1676
1701 XFree (preedit_attr); 1677 XFree (preedit_attr);
1702} 1678}
1703#endif /* USE_XIM */ 1679#endif /* USE_XIM */
1680
1681void
1682rxvt_term::get_window_origin (int &x, int &y)
1683{
1684 Window cr;
1685 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1686}
1687
1688#ifdef HAVE_BG_PIXMAP
1689
1690void
1691rxvt_term::update_background ()
1692{
1693 if (update_background_ev.is_active ())
1694 return;
1695
1696 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1697
1698 if (to_wait <= 0.)
1699 bg_render ();
1700 else
1701 update_background_ev.start (to_wait);
1702}
1703
1704void
1705rxvt_term::update_background_cb (ev::timer &w, int revents)
1706{
1707 make_current ();
1708
1709 update_background_ev.stop ();
1710 bg_render ();
1711 refresh_check ();
1712}
1713
1714#endif /* HAVE_BG_PIXMAP */
1704 1715
1705/*----------------------- end-of-file (C source) -----------------------*/ 1716/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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