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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines