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.205 by root, Wed Jan 25 13:24:45 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 dDisp;
222
223 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
224 235
225#ifdef USE_XIM 236#if USE_XIM
226 im_destroy (); 237 im_destroy ();
227#endif 238#endif
228#ifdef XTERM_SCROLLBAR 239 scrollBar.destroy ();
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC);
231#endif
232#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
234#endif
235#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
246#endif
247#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
251#endif
252 if (gc) XFreeGC (disp, gc); 240 if (gc) XFreeGC (dpy, gc);
253 241
254 delete drawable; 242 delete drawable;
255 // destroy all windows 243 // destroy all windows
256 if (parent[0]) 244 if (parent)
257 XDestroyWindow (disp, parent[0]); 245 XDestroyWindow (dpy, parent);
258 }
259 246
260 // TODO: free pixcolours, colours should become part of rxvt_display 247 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 248 if (ISSET_PIXCOLOR (i))
249 {
250 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 251#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 252 pix_colors_unfocused [i].free (this);
264#endif 253#endif
254 }
265 255
256 clear ();
257
258 display->flush (); /* ideally .put should do this */
266 displays.put (display); 259 displays.put (display);
260 }
267 261
268 scr_release (); 262 scr_release ();
269 263
270 /* clear all resources */ 264 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 266 free (allocated [i]);
273 267
274 free (selection.text); 268 free (selection.text);
275 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
276 free (env_display);
277 free (env_term);
278 free (locale); 270 free (locale);
279 free (v_buffer); 271 free (v_buffer);
280 free (incr_buf); 272
273 delete selection_req;
281 274
282 delete envv; 275 delete envv;
283 delete argv; 276 delete argv;
284 277
285#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
286 delete keyboard; 279 delete keyboard;
287#endif 280#endif
281#ifndef NO_RESOURCES
282 XrmDestroyDatabase (option_db);
283#endif
288} 284}
289 285
290// child has exited, usually destroys 286// child has exited, usually destroys
291void 287void
292rxvt_term::child_cb (child_watcher &w, int status) 288rxvt_term::child_cb (ev::child &w, int status)
293{ 289{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 290 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 291
296 cmd_pid = 0; 292 cmd_pid = 0;
297 293
298 if (!OPTION (Opt_hold)) 294 if (!option (Opt_hold))
299 destroy (); 295 destroy ();
300} 296}
301 297
302void 298void
303rxvt_term::destroy () 299rxvt_term::destroy ()
304{ 300{
305 if (destroy_ev.active) 301 if (destroy_ev.is_active ())
306 return; 302 return;
307 303
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 304 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309 305
310#if ENABLE_OVERLAY 306#if ENABLE_OVERLAY
314 if (display) 310 if (display)
315 { 311 {
316#if USE_XIM 312#if USE_XIM
317 im_ev.stop (display); 313 im_ev.stop (display);
318#endif 314#endif
319#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
321#endif 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
322#if TRANSPARENT
323 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
324#endif 318#endif
325 incr_ev.stop ();
326 termwin_ev.stop (display); 319 termwin_ev.stop (display);
327 vt_ev.stop (display); 320 vt_ev.stop (display);
328 } 321 }
329 322
330 check_ev.stop (); 323 flush_ev.stop ();
331 pty_ev.stop (); 324 pty_ev.stop ();
332#ifdef CURSOR_BLINK 325#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 326 cursor_blink_ev.stop ();
334#endif 327#endif
335#ifdef TEXT_BLINK 328#ifdef TEXT_BLINK
343#endif 336#endif
344#ifdef POINTER_BLANK 337#ifdef POINTER_BLANK
345 pointer_ev.stop (); 338 pointer_ev.stop ();
346#endif 339#endif
347 340
348 destroy_ev.start (0); 341 destroy_ev.start ();
349} 342}
350 343
351void 344void
352rxvt_term::destroy_cb (time_watcher &w) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 346{
354 make_current (); 347 make_current ();
355 348
356 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);
357} 362}
358 363
359/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
360/* 365/*
361 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
362 * TODO: if debugging, this should free up any known resources if we can
363 */ 367 */
364static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
365 369
366static void 370static void
367rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
368{ 372{
369 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++)
370 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
371} 375}
372 376
373#if ENABLE_FRILLS 377#if !ENABLE_MINIMAL
374static void 378static void ecb_cold
375print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
376{ 380{
377 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
379 char number[32]; 383 char number[32];
380 char *mtype = "XlibMessage"; 384
381 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
382 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
383 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);
384 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
385 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
386 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
387 sprintf(number, "%d", event->request_code); 396
388 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
389 rxvt_warn ("(which is %s)\n", buffer);
390 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
391 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 {
392 mesg, BUFSIZ); 399#if 0
393 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);
394 } 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
395 if ((event->error_code == BadWindow) || 451 if (event->error_code == BadWindow
396 (event->error_code == BadPixmap) || 452 || event->error_code == BadPixmap
397 (event->error_code == BadCursor) || 453 || event->error_code == BadCursor
398 (event->error_code == BadFont) || 454 || event->error_code == BadFont
399 (event->error_code == BadDrawable) || 455 || event->error_code == BadDrawable
400 (event->error_code == BadColor) || 456 || event->error_code == BadColor
401 (event->error_code == BadGC) || 457 || event->error_code == BadGC
402 (event->error_code == BadIDChoice) || 458 || event->error_code == BadIDChoice
403 (event->error_code == BadValue) || 459 || event->error_code == BadValue
404 (event->error_code == BadAtom)) { 460 || event->error_code == BadAtom)
461 {
405 if (event->error_code == BadValue) 462 if (event->error_code == BadValue)
406 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 463 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
407 mesg, BUFSIZ);
408 else if (event->error_code == BadAtom) 464 else if (event->error_code == BadAtom)
409 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
410 mesg, BUFSIZ); 466 else
411 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 467 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
413 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419}
420#endif
421 468
422int 469 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
470 }
471}
472#endif
473
474int ecb_cold
423rxvt_xerror_handler (Display *display, XErrorEvent *event) 475rxvt_xerror_handler (Display *display, XErrorEvent *event)
424{ 476{
425 if (GET_R->allowedxerror == -1) 477 if (GET_R->allowedxerror == -1)
426 GET_R->allowedxerror = event->error_code; 478 GET_R->allowedxerror = event->error_code;
427 else 479 else
428 { 480 {
429 // GET_R is most likely not the terminal which caused the error, 481 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 482 // so just output the error and continue
431#if ENABLE_FRILLS 483#if ENABLE_MINIMAL
484 old_xerror_handler (display, event);
485#else
432 print_x_error (display, event); 486 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 487#endif
436 } 488 }
437 489
438 return 0; 490 return 0;
439} 491}
440 492
441int 493int ecb_cold
442rxvt_xioerror_handler (Display *display) 494rxvt_xioerror_handler (Display *display)
443{ 495{
444 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",
445 DisplayString (display)); 497 DisplayString (display));
446 rxvt_emergency_cleanup (); 498 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 499 _exit (EXIT_FAILURE);
448} 500}
449 501
450/*----------------------------------------------------------------------*/
451bool
452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{
454 this->envv = envv;
455
456 SET_R (this);
457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
459
460 if (!init_vars ())
461 return false;
462
463 init_secondary ();
464
465 const char **cmd_argv = init_resources (argc, argv);
466
467#ifdef KEYSYM_RESOURCE
468 keyboard->register_done ();
469#endif
470
471#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */
474#endif
475
476 pty = ptytty::create ();
477
478 create_windows (argc, argv);
479
480 dDisp;
481
482 init_xlocale ();
483
484 scr_reset (); // initialize screen
485
486#if 0
487 XSynchronize (disp, True);
488#endif
489
490#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */
493#endif
494#ifdef TRANSPARENT
495 if (OPTION (Opt_transparent))
496 {
497 XSelectInput (disp, display->root, PropertyChangeMask);
498 check_our_parents ();
499 rootwin_ev.start (display, display->root);
500 }
501#endif
502
503 set_colorfgbg ();
504
505 init_command (cmd_argv);
506
507 free (cmd_argv);
508
509 if (pty->pty >= 0)
510 pty_ev.start (pty->pty, EVENT_READ);
511
512 check_ev.start ();
513
514 HOOK_INVOKE ((this, HOOK_START, DT_END));
515
516#if ENABLE_XEMBED
517 if (rs[Rs_embed])
518 {
519 long info[2] = { 0, XEMBED_MAPPED };
520
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2);
523 }
524#endif
525
526 XMapWindow (disp, vt);
527 XMapWindow (disp, parent[0]);
528
529 return true;
530}
531
532static struct sig_handlers 502static struct sig_handlers
533{ 503{
534 sig_watcher sw_term, sw_int; 504 ev::sig sw_term, sw_int;
535 505
536 /* 506 /*
537 * Catch a fatal signal and tidy up before quitting 507 * Catch a fatal signal and tidy up before quitting
538 */ 508 */
539 void 509 void sig_term (ev::sig &w, int revents);
540 sig_term (sig_watcher &w) 510
511 sig_handlers ()
541 { 512 {
542 rxvt_emergency_cleanup (); 513 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
543 signal (w.signum, SIG_DFL);
544 kill (getpid (), w.signum);
545 }
546
547 sig_handlers ()
548 : sw_term (this, &sig_handlers::sig_term),
549 sw_int (this, &sig_handlers::sig_term) 514 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
550 {
551 } 515 }
552} sig_handlers; 516} sig_handlers;
553 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
554char **rxvt_environ; // startup environment 593char **rxvt_environ; // startup environment
555 594
556void 595void
557rxvt_init () 596rxvt_init ()
558{ 597{
559 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");
560 609
561 rxvt_environ = environ; 610 rxvt_environ = environ;
562 611
563 signal (SIGHUP, SIG_IGN); 612 signal (SIGHUP, SIG_IGN);
564 signal (SIGPIPE, SIG_IGN); 613 signal (SIGPIPE, SIG_IGN);
565 614
566 sig_handlers.sw_term.start (SIGTERM); 615 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
567 sig_handlers.sw_int.start (SIGINT); 616 sig_handlers.sw_int.start (SIGINT); ev_unref ();
568
569 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
570 /* signal (SIGURG, SIG_DFL); */
571 617
572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
573 // TODO: handle this with exceptions and tolerate the memory loss 619 // TODO: handle this with exceptions and tolerate the memory loss
574 XSetIOErrorHandler (rxvt_xioerror_handler); 620 XSetIOErrorHandler (rxvt_xioerror_handler);
575 621
576 XrmInitialize (); 622 XrmInitialize ();
577}
578 623
579/* ------------------------------------------------------------------------- * 624#if HAVE_PIXBUF
580 * MEMORY ALLOCATION WRAPPERS * 625 g_type_init ();
581 * ------------------------------------------------------------------------- */ 626#endif
582void *
583rxvt_malloc (size_t size)
584{
585 void *p = malloc (size);
586
587 if (!p)
588 rxvt_fatal ("memory allocation failure. aborting.\n");
589
590 return p;
591}
592
593void *
594rxvt_calloc (size_t number, size_t size)
595{
596 void *p = calloc (number, size);
597
598 if (!p)
599 rxvt_fatal ("memory allocation failure. aborting.\n");
600
601 return p;
602}
603
604void *
605rxvt_realloc (void *ptr, size_t size)
606{
607 void *p = realloc (ptr, size);
608
609 if (!p)
610 rxvt_fatal ("memory allocation failure. aborting.\n");
611
612 return p;
613} 627}
614 628
615/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
616/* 630/*
617 * window size/position calculcations for XSizeHint and other storage. 631 * window size/position calculations for XSizeHint and other storage.
618 * if width/height are non-zero then override calculated width/height 632 * if width/height are non-zero then override calculated width/height
619 */ 633 */
620void 634void
621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 635rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
622{ 636{
623 short recalc_x, recalc_y; 637 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 638 int x, y, flags;
625 unsigned int w, h; 639 unsigned int w, h;
626 unsigned int max_width, max_height; 640 unsigned int max_width, max_height;
627 dDisp;
628 641
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 642 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 643 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 644 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 645
640 if (rs[Rs_geometry]) 653 if (rs[Rs_geometry])
641 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 654 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
642 655
643 if (flags & WidthValue) 656 if (flags & WidthValue)
644 { 657 {
658 if (!w)
659 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
660
645 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 661 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
646 szHint.flags |= USSize; 662 szHint.flags |= USSize;
647 } 663 }
648 664
649 if (flags & HeightValue) 665 if (flags & HeightValue)
650 { 666 {
667 if (!h)
668 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
669
651 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 670 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
652 szHint.flags |= USSize; 671 szHint.flags |= USSize;
653 } 672 }
654 673
655 if (flags & XValue) 674 if (flags & XValue)
656 { 675 {
687 max_width = MAX_COLS * fwidth; 706 max_width = MAX_COLS * fwidth;
688 max_height = MAX_ROWS * fheight; 707 max_height = MAX_ROWS * fheight;
689 708
690 szHint.base_width = szHint.base_height = 2 * int_bwidth; 709 szHint.base_width = szHint.base_height = 2 * int_bwidth;
691 710
692 sb_w = 0;
693 window_vt_x = window_vt_y = int_bwidth; 711 window_vt_x = window_vt_y = int_bwidth;
694 712
695 if (scrollBar.state) 713 if (scrollBar.state)
696 { 714 {
697 sb_w = scrollbar_TotalWidth (); 715 int sb_w = scrollBar.total_width ();
698 szHint.base_width += sb_w; 716 szHint.base_width += sb_w;
717
699 if (!OPTION (Opt_scrollBar_right)) 718 if (!option (Opt_scrollBar_right))
700 window_vt_x += sb_w; 719 window_vt_x += sb_w;
701 } 720 }
702 721
703 szHint.width_inc = fwidth; 722 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 723 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 724 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 725 szHint.min_height = szHint.base_height + szHint.height_inc;
707 726
708 if (newwidth && newwidth - szHint.base_width < max_width) 727 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 728 {
710 szHint.width = newwidth; 729 szHint.width = newwidth;
725 { 744 {
726 min_it (height, max_height); 745 min_it (height, max_height);
727 szHint.height = szHint.base_height + height; 746 szHint.height = szHint.base_height + height;
728 } 747 }
729 748
730 if (scrollBar.state && OPTION (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w;
732
733 if (recalc_x) 749 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 750 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
751
735 if (recalc_y) 752 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 753 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 754
738 ncol = width / fwidth; 755 ncol = width / fwidth;
739 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;
740} 766}
741 767
742/*----------------------------------------------------------------------*/ 768/*----------------------------------------------------------------------*/
743/* 769/*
744 * Tell the teletype handler what size the window is. 770 * Tell the teletype handler what size the window is.
752 778
753 struct winsize ws; 779 struct winsize ws;
754 780
755 ws.ws_col = ncol; 781 ws.ws_col = ncol;
756 ws.ws_row = nrow; 782 ws.ws_row = nrow;
757 ws.ws_xpixel = width; 783 ws.ws_xpixel = vt_width;
758 ws.ws_ypixel = height; 784 ws.ws_ypixel = vt_height;
759 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 785 ioctl (pty->pty, TIOCSWINSZ, &ws);
760 786
761#if 0 787#if 0
762 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 788 // TIOCSWINSZ is supposed to do this automatically and correctly
763 if (cmd_pid) /* force through to the command */ 789 if (cmd_pid) /* force through to the command */
764 kill (-cmd_pid, SIGWINCH); 790 kill (-cmd_pid, SIGWINCH);
765#endif 791#endif
766} 792}
767 793
768/*----------------------------------------------------------------------*/ 794/*----------------------------------------------------------------------*/
769/* set_fonts () - load and set the various fonts 795/* load and set the various fonts */
770 *
771 * init = 1 - initialize
772 *
773 * fontname == FONT_UP - switch to bigger font
774 * fontname == FONT_DN - switch to smaller font
775 */
776bool 796bool
777rxvt_term::set_fonts () 797rxvt_term::set_fonts ()
778{ 798{
779 rxvt_fontset *fs = new rxvt_fontset (this); 799 rxvt_fontset *fs = new rxvt_fontset (this);
780 rxvt_fontprop prop; 800 rxvt_fontprop prop;
794#endif 814#endif
795 815
796 delete fontset[0]; 816 delete fontset[0];
797 fontset[0] = fs; 817 fontset[0] = fs;
798 818
799 prop = (*fs)[1]->properties (); 819 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
800 prop.height += lineSpace; 820 prop.width += letterSpace;
821
801 fs->set_prop (prop); 822 fs->set_prop (prop, false);
802 823
803 fwidth = prop.width; 824 fwidth = prop.width;
804 fheight = prop.height; 825 fheight = prop.height + lineSpace;
805 fbase = prop.ascent; 826 fbase = prop.ascent;
806 827
807 for (int style = 1; style < 4; style++) 828 for (int style = 1; style < 4; style++)
808 { 829 {
809#if ENABLE_STYLES 830#if ENABLE_STYLES
815 { 836 {
816 fontset[style] = fs = new rxvt_fontset (this); 837 fontset[style] = fs = new rxvt_fontset (this);
817 rxvt_fontprop prop2 = prop; 838 rxvt_fontprop prop2 = prop;
818 839
819 if (res) 840 if (res)
820 prop2.weight = prop2.slant = rxvt_fontprop::unset; 841 {
842 fs->populate (res);
843 fs->set_prop (prop2, false);
844 }
821 else 845 else
822 { 846 {
823 res = fontset[0]->fontdesc; 847 fs->populate (fontset[0]->fontdesc);
824 848
825 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;
826 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);
827 } 853 }
828 854
829 fs->populate (res);
830 fs->set_prop (prop2);
831 } 855 }
832#else 856#else
833 fontset[style] = fontset[0]; 857 fontset[style] = fontset[0];
834#endif 858#endif
835 } 859 }
836 860
837 if (parent[0]) 861 if (parent)
838 { 862 {
839 resize_all_windows (0, 0, 0); 863 resize_all_windows (0, 0, 0);
840 scr_remap_chars (); 864 scr_remap_chars ();
841 scr_touch (true); 865 scr_touch (true);
842 } 866 }
843 867
844 return true; 868 return true;
845} 869}
846 870
871void
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 872rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 873{
849 XChangeProperty (display->display, parent[0], 874 XChangeProperty (dpy, parent,
850 prop, XA_STRING, 8, PropModeReplace, 875 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 876 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 877}
853 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
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 892rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 893{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 894 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 895 char *s = rxvt_wcstoutf8 (ws);
858 896
859 XChangeProperty (display->display, parent[0], 897 XChangeProperty (dpy, parent,
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 898 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 899 (const unsigned char *)s, strlen (s));
862 900
863 free (s); 901 free (s);
864 free (ws); 902 free (ws);
868/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
869/* xterm sequences - title, iconName, color (exptl) */ 907/* xterm sequences - title, iconName, color (exptl) */
870void 908void
871rxvt_term::set_title (const char *str) 909rxvt_term::set_title (const char *str)
872{ 910{
873 set_string_property (XA_WM_NAME, str); 911 set_mbstring_property (XA_WM_NAME, str);
874#if ENABLE_EWMH 912#if ENABLE_EWMH
875 set_utf8_property (xa[XA_NET_WM_NAME], str); 913 set_utf8_property (xa[XA_NET_WM_NAME], str);
876#endif 914#endif
877} 915}
878 916
879void 917void
880rxvt_term::set_icon_name (const char *str) 918rxvt_term::set_icon_name (const char *str)
881{ 919{
882 set_string_property (XA_WM_ICON_NAME, str); 920 set_mbstring_property (XA_WM_ICON_NAME, str);
883#if ENABLE_EWMH 921#if ENABLE_EWMH
884 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 922 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
885#endif 923#endif
886} 924}
887 925
926void
927rxvt_term::set_window_color (int idx, const char *color)
928{
888#ifdef XTERM_COLOR_CHANGE 929#ifdef XTERM_COLOR_CHANGE
889void
890rxvt_term::set_window_color (int idx, const char *color)
891{
892 rxvt_color xcol; 930 rxvt_color xcol;
893 int i;
894 931
895 if (color == NULL || *color == '\0') 932 if (color == NULL || *color == '\0')
896 return; 933 return;
897 934
935 color = strdup (color);
936 allocated.push_back ((void *)color);
937 rs[Rs_color + idx] = color;
938
898 /* handle color aliases */ 939 /* handle color aliases */
899 if (isdigit (*color)) 940 if (isdigit (*color))
900 { 941 {
901 i = atoi (color); 942 int i = atoi (color);
902 943
903 if (i >= 8 && i <= 15) 944 if (i >= 8 && i <= 15)
945 {
904 { /* bright colors */ 946 /* bright colors */
905 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 947 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
907 SET_PIXCOLOR (idx);
908 goto done; 948 goto done;
909 } 949 }
910 950
911 if (i >= 0 && i <= 7) 951 if (i >= 0 && i <= 7)
952 {
912 { /* normal colors */ 953 /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 954 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 955 goto done;
916 } 956 }
917 } 957 }
918 958
919 if (!rXParseAllocColor (&xcol, color)) 959 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 960
924 /* 961 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 962 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 963 * so just keep gobbling up the colormap
927 */ 964 */
928# if 0
929 for (i = Color_Black; i <= Color_White; i++)
930 if (pix_colors[idx] == pix_colors[i])
931 break;
932 if (i > Color_White)
933 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen));
937 }
938# endif
939 965
940 pix_colors_focused[idx] = xcol; 966 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 967
943 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */
945done: 968done:
946
947#if OFF_FOCUS_FADING
948 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950#endif
951
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 969 /*TODO: handle Color_BD, scrollbar background, etc. */
953 970
971 update_fade_color (idx);
954 recolour_cursor (); 972 recolour_cursor ();
955 scr_recolour (); 973 scr_recolour ();
974#endif /* XTERM_COLOR_CHANGE */
956} 975}
957
958#else
959# define set_window_color (idx,color) ((void)0)
960#endif /* XTERM_COLOR_CHANGE */
961 976
962void 977void
963rxvt_term::recolour_cursor () 978rxvt_term::recolour_cursor ()
964{ 979{
965 XColor xcol[2]; 980 XColor fg, bg;
966 981
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 982 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 983 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 984 : pix_colors_focused[Color_fg]).get (fg);
985
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 986 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 987 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 988 : pix_colors_focused[Color_bg]).get (bg);
973 989
974 XQueryColors (display->display, display->cmap, xcol, 2); 990 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 991}
977 992
978/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
979/* 994/*
980 * 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
981 */ 996 */
982void 997char *
983rxvt_term::set_colorfgbg () 998rxvt_term::get_colorfgbg ()
984{ 999{
985 unsigned int i; 1000 unsigned int i;
986 const char *xpmb = "\0"; 1001 const char *xpmb = "";
987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1002 char fstr[] = "default";
1003 char bstr[] = "default";
1004 char *env_colorfgbg;
988 1005
989 strcpy (fstr, "default");
990 strcpy (bstr, "default");
991 for (i = Color_Black; i <= Color_White; i++) 1006 for (i = Color_Black; i <= Color_White; i++)
992 if (pix_colors[Color_fg] == pix_colors[i]) 1007 if (pix_colors[Color_fg] == pix_colors[i])
993 { 1008 {
994 sprintf (fstr, "%d", (i - Color_Black)); 1009 sprintf (fstr, "%d", i - Color_Black);
995 break; 1010 break;
996 } 1011 }
997 1012
998 for (i = Color_Black; i <= Color_White; i++) 1013 for (i = Color_Black; i <= Color_White; i++)
999 if (pix_colors[Color_bg] == pix_colors[i]) 1014 if (pix_colors[Color_bg] == pix_colors[i])
1000 { 1015 {
1001 sprintf (bstr, "%d", (i - Color_Black)); 1016 sprintf (bstr, "%d", i - Color_Black);
1002#ifdef XPM_BACKGROUND 1017#if BG_IMAGE_FROM_FILE
1003 xpmb = "default;"; 1018 xpmb = "default;";
1004#endif 1019#endif
1005 break; 1020 break;
1006 } 1021 }
1007 1022
1023 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1008 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;
1009} 1026}
1010 1027
1011/*----------------------------------------------------------------------*/ 1028/*----------------------------------------------------------------------*/
1012 1029
1013int 1030bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1031rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 1032{
1016 if (!screen_in_out->set (display, colour)) 1033 if (color.set (this, name))
1017 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false;
1020 }
1021
1022 return true; 1034 return true;
1035
1036 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1037 return false;
1038}
1039
1040void
1041rxvt_term::alias_color (int dst, int src)
1042{
1043 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 1044}
1024 1045
1025/* -------------------------------------------------------------------- * 1046/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1047 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1048 * -------------------------------------------------------------------- */
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1050rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 1051{
1031 int fix_screen; 1052 int fix_screen;
1032 int old_width = szHint.width; 1053 int old_width = szHint.width;
1033 int old_height = szHint.height; 1054 int old_height = szHint.height;
1034 dDisp;
1035 1055
1036 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);
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1064 XSetWMNormalHints (dpy, parent, &szHint);
1065 szHint.flags |= PBaseSize | PResizeInc;
1066 }
1038 1067
1039 if (!ignoreparent) 1068 if (!ignoreparent)
1040 { 1069 {
1041#ifdef SMART_RESIZE 1070#ifdef SMART_RESIZE
1042 /* 1071 /*
1046 int x, y, x1, y1; 1075 int x, y, x1, y1;
1047 int dx, dy; 1076 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1077 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1078 Window unused_cr;
1050 1079
1051 XTranslateCoordinates (disp, parent[0], display->root, 1080 XTranslateCoordinates (dpy, parent, display->root,
1052 0, 0, &x, &y, &unused_cr); 1081 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1082 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1083 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1084 /*
1056 * 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
1057 * our position for handles and decorations. Counter it 1086 * our position for handles and decorations. Counter it
1058 */ 1087 */
1060 { 1089 {
1061 x -= x1; 1090 x -= x1;
1062 y -= y1; 1091 y -= y1;
1063 } 1092 }
1064 1093
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1094 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1095 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1096 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1097 dy = old_height - szHint.height;
1069 1098
1070 /* Check position of the center of the window */ 1099 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1100 if (x < x1) /* left half */
1075 if (y < y1) /* top half */ 1104 if (y < y1) /* top half */
1076 dy = 0; 1105 dy = 0;
1077 else if (y == y1) /* exact center */ 1106 else if (y == y1) /* exact center */
1078 dy /= 2; 1107 dy /= 2;
1079 1108
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1109 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1081 szHint.width, szHint.height); 1110 szHint.width, szHint.height);
1082#else 1111#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1112 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1084#endif 1113#endif
1085 } 1114 }
1115
1116 if (set_hint)
1117 XSetWMNormalHints (dpy, parent, &szHint);
1086 1118
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1120
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1121 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1122 {
1091 if (scrollBar.state) 1123 if (scrollBar.state)
1092 { 1124 scrollBar.resize ();
1093 XMoveResizeWindow (disp, scrollBar.win,
1094 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar ();
1097 }
1098 1125
1099 XMoveResizeWindow (disp, vt, 1126 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1127 window_vt_x, window_vt_y,
1101 width, height); 1128 vt_width, vt_height);
1102 1129
1103 scr_clear (); 1130 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1104#ifdef XPM_BACKGROUND 1131
1105 resize_pixmap (); 1132#ifdef HAVE_BG_PIXMAP
1133 if (bg_window_size_sensitive ())
1134 update_background ();
1106#endif 1135#endif
1107 } 1136 }
1108 1137
1109 if (fix_screen || old_height == 0) 1138 if (fix_screen || old_height == 0)
1110 scr_reset (); 1139 scr_reset ();
1111 1140
1112#ifdef XPM_BACKGROUND
1113 if (pixmap)
1114 scr_touch (false);
1115#endif
1116
1117#ifdef USE_XIM 1141#if USE_XIM
1118 IMSetStatusPosition (); 1142 im_set_position ();
1119#endif 1143#endif
1120} 1144}
1121 1145
1122/* 1146/*
1123 * 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.
1128{ 1152{
1129 XWindowAttributes wattr; 1153 XWindowAttributes wattr;
1130 1154
1131 if (newwidth == 0 || newheight == 0) 1155 if (newwidth == 0 || newheight == 0)
1132 { 1156 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1157 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1158
1135 if (newwidth == 0) 1159 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1160 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1161 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1162 newheight = wattr.height - szHint.base_height;
1139 } 1163 }
1140 1164
1141 if (newwidth != width || newheight != height) 1165 if (newwidth != vt_width || newheight != vt_height)
1142 { 1166 {
1143 newwidth += szHint.base_width; 1167 newwidth += szHint.base_width;
1144 newheight += szHint.base_height; 1168 newheight += szHint.base_height;
1145 resize_all_windows (newwidth, newheight, 0); 1169 resize_all_windows (newwidth, newheight, 0);
1146 } 1170 }
1147} 1171}
1148 1172
1149/* -------------------------------------------------------------------- * 1173/* -------------------------------------------------------------------- *
1150 * - X INPUT METHOD ROUTINES - * 1174 * - X INPUT METHOD ROUTINES - *
1151 * -------------------------------------------------------------------- */ 1175 * -------------------------------------------------------------------- */
1152#ifdef USE_XIM 1176#if USE_XIM
1153 1177
1154void 1178void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1179rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1180{
1157 fg = pix_colors[Color_fg]; 1181 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1182 bg = pix_colors [Color_bg];
1159} 1183}
1160 1184
1161void 1185void
1162rxvt_term::im_set_size (XRectangle &size) 1186rxvt_term::im_set_size (XRectangle &size)
1163{ 1187{
1184 status_rect.height = fheight; 1208 status_rect.height = fheight;
1185} 1209}
1186 1210
1187/* Checking whether input method is running. */ 1211/* Checking whether input method is running. */
1188bool 1212bool
1189rxvt_term::IMisRunning () 1213rxvt_term::im_is_running ()
1190{ 1214{
1191 char *p;
1192 Atom atom; 1215 Atom atom;
1193 Window win; 1216 Window win;
1194 char server[IMBUFSIZ]; 1217 char server[IMBUFSIZ];
1195 1218
1196 /* get current locale modifier */ 1219 /* get current locale modifier */
1197 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1220 if (char *p = XSetLocaleModifiers (0))
1198 { 1221 {
1199 strcpy (server, "@server="); 1222 strcpy (server, "@server=");
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1223 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1201 1224
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1225 if (p = strchr (server + 1, '@')) /* first one only */
1203 *p = '\0'; 1226 *p = '\0';
1204 1227
1205 atom = XInternAtom (display->display, server, False); 1228 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1229 win = XGetSelectionOwner (dpy, atom);
1207 1230
1208 if (win != None) 1231 if (win != None)
1209 return True; 1232 return true;
1210 } 1233 }
1211 1234
1212 return False; 1235 return false;
1213} 1236}
1214 1237
1215void 1238void
1216rxvt_term::IMSendSpot () 1239rxvt_term::im_send_spot ()
1217{ 1240{
1218 XPoint nspot; 1241 XPoint nspot;
1219 XVaNestedList preedit_attr; 1242 XVaNestedList preedit_attr;
1220 1243
1221 if (!Input_Context 1244 if (!Input_Context
1274 1297
1275 term->make_current (); 1298 term->make_current ();
1276 1299
1277 if (text) 1300 if (text)
1278 { 1301 {
1279 void *str; 1302 wchar_t *str;
1280 1303
1281 if (!text->encoding_is_wchar && text->string.multi_byte) 1304 if (!text->encoding_is_wchar && text->string.multi_byte)
1282 { 1305 {
1283 // of course, X makes it ugly again 1306 // of course, X makes it ugly again
1284 if (term->rs[Rs_imLocale]) 1307 if (term->rs[Rs_imLocale])
1285 SET_LOCALE (term->rs[Rs_imLocale]); 1308 SET_LOCALE (term->rs[Rs_imLocale]);
1286 1309
1287 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1310 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1288 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1311 mbstowcs (str, text->string.multi_byte, text->length + 1);
1289 1312
1290 if (term->rs[Rs_imLocale]) 1313 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->locale); 1314 SET_LOCALE (term->locale);
1292 } 1315 }
1293 else 1316 else
1294 str = (void *)text->string.wide_char; 1317 str = text->string.wide_char;
1295 1318
1296 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1319 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1297 DT_INT, call_data->caret, 1320 DT_INT, call_data->caret,
1298 DT_INT, call_data->chg_first, 1321 DT_INT, call_data->chg_first,
1299 DT_INT, call_data->chg_length, 1322 DT_INT, call_data->chg_length,
1300 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,
1327/* 1350/*
1328 * 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
1329 * open a suitable preedit type 1352 * open a suitable preedit type
1330 */ 1353 */
1331bool 1354bool
1332rxvt_term::IM_get_IC (const char *modifiers) 1355rxvt_term::im_get_ic (const char *modifiers)
1333{ 1356{
1334 int i, j, found; 1357 int i, j, found;
1335 XIM xim; 1358 XIM xim;
1336 XPoint spot; 1359 XPoint spot;
1337 XRectangle rect, status_rect, needed_rect; 1360 XRectangle rect, status_rect, needed_rect;
1338 unsigned long fg, bg; 1361 unsigned long fg, bg;
1339 const char *p; 1362 const char *p;
1340 char **s; 1363 char **s;
1341 XIMStyles *xim_styles; 1364 XIMStyles *xim_styles;
1342#ifdef ENABLE_XIM_ONTHESPOT
1343 XIMCallback xcb[4];
1344#endif
1345 1365
1346 set_environ (envv); 1366 set_environ (envv);
1347 1367
1348 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1368 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1349 return false; 1369 return false;
1370 p = pet[pi]; 1390 p = pet[pi];
1371 1391
1372 if (!p) 1392 if (!p)
1373 continue; 1393 continue;
1374 1394
1375 s = rxvt_splitcommastring (p); 1395 s = rxvt_strsplit (',', p);
1376 1396
1377 for (i = found = 0; !found && s[i]; i++) 1397 for (i = found = 0; !found && s[i]; i++)
1378 { 1398 {
1379 if (!strcmp (s[i], "OverTheSpot")) 1399 if (!strcmp (s[i], "OverTheSpot"))
1380 input_style = XIMPreeditPosition | XIMStatusNothing; 1400 input_style = XIMPreeditPosition | XIMStatusNothing;
1392 input_style = XIMPreeditNothing | XIMStatusNothing; 1412 input_style = XIMPreeditNothing | XIMStatusNothing;
1393 1413
1394 for (j = 0; j < xim_styles->count_styles; j++) 1414 for (j = 0; j < xim_styles->count_styles; j++)
1395 if (input_style == xim_styles->supported_styles[j]) 1415 if (input_style == xim_styles->supported_styles[j])
1396 { 1416 {
1397 rxvt_freecommastring (s); 1417 rxvt_free_strsplit (s);
1398 1418
1399 found = 1; 1419 found = 1;
1400 goto foundpet; 1420 goto foundpet;
1401 } 1421 }
1402 1422
1403 } 1423 }
1404 1424
1405 rxvt_freecommastring (s); 1425 rxvt_free_strsplit (s);
1406 } 1426 }
1407 1427
1408foundpet: 1428foundpet:
1409 1429
1410 XFree (xim_styles); 1430 XFree (xim_styles);
1435 "*", 1455 "*",
1436 fheight, 1456 fheight,
1437 fheight + 1, fheight - 1, 1457 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1458 fheight - 2, fheight + 2);
1439 1459
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1460 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1461 &missing_charset_list, &missing_charset_count, &def_string);
1442 1462
1443 if (missing_charset_list) 1463 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1464 XFreeStringList (missing_charset_list);
1445 1465
1489 NULL); 1509 NULL);
1490 } 1510 }
1491#if ENABLE_XIM_ONTHESPOT 1511#if ENABLE_XIM_ONTHESPOT
1492 else if (input_style & XIMPreeditCallbacks) 1512 else if (input_style & XIMPreeditCallbacks)
1493 { 1513 {
1514 XIMCallback xcb[4];
1515
1494 im_set_position (spot); 1516 im_set_position (spot);
1495 1517
1496 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;
1497 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;
1498 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;
1513#endif 1535#endif
1514 1536
1515 Input_Context = XCreateIC (xim, 1537 Input_Context = XCreateIC (xim,
1516 XNInputStyle, input_style, 1538 XNInputStyle, input_style,
1517 XNClientWindow, vt, 1539 XNClientWindow, vt,
1518 XNFocusWindow, parent[0], 1540 XNFocusWindow, parent,
1519 preedit_attr ? XNPreeditAttributes : NULL, 1541 preedit_attr ? XNPreeditAttributes : NULL,
1520 preedit_attr, 1542 preedit_attr,
1521 status_attr ? XNStatusAttributes : NULL, 1543 status_attr ? XNStatusAttributes : NULL,
1522 status_attr, NULL); 1544 status_attr, NULL);
1523 1545
1524 if (preedit_attr) XFree (preedit_attr); 1546 if (preedit_attr) XFree (preedit_attr);
1525 if (status_attr) XFree (status_attr); 1547 if (status_attr) XFree (status_attr);
1526 if (fs) XFreeFontSet (display->display, fs); 1548 if (fs) XFreeFontSet (dpy, fs);
1527 1549
1528 if (Input_Context == NULL) 1550 if (Input_Context == NULL)
1529 { 1551 {
1530 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1552 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1531 im_destroy (); 1553 im_destroy ();
1536 // 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
1537 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1559 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1538 vt_select_input (); 1560 vt_select_input ();
1539#endif 1561#endif
1540 1562
1541 if (input_style & XIMPreeditArea) 1563 im_set_position ();
1542 IMSetStatusPosition ();
1543 1564
1544 return true; 1565 return true;
1545} 1566}
1546 1567
1547void 1568void
1557 im_destroy (); 1578 im_destroy ();
1558 1579
1559 if (Input_Context) 1580 if (Input_Context)
1560 return; 1581 return;
1561 1582
1562#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1563 if (rs[Rs_imLocale]) 1583 if (rs[Rs_imLocale])
1564 SET_LOCALE (rs[Rs_imLocale]); 1584 SET_LOCALE (rs[Rs_imLocale]);
1565#endif
1566 1585
1567 p = rs[Rs_inputMethod]; 1586 p = rs[Rs_inputMethod];
1568 if (p && *p) 1587 if (p && *p)
1569 { 1588 {
1570 bool found = false; 1589 bool found = false;
1571 1590
1572 s = rxvt_splitcommastring (p); 1591 s = rxvt_strsplit (',', p);
1573 1592
1574 for (i = 0; s[i]; i++) 1593 for (i = 0; s[i]; i++)
1575 { 1594 {
1576 if (*s[i]) 1595 if (*s[i])
1577 { 1596 {
1578 strcpy (buf, "@im="); 1597 strcpy (buf, "@im=");
1579 strncat (buf, s[i], IMBUFSIZ - 5); 1598 strncat (buf, s[i], IMBUFSIZ - 5);
1580 if (IM_get_IC (buf)) 1599 if (im_get_ic (buf))
1581 { 1600 {
1582 found = true; 1601 found = true;
1583 break; 1602 break;
1584 } 1603 }
1585 } 1604 }
1586 } 1605 }
1587 1606
1588 rxvt_freecommastring (s); 1607 rxvt_free_strsplit (s);
1589 1608
1590 if (found) 1609 if (found)
1591 goto done; 1610 goto done;
1592 } 1611 }
1593 1612
1594 /* try with XMODIFIERS env. var. */ 1613 /* try with XMODIFIERS env. var. */
1595 if (IM_get_IC ("")) 1614 if (im_get_ic (""))
1596 goto done; 1615 goto done;
1597 1616
1598 /* 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 */
1599 if (IM_get_IC ("@im=none")) 1618 if (im_get_ic ("@im=none"))
1600 goto done; 1619 goto done;
1601 1620
1602done: 1621done:
1603#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1604 if (rs[Rs_imLocale]) 1622 if (rs[Rs_imLocale])
1605 SET_LOCALE (locale); 1623 SET_LOCALE (locale);
1606#endif
1607} 1624}
1608 1625
1609void 1626void
1610rxvt_term::IMSetStatusPosition () 1627rxvt_term::im_set_position ()
1611{ 1628{
1612 XRectangle preedit_rect, status_rect, *needed_rect; 1629 XRectangle preedit_rect, status_rect, *needed_rect;
1613 XVaNestedList preedit_attr, status_attr; 1630 XVaNestedList preedit_attr, status_attr;
1614 1631
1615 if (!Input_Context 1632 if (!Input_Context
1616 || !focus 1633 || !focus
1617 || !(input_style & XIMPreeditArea) 1634 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1618 || !IMisRunning ()) 1635 || !im_is_running ())
1619 return; 1636 return;
1620 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 {
1621 /* Getting the necessary width of preedit area */ 1648 /* Getting the necessary width of preedit area */
1622 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1649 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1623 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1650 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1624 XFree (status_attr); 1651 XFree (status_attr);
1625 1652
1626 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1653 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1627 XFree (needed_rect); 1654 XFree (needed_rect);
1628 1655
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1656 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1657 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1631 1658
1632 XSetICValues (Input_Context, 1659 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, 1660 XNPreeditAttributes, preedit_attr,
1634 XNStatusAttributes, status_attr, NULL); 1661 XNStatusAttributes, status_attr,
1662 NULL);
1635 1663
1664 XFree (status_attr);
1665 }
1666
1636 XFree (preedit_attr); 1667 XFree (preedit_attr);
1637 XFree (status_attr);
1638} 1668}
1639#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 */
1640 1710
1641/*----------------------- end-of-file (C source) -----------------------*/ 1711/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines