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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines