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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines