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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines