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.193 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.378 by root, Tue Jun 5 11:10:50 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines