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.194 by root, Sun Jan 22 00:36:59 2006 UTC vs.
Revision 1.377 by root, Tue Jun 5 11:00:40 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";
384 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
385 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
386 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
387 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
388 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
389 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
390 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
391 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
392 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
393 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
394 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
395 mesg, BUFSIZ); 397 mesg, BUFSIZ);
396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
397 } 399 }
398 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
399 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
400 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
401 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
402 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
403 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
404 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
405 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
406 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
407 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
408 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
409 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
410 mesg, BUFSIZ); 412 mesg, BUFSIZ);
411 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
412 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
413 mesg, BUFSIZ); 415 mesg, BUFSIZ);
414 else 416 else
415 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
416 mesg, BUFSIZ); 418 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
418 } 420 }
419 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
420 mesg, BUFSIZ); 422 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
422} 424}
423#endif 425#endif
424 426
425int 427int ecb_cold
426rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
427{ 429{
428 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
429 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
430 else 432 else
431 { 433 {
432 // GET_R is most likely not the terminal which caused the error, 434 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 435 // so just output the error and continue
434#if ENABLE_FRILLS 436#if ENABLE_MINIMAL
437 old_xerror_handler (display, event);
438#else
435 print_x_error (display, event); 439 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 440#endif
439 } 441 }
440 442
441 return 0; 443 return 0;
442} 444}
443 445
444int 446int ecb_cold
445rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
446{ 448{
447 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
448 DisplayString (display)); 450 DisplayString (display));
449 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
450 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
451} 453}
452 454
453/*----------------------------------------------------------------------*/
454bool
455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
456{
457 this->envv = envv;
458
459 SET_R (this);
460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
462
463 if (!init_vars ())
464 return false;
465
466 init_secondary ();
467
468 const char **cmd_argv = init_resources (argc, argv);
469
470#ifdef KEYSYM_RESOURCE
471 keyboard->register_done ();
472#endif
473
474#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */
477#endif
478
479 pty = rxvt_new_ptytty ();
480
481 create_windows (argc, argv);
482
483 dDisp;
484
485 init_xlocale ();
486
487 scr_reset (); // initialize screen
488
489#if 0
490 XSynchronize (disp, True);
491#endif
492
493#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */
496#endif
497#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent))
499 {
500 XSelectInput (disp, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root);
503 }
504#endif
505
506 set_colorfgbg ();
507
508 init_command (cmd_argv);
509
510 free (cmd_argv);
511
512 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ);
514
515 check_ev.start ();
516
517 HOOK_INVOKE ((this, HOOK_START, DT_END));
518
519 XMapWindow (disp, vt);
520 XMapWindow (disp, parent[0]);
521
522 return true;
523}
524
525static struct sig_handlers 455static struct sig_handlers
526{ 456{
527 sig_watcher sw_term, sw_int; 457 ev::sig sw_term, sw_int;
528 458
529 /* 459 /*
530 * Catch a fatal signal and tidy up before quitting 460 * Catch a fatal signal and tidy up before quitting
531 */ 461 */
532 void 462 void sig_term (ev::sig &w, int revents);
533 sig_term (sig_watcher &w) 463
464 sig_handlers ()
534 { 465 {
535#ifdef DEBUG_CMD 466 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum);
541 }
542
543 sig_handlers ()
544 : sw_term (this, &sig_handlers::sig_term),
545 sw_int (this, &sig_handlers::sig_term) 467 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
546 {
547 } 468 }
548} sig_handlers; 469} sig_handlers;
549 470
471void
472sig_handlers::sig_term (ev::sig &w, int revents)
473{
474 rxvt_emergency_cleanup ();
475 w.stop ();
476 kill (getpid (), w.signum);
477}
478
479static void
480rxvt_get_ttymode (struct termios *tio)
481{
482 if (tcgetattr (STDIN_FILENO, tio) < 0)
483 memset (tio, 0, sizeof (struct termios));
484
485 for (int i = 0; i < NCCS; i++)
486 tio->c_cc[i] = VDISABLE;
487
488 tio->c_cc[VINTR] = CINTR;
489 tio->c_cc[VQUIT] = CQUIT;
490 tio->c_cc[VERASE] = CERASE;
491#ifdef VERASE2
492 tio->c_cc[VERASE2] = CERASE2;
493#endif
494 tio->c_cc[VKILL] = CKILL;
495 tio->c_cc[VEOF] = CEOF;
496 tio->c_cc[VSTART] = CSTART;
497 tio->c_cc[VSTOP] = CSTOP;
498 tio->c_cc[VSUSP] = CSUSP;
499# ifdef VDSUSP
500 tio->c_cc[VDSUSP] = CDSUSP;
501# endif
502# ifdef VREPRINT
503 tio->c_cc[VREPRINT] = CRPRNT;
504# endif
505# ifdef VDISCRD
506 tio->c_cc[VDISCRD] = CFLUSH;
507# endif
508# ifdef VWERSE
509 tio->c_cc[VWERSE] = CWERASE;
510# endif
511# ifdef VLNEXT
512 tio->c_cc[VLNEXT] = CLNEXT;
513# endif
514# ifdef VSTATUS
515 tio->c_cc[VSTATUS] = CSTATUS;
516# endif
517
518# if VMIN != VEOF
519 tio->c_cc[VMIN] = 1;
520# endif
521# if VTIME != VEOL
522 tio->c_cc[VTIME] = 0;
523# endif
524
525 /* input modes */
526 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
527# ifdef IMAXBEL
528 | IMAXBEL
529# endif
530 | IXON);
531
532 /* output modes */
533 tio->c_oflag = (OPOST | ONLCR);
534
535 /* control modes */
536 tio->c_cflag = (CS8 | CREAD);
537
538 /* local modes */
539 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
540# if defined (ECHOCTL) && defined (ECHOKE)
541 | ECHOCTL | ECHOKE
542# endif
543 | ECHOE | ECHOK);
544}
545
550char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
551 547
552void 548void
553rxvt_init () 549rxvt_init ()
554{ 550{
555 uid_t uid = getuid (); 551 assert (("fontMask must not overlap other RS masks",
556 gid_t gid = getgid (); 552 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
557
558 // before doing anything else, check for setuid/setgid operation,
559 // start the helper process and drop privileges
560 if (uid != geteuid ()
561 || gid != getegid ())
562 {
563#if PTYTTY_HELPER
564 rxvt_ptytty_server ();
565#else
566 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
567#endif
568 553
569 // drop privileges 554 rxvt_get_ttymode (&rxvt_term::def_tio);
570#if HAVE_SETRESUID
571 setresgid (gid, gid, gid);
572 setresuid (uid, uid, uid);
573#elif HAVE_SETREUID
574 setregid (gid, gid);
575 setreuid (uid, uid);
576#elif HAVE_SETUID
577 setgid (gid);
578 setuid (uid);
579#endif
580 555
581 if (uid != geteuid () 556 // get rid of stdin/stdout as we don't need them, to free resources
582 || gid != getegid ()) 557 dup2 (STDERR_FILENO, STDIN_FILENO);
583 rxvt_fatal ("unable to drop privileges, aborting.\n"); 558 dup2 (STDERR_FILENO, STDOUT_FILENO);
584 } 559
560 if (!ev_default_loop ())
561 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
585 562
586 rxvt_environ = environ; 563 rxvt_environ = environ;
587 564
588 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
589 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
590 567
591 sig_handlers.sw_term.start (SIGTERM); 568 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
592 sig_handlers.sw_int.start (SIGINT); 569 sig_handlers.sw_int.start (SIGINT); ev_unref ();
593
594 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
595 /* signal (SIGURG, SIG_DFL); */
596 570
597 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
598 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
599 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
600 574
601 XrmInitialize (); 575 XrmInitialize ();
602}
603 576
604/* ------------------------------------------------------------------------- * 577#if HAVE_PIXBUF
605 * MEMORY ALLOCATION WRAPPERS * 578 g_type_init ();
606 * ------------------------------------------------------------------------- */ 579#endif
607void *
608rxvt_malloc (size_t size)
609{
610 void *p = malloc (size);
611
612 if (!p)
613 rxvt_fatal ("memory allocation failure. aborting.\n");
614
615 return p;
616}
617
618void *
619rxvt_calloc (size_t number, size_t size)
620{
621 void *p = calloc (number, size);
622
623 if (!p)
624 rxvt_fatal ("memory allocation failure. aborting.\n");
625
626 return p;
627}
628
629void *
630rxvt_realloc (void *ptr, size_t size)
631{
632 void *p = realloc (ptr, size);
633
634 if (!p)
635 rxvt_fatal ("memory allocation failure. aborting.\n");
636
637 return p;
638} 580}
639 581
640/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
641/* 583/*
642 * window size/position calculcations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
643 * if width/height are non-zero then override calculated width/height 585 * if width/height are non-zero then override calculated width/height
644 */ 586 */
645void 587void
646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 588rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
647{ 589{
648 short recalc_x, recalc_y; 590 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 591 int x, y, flags;
650 unsigned int w, h; 592 unsigned int w, h;
651 unsigned int max_width, max_height; 593 unsigned int max_width, max_height;
652 dDisp;
653
654 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
655 ncol, nrow, szHint.width, szHint.height));
656 594
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 595 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 596 szHint.win_gravity = NorthWestGravity;
659 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 597 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
660 598
668 if (rs[Rs_geometry]) 606 if (rs[Rs_geometry])
669 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 607 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
670 608
671 if (flags & WidthValue) 609 if (flags & WidthValue)
672 { 610 {
611 if (!w)
612 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
613
673 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 614 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
674 szHint.flags |= USSize; 615 szHint.flags |= USSize;
675 } 616 }
676 617
677 if (flags & HeightValue) 618 if (flags & HeightValue)
678 { 619 {
620 if (!h)
621 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
622
679 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 623 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
680 szHint.flags |= USSize; 624 szHint.flags |= USSize;
681 } 625 }
682 626
683 if (flags & XValue) 627 if (flags & XValue)
684 { 628 {
715 max_width = MAX_COLS * fwidth; 659 max_width = MAX_COLS * fwidth;
716 max_height = MAX_ROWS * fheight; 660 max_height = MAX_ROWS * fheight;
717 661
718 szHint.base_width = szHint.base_height = 2 * int_bwidth; 662 szHint.base_width = szHint.base_height = 2 * int_bwidth;
719 663
720 sb_w = 0;
721 window_vt_x = window_vt_y = int_bwidth; 664 window_vt_x = window_vt_y = int_bwidth;
722 665
723 if (scrollBar.state) 666 if (scrollBar.state)
724 { 667 {
725 sb_w = scrollbar_TotalWidth (); 668 int sb_w = scrollBar.total_width ();
726 szHint.base_width += sb_w; 669 szHint.base_width += sb_w;
670
727 if (!OPTION (Opt_scrollBar_right)) 671 if (!option (Opt_scrollBar_right))
728 window_vt_x += sb_w; 672 window_vt_x += sb_w;
729 } 673 }
730 674
731 szHint.width_inc = fwidth; 675 szHint.width_inc = fwidth;
732 szHint.height_inc = fheight; 676 szHint.height_inc = fheight;
733 szHint.min_width = szHint.base_width + szHint.width_inc; 677 szHint.min_width = szHint.base_width + szHint.width_inc;
734 szHint.min_height = szHint.base_height + szHint.height_inc; 678 szHint.min_height = szHint.base_height + szHint.height_inc;
735 679
736 if (newwidth && newwidth - szHint.base_width < max_width) 680 if (newwidth && newwidth - szHint.base_width < max_width)
737 { 681 {
738 szHint.width = newwidth; 682 szHint.width = newwidth;
753 { 697 {
754 min_it (height, max_height); 698 min_it (height, max_height);
755 szHint.height = szHint.base_height + height; 699 szHint.height = szHint.base_height + height;
756 } 700 }
757 701
758 if (scrollBar.state && OPTION (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w;
760
761 if (recalc_x) 702 if (recalc_x)
762 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 703 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
704
763 if (recalc_y) 705 if (recalc_y)
764 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 706 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
765 707
766 ncol = width / fwidth; 708 ncol = width / fwidth;
767 nrow = height / fheight; 709 nrow = height / fheight;
768 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 710
769 ncol, nrow, szHint.width, 711 // When the size of the vt window is not a multiple of the cell
770 szHint.height)); 712 // size, i.e., when the wm does not honour our size hints, there are
771 return; 713 // extra areas not covered by the terminal screen. Such gaps, when a
714 // bg pixmap is set, would have to be cleared manually to properly
715 // refresh the background. We take the simpler route and shrink the
716 // vt window so as to avoid creating gaps.
717 vt_width = ncol * fwidth;
718 vt_height = nrow * fheight;
772} 719}
773 720
774/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
775/* 722/*
776 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
784 731
785 struct winsize ws; 732 struct winsize ws;
786 733
787 ws.ws_col = ncol; 734 ws.ws_col = ncol;
788 ws.ws_row = nrow; 735 ws.ws_row = nrow;
789 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
790 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
791 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
792 739
793#if 0 740#if 0
794 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
795 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
796 kill (-cmd_pid, SIGWINCH); 743 kill (-cmd_pid, SIGWINCH);
797#endif 744#endif
798} 745}
799 746
800/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
801/* set_fonts () - load and set the various fonts 748/* load and set the various fonts */
802 *
803 * init = 1 - initialize
804 *
805 * fontname == FONT_UP - switch to bigger font
806 * fontname == FONT_DN - switch to smaller font
807 */
808bool 749bool
809rxvt_term::set_fonts () 750rxvt_term::set_fonts ()
810{ 751{
811 rxvt_fontset *fs = new rxvt_fontset (this); 752 rxvt_fontset *fs = new rxvt_fontset (this);
812 rxvt_fontprop prop; 753 rxvt_fontprop prop;
826#endif 767#endif
827 768
828 delete fontset[0]; 769 delete fontset[0];
829 fontset[0] = fs; 770 fontset[0] = fs;
830 771
831 prop = (*fs)[1]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
832 prop.height += lineSpace; 773 prop.width += letterSpace;
774
833 fs->set_prop (prop); 775 fs->set_prop (prop, false);
834 776
835 fwidth = prop.width; 777 fwidth = prop.width;
836 fheight = prop.height; 778 fheight = prop.height + lineSpace;
837 fbase = prop.ascent; 779 fbase = prop.ascent;
838 780
839 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
840 { 782 {
841#if ENABLE_STYLES 783#if ENABLE_STYLES
847 { 789 {
848 fontset[style] = fs = new rxvt_fontset (this); 790 fontset[style] = fs = new rxvt_fontset (this);
849 rxvt_fontprop prop2 = prop; 791 rxvt_fontprop prop2 = prop;
850 792
851 if (res) 793 if (res)
852 prop2.weight = prop2.slant = rxvt_fontprop::unset; 794 {
795 fs->populate (res);
796 fs->set_prop (prop2, false);
797 }
853 else 798 else
854 { 799 {
855 res = fontset[0]->fontdesc; 800 fs->populate (fontset[0]->fontdesc);
856 801
857 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 802 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
858 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 803 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
804
805 fs->set_prop (prop2, true);
859 } 806 }
860 807
861 fs->populate (res);
862 fs->set_prop (prop2);
863 } 808 }
864#else 809#else
865 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
866#endif 811#endif
867 } 812 }
868 813
869 if (parent[0]) 814 if (parent)
870 { 815 {
871 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
872 scr_remap_chars (); 817 scr_remap_chars ();
873 scr_touch (true); 818 scr_touch (true);
874 } 819 }
875 820
876 return true; 821 return true;
877} 822}
878 823
824void
879void rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
880{ 826{
881 XChangeProperty (display->display, parent[0], 827 XChangeProperty (dpy, parent,
882 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 830}
885 831
832void
833rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
834{
835 XTextProperty ct;
836
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 {
839 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value);
841 }
842}
843
844void
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 846{
888 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
889 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
890 849
891 XChangeProperty (display->display, parent[0], 850 XChangeProperty (dpy, parent,
892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
893 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
894 853
895 free (s); 854 free (s);
896 free (ws); 855 free (ws);
900/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
901/* xterm sequences - title, iconName, color (exptl) */ 860/* xterm sequences - title, iconName, color (exptl) */
902void 861void
903rxvt_term::set_title (const char *str) 862rxvt_term::set_title (const char *str)
904{ 863{
905 set_string_property (XA_WM_NAME, str); 864 set_mbstring_property (XA_WM_NAME, str);
906#if ENABLE_EWMH 865#if ENABLE_EWMH
907 set_utf8_property (xa[XA_NET_WM_NAME], str); 866 set_utf8_property (xa[XA_NET_WM_NAME], str);
908#endif 867#endif
909} 868}
910 869
911void 870void
912rxvt_term::set_icon_name (const char *str) 871rxvt_term::set_icon_name (const char *str)
913{ 872{
914 set_string_property (XA_WM_ICON_NAME, str); 873 set_mbstring_property (XA_WM_ICON_NAME, str);
915#if ENABLE_EWMH 874#if ENABLE_EWMH
916 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 875 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
917#endif 876#endif
918} 877}
919 878
879void
880rxvt_term::set_window_color (int idx, const char *color)
881{
920#ifdef XTERM_COLOR_CHANGE 882#ifdef XTERM_COLOR_CHANGE
921void
922rxvt_term::set_window_color (int idx, const char *color)
923{
924 rxvt_color xcol; 883 rxvt_color xcol;
925 int i;
926 884
927 if (color == NULL || *color == '\0') 885 if (color == NULL || *color == '\0')
928 return; 886 return;
929 887
888 color = strdup (color);
889 allocated.push_back ((void *)color);
890 rs[Rs_color + idx] = color;
891
930 /* handle color aliases */ 892 /* handle color aliases */
931 if (isdigit (*color)) 893 if (isdigit (*color))
932 { 894 {
933 i = atoi (color); 895 int i = atoi (color);
934 896
935 if (i >= 8 && i <= 15) 897 if (i >= 8 && i <= 15)
898 {
936 { /* bright colors */ 899 /* bright colors */
937 i -= 8;
938 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 900 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
939 SET_PIXCOLOR (idx);
940 goto done; 901 goto done;
941 } 902 }
942 903
943 if (i >= 0 && i <= 7) 904 if (i >= 0 && i <= 7)
905 {
944 { /* normal colors */ 906 /* normal colors */
945 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 907 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
946 SET_PIXCOLOR (idx);
947 goto done; 908 goto done;
948 } 909 }
949 } 910 }
950 911
951 if (!rXParseAllocColor (&xcol, color)) 912 set_color (xcol, color);
952 return;
953
954 /* XStoreColor (display->display, display->cmap, XColor*); */
955 913
956 /* 914 /*
957 * FIXME: should free colors here, but no idea how to do it so instead, 915 * FIXME: should free colors here, but no idea how to do it so instead,
958 * so just keep gobbling up the colormap 916 * so just keep gobbling up the colormap
959 */ 917 */
960# if 0
961 for (i = Color_Black; i <= Color_White; i++)
962 if (pix_colors[idx] == pix_colors[i])
963 break;
964 if (i > Color_White)
965 {
966 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
967 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
968 DisplayPlanes (display->display, display->screen));
969 }
970# endif
971 918
972 pix_colors_focused[idx] = xcol; 919 pix_colors_focused[idx] = xcol;
973 SET_PIXCOLOR (idx);
974 920
975 /* XSetWindowAttributes attr; */
976 /* Cursor cursor; */
977done: 921done:
978
979#if OFF_FOCUS_FADING
980 if (rs[Rs_fade])
981 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
982#endif
983
984 /*TODO: handle Color_BD, scrollbar background, etc. */ 922 /*TODO: handle Color_BD, scrollbar background, etc. */
985 923
924 update_fade_color (idx);
986 recolour_cursor (); 925 recolour_cursor ();
987 scr_recolour (); 926 scr_recolour ();
927#endif /* XTERM_COLOR_CHANGE */
988} 928}
989
990#else
991# define set_window_color (idx,color) ((void)0)
992#endif /* XTERM_COLOR_CHANGE */
993 929
994void 930void
995rxvt_term::recolour_cursor () 931rxvt_term::recolour_cursor ()
996{ 932{
997 XColor xcol[2]; 933 XColor fg, bg;
998 934
999 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 935 (ISSET_PIXCOLOR (Color_pointer_fg)
1000 ? pix_colors_focused[Color_pointer_fg] 936 ? pix_colors_focused[Color_pointer_fg]
1001 : pix_colors_focused[Color_fg]; 937 : pix_colors_focused[Color_fg]).get (fg);
938
1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 939 (ISSET_PIXCOLOR (Color_pointer_bg)
1003 ? pix_colors_focused[Color_pointer_bg] 940 ? pix_colors_focused[Color_pointer_bg]
1004 : pix_colors_focused[Color_bg]; 941 : pix_colors_focused[Color_bg]).get (bg);
1005 942
1006 XQueryColors (display->display, display->cmap, xcol, 2); 943 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1007 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1008} 944}
1009 945
1010/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
1011/* 947/*
1012 * find if fg/bg matches any of the normal (low-intensity) colors 948 * find if fg/bg matches any of the normal (low-intensity) colors
1013 */ 949 */
1014void 950char *
1015rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
1016{ 952{
1017 unsigned int i; 953 unsigned int i;
1018 const char *xpmb = "\0"; 954 const char *xpmb = "";
1019 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
957 char *env_colorfgbg;
1020 958
1021 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1022 strcpy (fstr, "default");
1023 strcpy (bstr, "default");
1024 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
1025 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
1026 { 961 {
1027 sprintf (fstr, "%d", (i - Color_Black)); 962 sprintf (fstr, "%d", i - Color_Black);
1028 break; 963 break;
1029 } 964 }
1030 965
1031 for (i = Color_Black; i <= Color_White; i++) 966 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[Color_bg] == pix_colors[i]) 967 if (pix_colors[Color_bg] == pix_colors[i])
1033 { 968 {
1034 sprintf (bstr, "%d", (i - Color_Black)); 969 sprintf (bstr, "%d", i - Color_Black);
1035#ifdef XPM_BACKGROUND 970#if BG_IMAGE_FROM_FILE
1036 xpmb = "default;"; 971 xpmb = "default;";
1037#endif 972#endif
1038 break; 973 break;
1039 } 974 }
1040 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1041 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 977 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
978 return env_colorfgbg;
1042} 979}
1043 980
1044/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
1045 982
1046int 983bool
1047rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 984rxvt_term::set_color (rxvt_color &color, const char *name)
1048{ 985{
1049 if (!screen_in_out->set (display, colour)) 986 if (color.set (this, name))
1050 {
1051 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1052 return false;
1053 }
1054
1055 return true; 987 return true;
988
989 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
990 return false;
991}
992
993void
994rxvt_term::alias_color (int dst, int src)
995{
996 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1056} 997}
1057 998
1058/* -------------------------------------------------------------------- * 999/* -------------------------------------------------------------------- *
1059 * - WINDOW RESIZING - * 1000 * - WINDOW RESIZING - *
1060 * -------------------------------------------------------------------- */ 1001 * -------------------------------------------------------------------- */
1061void 1002void
1062rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1003rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1063{ 1004{
1064 int fix_screen; 1005 int fix_screen;
1065 int old_width = szHint.width, old_height = szHint.height; 1006 int old_width = szHint.width;
1066 dDisp; 1007 int old_height = szHint.height;
1067 1008
1068 window_calc (newwidth, newheight); 1009 window_calc (newwidth, newheight);
1010
1011 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1012
1013 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1014 if (set_hint)
1015 {
1016 szHint.flags &= ~(PBaseSize | PResizeInc);
1069 XSetWMNormalHints (disp, parent[0], &szHint); 1017 XSetWMNormalHints (dpy, parent, &szHint);
1018 szHint.flags |= PBaseSize | PResizeInc;
1019 }
1070 1020
1071 if (!ignoreparent) 1021 if (!ignoreparent)
1072 { 1022 {
1073#ifdef SMART_RESIZE 1023#ifdef SMART_RESIZE
1074 /* 1024 /*
1078 int x, y, x1, y1; 1028 int x, y, x1, y1;
1079 int dx, dy; 1029 int dx, dy;
1080 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1030 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1081 Window unused_cr; 1031 Window unused_cr;
1082 1032
1083 XTranslateCoordinates (disp, parent[0], display->root, 1033 XTranslateCoordinates (dpy, parent, display->root,
1084 0, 0, &x, &y, &unused_cr); 1034 0, 0, &x, &y, &unused_cr);
1085 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1035 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1086 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1036 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1087 /* 1037 /*
1088 * if display->root isn't the parent window, a WM will probably have offset 1038 * if display->root isn't the parent window, a WM will probably have offset
1089 * our position for handles and decorations. Counter it 1039 * our position for handles and decorations. Counter it
1090 */ 1040 */
1092 { 1042 {
1093 x -= x1; 1043 x -= x1;
1094 y -= y1; 1044 y -= y1;
1095 } 1045 }
1096 1046
1097 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1047 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1098 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1048 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1099 dx = old_width - szHint.width; 1049 dx = old_width - szHint.width;
1100 dy = old_height - szHint.height; 1050 dy = old_height - szHint.height;
1101 1051
1102 /* Check position of the center of the window */ 1052 /* Check position of the center of the window */
1103 if (x < x1) /* left half */ 1053 if (x < x1) /* left half */
1104 dx = 0; 1054 dx = 0;
1107 if (y < y1) /* top half */ 1057 if (y < y1) /* top half */
1108 dy = 0; 1058 dy = 0;
1109 else if (y == y1) /* exact center */ 1059 else if (y == y1) /* exact center */
1110 dy /= 2; 1060 dy /= 2;
1111 1061
1112 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1062 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1113 szHint.width, szHint.height); 1063 szHint.width, szHint.height);
1114#else 1064#else
1115 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1065 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1116#endif 1066#endif
1117 } 1067 }
1068
1069 if (set_hint)
1070 XSetWMNormalHints (dpy, parent, &szHint);
1118 1071
1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1072 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1120 1073
1121 if (fix_screen || newwidth != old_width || newheight != old_height) 1074 if (fix_screen || newwidth != old_width || newheight != old_height)
1122 { 1075 {
1123 if (scrollBar.state) 1076 if (scrollBar.state)
1124 { 1077 scrollBar.resize ();
1125 XMoveResizeWindow (disp, scrollBar.win,
1126 window_sb_x, 0,
1127 scrollbar_TotalWidth (), szHint.height);
1128 resize_scrollbar ();
1129 }
1130 1078
1131 XMoveResizeWindow (disp, vt, 1079 XMoveResizeWindow (dpy, vt,
1132 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
1133 width, height); 1081 vt_width, vt_height);
1134 1082
1135 scr_clear (); 1083 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1136#ifdef XPM_BACKGROUND 1084
1137 resize_pixmap (); 1085#ifdef HAVE_BG_PIXMAP
1086 if (bg_window_size_sensitive ())
1087 update_background ();
1138#endif 1088#endif
1139 } 1089 }
1140 1090
1141 if (fix_screen || old_height == 0) 1091 if (fix_screen || old_height == 0)
1142 {
1143 int curr_screen = -1;
1144 int old_ncol = prev_ncol;
1145
1146 /* scr_reset only works on the primary screen */
1147 if (old_height) /* this is not the first time through */
1148 {
1149 unsigned int ocol = ncol;
1150 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1151 curr_screen = scr_change_screen (PRIMARY);
1152 ncol = ocol;
1153 }
1154
1155 scr_reset (); 1092 scr_reset ();
1156 1093
1157 if (curr_screen >= 0) /* this is not the first time through */
1158 {
1159 scr_change_screen (curr_screen);
1160 selection_check (old_ncol != ncol ? 4 : 0);
1161 }
1162 }
1163
1164 old_width = szHint.width;
1165 old_height = szHint.height;
1166
1167#ifdef XPM_BACKGROUND
1168 if (pixmap)
1169 scr_touch (false);
1170#endif
1171
1172#ifdef USE_XIM 1094#if USE_XIM
1173 IMSetStatusPosition (); 1095 im_set_position ();
1174#endif 1096#endif
1175} 1097}
1176 1098
1177/* 1099/*
1178 * Set the width/height of the vt window in characters. Units are pixels. 1100 * Set the width/height of the vt window in characters. Units are pixels.
1183{ 1105{
1184 XWindowAttributes wattr; 1106 XWindowAttributes wattr;
1185 1107
1186 if (newwidth == 0 || newheight == 0) 1108 if (newwidth == 0 || newheight == 0)
1187 { 1109 {
1188 XGetWindowAttributes (display->display, display->root, &wattr); 1110 XGetWindowAttributes (dpy, display->root, &wattr);
1189 1111
1190 if (newwidth == 0) 1112 if (newwidth == 0)
1191 newwidth = wattr.width - szHint.base_width; 1113 newwidth = wattr.width - szHint.base_width;
1192 if (newheight == 0) 1114 if (newheight == 0)
1193 newheight = wattr.height - szHint.base_height; 1115 newheight = wattr.height - szHint.base_height;
1194 } 1116 }
1195 1117
1196 if (newwidth != width || newheight != height) 1118 if (newwidth != vt_width || newheight != vt_height)
1197 { 1119 {
1198 newwidth += szHint.base_width; 1120 newwidth += szHint.base_width;
1199 newheight += szHint.base_height; 1121 newheight += szHint.base_height;
1200 resize_all_windows (newwidth, newheight, 0); 1122 resize_all_windows (newwidth, newheight, 0);
1201 } 1123 }
1202} 1124}
1203 1125
1204/* -------------------------------------------------------------------- * 1126/* -------------------------------------------------------------------- *
1205 * - X INPUT METHOD ROUTINES - * 1127 * - X INPUT METHOD ROUTINES - *
1206 * -------------------------------------------------------------------- */ 1128 * -------------------------------------------------------------------- */
1207#ifdef USE_XIM 1129#if USE_XIM
1208 1130
1209void 1131void
1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1132rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1211{ 1133{
1212 fg = pix_colors[Color_fg]; 1134 fg = pix_colors [Color_fg];
1213 bg = pix_colors[Color_bg]; 1135 bg = pix_colors [Color_bg];
1214} 1136}
1215 1137
1216void 1138void
1217rxvt_term::im_set_size (XRectangle &size) 1139rxvt_term::im_set_size (XRectangle &size)
1218{ 1140{
1239 status_rect.height = fheight; 1161 status_rect.height = fheight;
1240} 1162}
1241 1163
1242/* Checking whether input method is running. */ 1164/* Checking whether input method is running. */
1243bool 1165bool
1244rxvt_term::IMisRunning () 1166rxvt_term::im_is_running ()
1245{ 1167{
1246 char *p;
1247 Atom atom; 1168 Atom atom;
1248 Window win; 1169 Window win;
1249 char server[IMBUFSIZ]; 1170 char server[IMBUFSIZ];
1250 1171
1251 /* get current locale modifier */ 1172 /* get current locale modifier */
1252 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1173 if (char *p = XSetLocaleModifiers (0))
1253 { 1174 {
1254 strcpy (server, "@server="); 1175 strcpy (server, "@server=");
1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1176 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1256 1177
1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1178 if (p = strchr (server + 1, '@')) /* first one only */
1258 *p = '\0'; 1179 *p = '\0';
1259 1180
1260 atom = XInternAtom (display->display, server, False); 1181 atom = XInternAtom (dpy, server, False);
1261 win = XGetSelectionOwner (display->display, atom); 1182 win = XGetSelectionOwner (dpy, atom);
1262 1183
1263 if (win != None) 1184 if (win != None)
1264 return True; 1185 return true;
1265 } 1186 }
1266 1187
1267 return False; 1188 return false;
1268} 1189}
1269 1190
1270void 1191void
1271rxvt_term::IMSendSpot () 1192rxvt_term::im_send_spot ()
1272{ 1193{
1273 XPoint nspot; 1194 XPoint nspot;
1274 XVaNestedList preedit_attr; 1195 XVaNestedList preedit_attr;
1275 1196
1276 if (!Input_Context 1197 if (!Input_Context
1277 || !focus 1198 || !focus
1278 || !(input_style & XIMPreeditPosition)) 1199 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1279 return; 1200 return;
1280 1201
1281 im_set_position (nspot); 1202 im_set_position (nspot);
1282 1203
1283 if (nspot.x == spot.x && nspot.y == spot.y) 1204 if (nspot.x == spot.x && nspot.y == spot.y)
1302 input_method = 0; 1223 input_method = 0;
1303 } 1224 }
1304 1225
1305 Input_Context = 0; 1226 Input_Context = 0;
1306} 1227}
1228
1229#ifdef ENABLE_XIM_ONTHESPOT
1230
1231static void
1232xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1233{
1234 ((rxvt_term *)client_data)->make_current ();
1235 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1236}
1237
1238static void
1239xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1240{
1241 ((rxvt_term *)client_data)->make_current ();
1242 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1243}
1244
1245static void
1246xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1247{
1248 rxvt_term *term = (rxvt_term *)client_data;
1249 XIMText *text = call_data->text;
1250
1251 term->make_current ();
1252
1253 if (text)
1254 {
1255 wchar_t *str;
1256
1257 if (!text->encoding_is_wchar && text->string.multi_byte)
1258 {
1259 // of course, X makes it ugly again
1260 if (term->rs[Rs_imLocale])
1261 SET_LOCALE (term->rs[Rs_imLocale]);
1262
1263 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1264 mbstowcs (str, text->string.multi_byte, text->length + 1);
1265
1266 if (term->rs[Rs_imLocale])
1267 SET_LOCALE (term->locale);
1268 }
1269 else
1270 str = text->string.wide_char;
1271
1272 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1273 DT_INT, call_data->caret,
1274 DT_INT, call_data->chg_first,
1275 DT_INT, call_data->chg_length,
1276 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1277 DT_WCS_LEN, str, str ? (int)text->length : 0,
1278 DT_END));
1279 }
1280 else
1281 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1282 DT_INT, call_data->caret,
1283 DT_INT, call_data->chg_first,
1284 DT_INT, call_data->chg_length,
1285 DT_END));
1286}
1287
1288#if 0
1289static void
1290xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1291{
1292 ((rxvt_term *)client_data)->make_current ();
1293 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1294 DT_INT, call_data->position,
1295 DT_INT, call_data->direction,
1296 DT_INT, call_data->style,
1297 DT_END));
1298}
1299#endif
1300
1301#endif
1307 1302
1308/* 1303/*
1309 * Try to open a XIM with the current modifiers, then see if we can 1304 * Try to open a XIM with the current modifiers, then see if we can
1310 * open a suitable preedit type 1305 * open a suitable preedit type
1311 */ 1306 */
1312bool 1307bool
1313rxvt_term::IM_get_IC (const char *modifiers) 1308rxvt_term::im_get_ic (const char *modifiers)
1314{ 1309{
1315 int i, j, found; 1310 int i, j, found;
1316 XIM xim; 1311 XIM xim;
1317 XPoint spot; 1312 XPoint spot;
1318 XRectangle rect, status_rect, needed_rect; 1313 XRectangle rect, status_rect, needed_rect;
1324 set_environ (envv); 1319 set_environ (envv);
1325 1320
1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1321 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1327 return false; 1322 return false;
1328 1323
1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1330 input_method = display->get_xim (locale, modifiers); 1324 input_method = display->get_xim (locale, modifiers);
1331 if (input_method == NULL) 1325 if (input_method == NULL)
1332 return false; 1326 return false;
1333 1327
1334 xim = input_method->xim; 1328 xim = input_method->xim;
1349 p = pet[pi]; 1343 p = pet[pi];
1350 1344
1351 if (!p) 1345 if (!p)
1352 continue; 1346 continue;
1353 1347
1354 s = rxvt_splitcommastring (p); 1348 s = rxvt_strsplit (',', p);
1355 1349
1356 for (i = found = 0; !found && s[i]; i++) 1350 for (i = found = 0; !found && s[i]; i++)
1357 { 1351 {
1358 if (!strcmp (s[i], "OverTheSpot")) 1352 if (!strcmp (s[i], "OverTheSpot"))
1359 input_style = (XIMPreeditPosition | XIMStatusNothing); 1353 input_style = XIMPreeditPosition | XIMStatusNothing;
1360 else if (!strcmp (s[i], "OffTheSpot")) 1354 else if (!strcmp (s[i], "OffTheSpot"))
1361 input_style = (XIMPreeditArea | XIMStatusArea); 1355 input_style = XIMPreeditArea | XIMStatusArea;
1362 else if (!strcmp (s[i], "Root")) 1356 else if (!strcmp (s[i], "Root"))
1363 input_style = (XIMPreeditNothing | XIMStatusNothing); 1357 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 else if (!strcmp (s[i], "None")) 1358 else if (!strcmp (s[i], "None"))
1365 input_style = (XIMPreeditNone | XIMStatusNone); 1359 input_style = XIMPreeditNone | XIMStatusNone;
1360#ifdef ENABLE_XIM_ONTHESPOT
1361 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1362 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1363#endif
1364 else
1365 input_style = XIMPreeditNothing | XIMStatusNothing;
1366 1366
1367 for (j = 0; j < xim_styles->count_styles; j++) 1367 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1368 if (input_style == xim_styles->supported_styles[j])
1369 { 1369 {
1370 rxvt_freecommastring (s); 1370 rxvt_free_strsplit (s);
1371 1371
1372 found = 1; 1372 found = 1;
1373 goto foundpet; 1373 goto foundpet;
1374 } 1374 }
1375 1375
1376 } 1376 }
1377 1377
1378 rxvt_freecommastring (s); 1378 rxvt_free_strsplit (s);
1379 } 1379 }
1380 1380
1381foundpet: 1381foundpet:
1382 1382
1383 XFree (xim_styles); 1383 XFree (xim_styles);
1408 "*", 1408 "*",
1409 fheight, 1409 fheight,
1410 fheight + 1, fheight - 1, 1410 fheight + 1, fheight - 1,
1411 fheight - 2, fheight + 2); 1411 fheight - 2, fheight + 2);
1412 1412
1413 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1413 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1414 &missing_charset_list, &missing_charset_count, &def_string); 1414 &missing_charset_list, &missing_charset_count, &def_string);
1415 1415
1416 if (missing_charset_list) 1416 if (missing_charset_list)
1417 XFreeStringList (missing_charset_list); 1417 XFreeStringList (missing_charset_list);
1418 1418
1459 XNBackground, bg, 1459 XNBackground, bg,
1460 XNArea, &status_rect, 1460 XNArea, &status_rect,
1461 XNFontSet, fs, 1461 XNFontSet, fs,
1462 NULL); 1462 NULL);
1463 } 1463 }
1464#if ENABLE_XIM_ONTHESPOT
1465 else if (input_style & XIMPreeditCallbacks)
1466 {
1467 XIMCallback xcb[4];
1468
1469 im_set_position (spot);
1470
1471 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1472 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1473 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1474# if 0
1475 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1476# endif
1477
1478 preedit_attr = XVaCreateNestedList (0,
1479 XNSpotLocation, &spot,
1480 XNPreeditStartCallback, &xcb[0],
1481 XNPreeditDoneCallback , &xcb[1],
1482 XNPreeditDrawCallback , &xcb[2],
1483# if 0
1484 XNPreeditCaretCallback, &xcb[3],
1485# endif
1486 NULL);
1487 }
1488#endif
1464 1489
1465 Input_Context = XCreateIC (xim, 1490 Input_Context = XCreateIC (xim,
1466 XNInputStyle, input_style, 1491 XNInputStyle, input_style,
1467 XNClientWindow, vt, 1492 XNClientWindow, vt,
1468 XNFocusWindow, parent[0], 1493 XNFocusWindow, parent,
1469 preedit_attr ? XNPreeditAttributes : NULL, 1494 preedit_attr ? XNPreeditAttributes : NULL,
1470 preedit_attr, 1495 preedit_attr,
1471 status_attr ? XNStatusAttributes : NULL, 1496 status_attr ? XNStatusAttributes : NULL,
1472 status_attr, NULL); 1497 status_attr, NULL);
1473 1498
1474 if (preedit_attr) XFree (preedit_attr); 1499 if (preedit_attr) XFree (preedit_attr);
1475 if (status_attr) XFree (status_attr); 1500 if (status_attr) XFree (status_attr);
1476 if (fs) XFreeFontSet (display->display, fs); 1501 if (fs) XFreeFontSet (dpy, fs);
1477 1502
1478 if (Input_Context == NULL) 1503 if (Input_Context == NULL)
1479 { 1504 {
1480 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1505 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1481 im_destroy (); 1506 im_destroy ();
1482 return false; 1507 return false;
1483 } 1508 }
1484 1509
1485 if (input_style & XIMPreeditArea) 1510#if 0
1486 IMSetStatusPosition (); 1511 // unfortunately, only the focus window is used by XIM, hard to fix
1512 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1513 vt_select_input ();
1514#endif
1487 1515
1488 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection")); 1516 im_set_position ();
1517
1489 return true; 1518 return true;
1490} 1519}
1491 1520
1492void 1521void
1493rxvt_term::im_cb () 1522rxvt_term::im_cb ()
1499 1528
1500 make_current (); 1529 make_current ();
1501 1530
1502 im_destroy (); 1531 im_destroy ();
1503 1532
1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1505 if (Input_Context) 1533 if (Input_Context)
1506 return; 1534 return;
1507 1535
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1536 if (rs[Rs_imLocale])
1510 SET_LOCALE (rs[Rs_imLocale]); 1537 SET_LOCALE (rs[Rs_imLocale]);
1511#endif
1512 1538
1513 p = rs[Rs_inputMethod]; 1539 p = rs[Rs_inputMethod];
1514 if (p && *p) 1540 if (p && *p)
1515 { 1541 {
1516 bool found = false; 1542 bool found = false;
1517 1543
1518 s = rxvt_splitcommastring (p); 1544 s = rxvt_strsplit (',', p);
1519 1545
1520 for (i = 0; s[i]; i++) 1546 for (i = 0; s[i]; i++)
1521 { 1547 {
1522 if (*s[i]) 1548 if (*s[i])
1523 { 1549 {
1524 strcpy (buf, "@im="); 1550 strcpy (buf, "@im=");
1525 strncat (buf, s[i], IMBUFSIZ - 5); 1551 strncat (buf, s[i], IMBUFSIZ - 5);
1526 if (IM_get_IC (buf)) 1552 if (im_get_ic (buf))
1527 { 1553 {
1528 found = true; 1554 found = true;
1529 break; 1555 break;
1530 } 1556 }
1531 } 1557 }
1532 } 1558 }
1533 1559
1534 rxvt_freecommastring (s); 1560 rxvt_free_strsplit (s);
1535 1561
1536 if (found) 1562 if (found)
1537 goto done; 1563 goto done;
1538 } 1564 }
1539 1565
1540 /* try with XMODIFIERS env. var. */ 1566 /* try with XMODIFIERS env. var. */
1541 if (IM_get_IC ("")) 1567 if (im_get_ic (""))
1542 goto done; 1568 goto done;
1543 1569
1544 /* try with no modifiers base IF the user didn't specify an IM */ 1570 /* try with no modifiers base IF the user didn't specify an IM */
1545 if (IM_get_IC ("@im=none")) 1571 if (im_get_ic ("@im=none"))
1546 goto done; 1572 goto done;
1547 1573
1548done: 1574done:
1549#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1550 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1551 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1552#endif
1553} 1577}
1554 1578
1555void 1579void
1556rxvt_term::IMSetStatusPosition () 1580rxvt_term::im_set_position ()
1557{ 1581{
1558 XRectangle preedit_rect, status_rect, *needed_rect; 1582 XRectangle preedit_rect, status_rect, *needed_rect;
1559 XVaNestedList preedit_attr, status_attr; 1583 XVaNestedList preedit_attr, status_attr;
1560 1584
1561 if (!Input_Context 1585 if (!Input_Context
1562 || !focus 1586 || !focus
1563 || !(input_style & XIMPreeditArea) 1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1564 || !IMisRunning ()) 1588 || !im_is_running ())
1565 return; 1589 return;
1566 1590
1591 if (input_style & XIMPreeditPosition)
1592 {
1593 im_set_size (preedit_rect);
1594 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1595
1596 XSetICValues (Input_Context,
1597 XNPreeditAttributes, preedit_attr, NULL);
1598 }
1599 else
1600 {
1567 /* Getting the necessary width of preedit area */ 1601 /* Getting the necessary width of preedit area */
1568 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1602 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1569 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1603 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1570 XFree (status_attr); 1604 XFree (status_attr);
1571 1605
1572 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1606 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1573 XFree (needed_rect); 1607 XFree (needed_rect);
1574 1608
1575 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1609 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1576 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1610 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1577 1611
1578 XSetICValues (Input_Context, 1612 XSetICValues (Input_Context,
1579 XNPreeditAttributes, preedit_attr, 1613 XNPreeditAttributes, preedit_attr,
1580 XNStatusAttributes, status_attr, NULL); 1614 XNStatusAttributes, status_attr,
1615 NULL);
1581 1616
1617 XFree (status_attr);
1618 }
1619
1582 XFree (preedit_attr); 1620 XFree (preedit_attr);
1583 XFree (status_attr);
1584} 1621}
1585#endif /* USE_XIM */ 1622#endif /* USE_XIM */
1623
1624void
1625rxvt_term::get_window_origin (int &x, int &y)
1626{
1627 Window cr;
1628 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1629}
1630
1631#ifdef HAVE_BG_PIXMAP
1632
1633void
1634rxvt_term::update_background ()
1635{
1636 if (update_background_ev.is_active ())
1637 return;
1638
1639 bg_invalidate ();
1640
1641 if (!mapped)
1642 return;
1643
1644 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1645
1646 if (to_wait <= 0.)
1647 bg_render ();
1648 else
1649 update_background_ev.start (to_wait);
1650}
1651
1652void
1653rxvt_term::update_background_cb (ev::timer &w, int revents)
1654{
1655 make_current ();
1656
1657 update_background_ev.stop ();
1658 bg_render ();
1659 refresh_check ();
1660}
1661
1662#endif /* HAVE_BG_PIXMAP */
1586 1663
1587/*----------------------- end-of-file (C source) -----------------------*/ 1664/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines