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.217 by root, Thu Feb 2 18:00:23 2006 UTC vs.
Revision 1.381 by root, Tue Jun 5 12:04:33 2012 UTC

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

Diff Legend

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