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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines