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.199 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.356 by sf-exg, Fri Apr 29 10:10:20 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 rxvt_emergency_cleanup (); 471 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
536 signal (w.signum, SIG_DFL);
537 kill (getpid (), w.signum);
538 }
539
540 sig_handlers ()
541 : sw_term (this, &sig_handlers::sig_term),
542 sw_int (this, &sig_handlers::sig_term) 472 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
543 {
544 } 473 }
545} sig_handlers; 474} sig_handlers;
546 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
547char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
548 552
549void 553void
550rxvt_init () 554rxvt_init ()
551{ 555{
552 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");
553 567
554 rxvt_environ = environ; 568 rxvt_environ = environ;
555 569
556 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
557 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
558 572
559 sig_handlers.sw_term.start (SIGTERM); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
560 sig_handlers.sw_int.start (SIGINT); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
561
562 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
563 /* signal (SIGURG, SIG_DFL); */
564 575
565 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
566 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
567 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
568 579
569 XrmInitialize (); 580 XrmInitialize ();
570} 581}
571 582
572/* ------------------------------------------------------------------------- *
573 * MEMORY ALLOCATION WRAPPERS *
574 * ------------------------------------------------------------------------- */
575void *
576rxvt_malloc (size_t size)
577{
578 void *p = malloc (size);
579
580 if (!p)
581 rxvt_fatal ("memory allocation failure. aborting.\n");
582
583 return p;
584}
585
586void *
587rxvt_calloc (size_t number, size_t size)
588{
589 void *p = calloc (number, size);
590
591 if (!p)
592 rxvt_fatal ("memory allocation failure. aborting.\n");
593
594 return p;
595}
596
597void *
598rxvt_realloc (void *ptr, size_t size)
599{
600 void *p = realloc (ptr, size);
601
602 if (!p)
603 rxvt_fatal ("memory allocation failure. aborting.\n");
604
605 return p;
606}
607
608/*----------------------------------------------------------------------*/ 583/*----------------------------------------------------------------------*/
609/* 584/*
610 * window size/position calculcations for XSizeHint and other storage. 585 * window size/position calculations for XSizeHint and other storage.
611 * if width/height are non-zero then override calculated width/height 586 * if width/height are non-zero then override calculated width/height
612 */ 587 */
613void 588void
614rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 589rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
615{ 590{
616 short recalc_x, recalc_y; 591 short recalc_x, recalc_y;
617 int x, y, sb_w, flags; 592 int x, y, flags;
618 unsigned int w, h; 593 unsigned int w, h;
619 unsigned int max_width, max_height; 594 unsigned int max_width, max_height;
620 dDisp;
621 595
622 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 596 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
623 szHint.win_gravity = NorthWestGravity; 597 szHint.win_gravity = NorthWestGravity;
624 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 598 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
625 599
… …
633 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
634 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
635 609
636 if (flags & WidthValue) 610 if (flags & WidthValue)
637 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
638 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
639 szHint.flags |= USSize; 616 szHint.flags |= USSize;
640 } 617 }
641 618
642 if (flags & HeightValue) 619 if (flags & HeightValue)
643 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
644 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
645 szHint.flags |= USSize; 625 szHint.flags |= USSize;
646 } 626 }
647 627
648 if (flags & XValue) 628 if (flags & XValue)
649 { 629 {
… …
680 max_width = MAX_COLS * fwidth; 660 max_width = MAX_COLS * fwidth;
681 max_height = MAX_ROWS * fheight; 661 max_height = MAX_ROWS * fheight;
682 662
683 szHint.base_width = szHint.base_height = 2 * int_bwidth; 663 szHint.base_width = szHint.base_height = 2 * int_bwidth;
684 664
685 sb_w = 0;
686 window_vt_x = window_vt_y = int_bwidth; 665 window_vt_x = window_vt_y = int_bwidth;
687 666
688 if (scrollBar.state) 667 if (scrollBar.state)
689 { 668 {
690 sb_w = scrollbar_TotalWidth (); 669 int sb_w = scrollBar.total_width ();
691 szHint.base_width += sb_w; 670 szHint.base_width += sb_w;
671
692 if (!OPTION (Opt_scrollBar_right)) 672 if (!option (Opt_scrollBar_right))
693 window_vt_x += sb_w; 673 window_vt_x += sb_w;
694 } 674 }
695 675
696 szHint.width_inc = fwidth; 676 szHint.width_inc = fwidth;
697 szHint.height_inc = fheight; 677 szHint.height_inc = fheight;
698 szHint.min_width = szHint.base_width + szHint.width_inc; 678 szHint.min_width = szHint.base_width + szHint.width_inc;
699 szHint.min_height = szHint.base_height + szHint.height_inc; 679 szHint.min_height = szHint.base_height + szHint.height_inc;
700 680
701 if (newwidth && newwidth - szHint.base_width < max_width) 681 if (newwidth && newwidth - szHint.base_width < max_width)
702 { 682 {
703 szHint.width = newwidth; 683 szHint.width = newwidth;
… …
718 { 698 {
719 min_it (height, max_height); 699 min_it (height, max_height);
720 szHint.height = szHint.base_height + height; 700 szHint.height = szHint.base_height + height;
721 } 701 }
722 702
723 if (scrollBar.state && OPTION (Opt_scrollBar_right))
724 window_sb_x = szHint.width - sb_w;
725
726 if (recalc_x) 703 if (recalc_x)
727 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
705
728 if (recalc_y) 706 if (recalc_y)
729 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
730 708
731 ncol = width / fwidth; 709 ncol = width / fwidth;
732 nrow = height / fheight; 710 nrow = height / fheight;
733} 711}
734 712
735/*----------------------------------------------------------------------*/ 713/*----------------------------------------------------------------------*/
736/* 714/*
… …
747 725
748 ws.ws_col = ncol; 726 ws.ws_col = ncol;
749 ws.ws_row = nrow; 727 ws.ws_row = nrow;
750 ws.ws_xpixel = width; 728 ws.ws_xpixel = width;
751 ws.ws_ypixel = height; 729 ws.ws_ypixel = height;
752 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 730 ioctl (pty->pty, TIOCSWINSZ, &ws);
753 731
754#if 0 732#if 0
755 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 733 // TIOCSWINSZ is supposed to do this automatically and correctly
756 if (cmd_pid) /* force through to the command */ 734 if (cmd_pid) /* force through to the command */
757 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
758#endif 736#endif
759} 737}
760 738
761/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
762/* set_fonts () - load and set the various fonts 740/* load and set the various fonts */
763 *
764 * init = 1 - initialize
765 *
766 * fontname == FONT_UP - switch to bigger font
767 * fontname == FONT_DN - switch to smaller font
768 */
769bool 741bool
770rxvt_term::set_fonts () 742rxvt_term::set_fonts ()
771{ 743{
772 rxvt_fontset *fs = new rxvt_fontset (this); 744 rxvt_fontset *fs = new rxvt_fontset (this);
773 rxvt_fontprop prop; 745 rxvt_fontprop prop;
… …
787#endif 759#endif
788 760
789 delete fontset[0]; 761 delete fontset[0];
790 fontset[0] = fs; 762 fontset[0] = fs;
791 763
792 prop = (*fs)[1]->properties (); 764 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
793 prop.height += lineSpace; 765 prop.height += lineSpace;
766 prop.width += letterSpace;
767
794 fs->set_prop (prop); 768 fs->set_prop (prop, false);
795 769
796 fwidth = prop.width; 770 fwidth = prop.width;
797 fheight = prop.height; 771 fheight = prop.height;
798 fbase = prop.ascent; 772 fbase = prop.ascent;
799 773
… …
808 { 782 {
809 fontset[style] = fs = new rxvt_fontset (this); 783 fontset[style] = fs = new rxvt_fontset (this);
810 rxvt_fontprop prop2 = prop; 784 rxvt_fontprop prop2 = prop;
811 785
812 if (res) 786 if (res)
813 prop2.weight = prop2.slant = rxvt_fontprop::unset; 787 {
788 fs->populate (res);
789 fs->set_prop (prop2, false);
790 }
814 else 791 else
815 { 792 {
816 res = fontset[0]->fontdesc; 793 fs->populate (fontset[0]->fontdesc);
817 794
818 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 795 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
819 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 796 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
797
798 fs->set_prop (prop2, true);
820 } 799 }
821 800
822 fs->populate (res);
823 fs->set_prop (prop2);
824 } 801 }
825#else 802#else
826 fontset[style] = fontset[0]; 803 fontset[style] = fontset[0];
827#endif 804#endif
828 } 805 }
829 806
830 if (parent[0]) 807 if (parent)
831 { 808 {
832 resize_all_windows (0, 0, 0); 809 resize_all_windows (0, 0, 0);
833 scr_remap_chars (); 810 scr_remap_chars ();
834 scr_touch (true); 811 scr_touch (true);
835 } 812 }
836 813
837 return true; 814 return true;
838} 815}
839 816
817void
840void rxvt_term::set_string_property (Atom prop, const char *str, int len) 818rxvt_term::set_string_property (Atom prop, const char *str, int len)
841{ 819{
842 XChangeProperty (display->display, parent[0], 820 XChangeProperty (dpy, parent,
843 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
844 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
845} 823}
846 824
825void
826rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
827{
828 XTextProperty ct;
829
830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
831 {
832 XSetTextProperty (dpy, parent, &ct, prop);
833 XFree (ct.value);
834 }
835}
836
837void
847void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
848{ 839{
849 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
850 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
851 842
852 XChangeProperty (display->display, parent[0], 843 XChangeProperty (dpy, parent,
853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
854 (const unsigned char *)s, strlen (s)); 845 (const unsigned char *)s, strlen (s));
855 846
856 free (s); 847 free (s);
857 free (ws); 848 free (ws);
… …
861/*----------------------------------------------------------------------*/ 852/*----------------------------------------------------------------------*/
862/* xterm sequences - title, iconName, color (exptl) */ 853/* xterm sequences - title, iconName, color (exptl) */
863void 854void
864rxvt_term::set_title (const char *str) 855rxvt_term::set_title (const char *str)
865{ 856{
866 set_string_property (XA_WM_NAME, str); 857 set_mbstring_property (XA_WM_NAME, str);
867#if ENABLE_EWMH 858#if ENABLE_EWMH
868 set_utf8_property (xa[XA_NET_WM_NAME], str); 859 set_utf8_property (xa[XA_NET_WM_NAME], str);
869#endif 860#endif
870} 861}
871 862
872void 863void
873rxvt_term::set_icon_name (const char *str) 864rxvt_term::set_icon_name (const char *str)
874{ 865{
875 set_string_property (XA_WM_ICON_NAME, str); 866 set_mbstring_property (XA_WM_ICON_NAME, str);
876#if ENABLE_EWMH 867#if ENABLE_EWMH
877 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
878#endif 869#endif
879} 870}
880 871
872void
873rxvt_term::set_window_color (int idx, const char *color)
874{
881#ifdef XTERM_COLOR_CHANGE 875#ifdef XTERM_COLOR_CHANGE
882void
883rxvt_term::set_window_color (int idx, const char *color)
884{
885 rxvt_color xcol; 876 rxvt_color xcol;
886 int i;
887 877
888 if (color == NULL || *color == '\0') 878 if (color == NULL || *color == '\0')
889 return; 879 return;
890 880
881 color = strdup (color);
882 allocated.push_back ((void *)color);
883 rs[Rs_color + idx] = color;
884
891 /* handle color aliases */ 885 /* handle color aliases */
892 if (isdigit (*color)) 886 if (isdigit (*color))
893 { 887 {
894 i = atoi (color); 888 int i = atoi (color);
895 889
896 if (i >= 8 && i <= 15) 890 if (i >= 8 && i <= 15)
891 {
897 { /* bright colors */ 892 /* bright colors */
898 i -= 8;
899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 893 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
900 SET_PIXCOLOR (idx);
901 goto done; 894 goto done;
902 } 895 }
903 896
904 if (i >= 0 && i <= 7) 897 if (i >= 0 && i <= 7)
898 {
905 { /* normal colors */ 899 /* normal colors */
906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 900 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 901 goto done;
909 } 902 }
910 } 903 }
911 904
912 if (!rXParseAllocColor (&xcol, color)) 905 set_color (xcol, color);
913 return;
914
915 /* XStoreColor (display->display, display->cmap, XColor*); */
916 906
917 /* 907 /*
918 * FIXME: should free colors here, but no idea how to do it so instead, 908 * FIXME: should free colors here, but no idea how to do it so instead,
919 * so just keep gobbling up the colormap 909 * so just keep gobbling up the colormap
920 */ 910 */
921# if 0
922 for (i = Color_Black; i <= Color_White; i++)
923 if (pix_colors[idx] == pix_colors[i])
924 break;
925 if (i > Color_White)
926 {
927 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
928 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
929 DisplayPlanes (display->display, display->screen));
930 }
931# endif
932 911
933 pix_colors_focused[idx] = xcol; 912 pix_colors_focused[idx] = xcol;
934 SET_PIXCOLOR (idx);
935 913
936 /* XSetWindowAttributes attr; */
937 /* Cursor cursor; */
938done: 914done:
939
940#if OFF_FOCUS_FADING
941 if (rs[Rs_fade])
942 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
943#endif
944
945 /*TODO: handle Color_BD, scrollbar background, etc. */ 915 /*TODO: handle Color_BD, scrollbar background, etc. */
946 916
917 update_fade_color (idx);
947 recolour_cursor (); 918 recolour_cursor ();
948 scr_recolour (); 919 scr_recolour ();
920#endif /* XTERM_COLOR_CHANGE */
949} 921}
950
951#else
952# define set_window_color (idx,color) ((void)0)
953#endif /* XTERM_COLOR_CHANGE */
954 922
955void 923void
956rxvt_term::recolour_cursor () 924rxvt_term::recolour_cursor ()
957{ 925{
958 XColor xcol[2]; 926 XColor fg, bg;
959 927
960 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 928 (ISSET_PIXCOLOR (Color_pointer_fg)
961 ? pix_colors_focused[Color_pointer_fg] 929 ? pix_colors_focused[Color_pointer_fg]
962 : pix_colors_focused[Color_fg]; 930 : pix_colors_focused[Color_fg]).get (fg);
931
963 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 932 (ISSET_PIXCOLOR (Color_pointer_bg)
964 ? pix_colors_focused[Color_pointer_bg] 933 ? pix_colors_focused[Color_pointer_bg]
965 : pix_colors_focused[Color_bg]; 934 : pix_colors_focused[Color_bg]).get (bg);
966 935
967 XQueryColors (display->display, display->cmap, xcol, 2); 936 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
968 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
969} 937}
970 938
971/*----------------------------------------------------------------------*/ 939/*----------------------------------------------------------------------*/
972/* 940/*
973 * find if fg/bg matches any of the normal (low-intensity) colors 941 * find if fg/bg matches any of the normal (low-intensity) colors
974 */ 942 */
975void 943void
976rxvt_term::set_colorfgbg () 944rxvt_term::set_colorfgbg ()
977{ 945{
978 unsigned int i; 946 unsigned int i;
979 const char *xpmb = "\0"; 947 const char *xpmb = "";
980 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 948 char fstr[] = "default";
949 char bstr[] = "default";
981 950
982 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
983 strcpy (fstr, "default");
984 strcpy (bstr, "default");
985 for (i = Color_Black; i <= Color_White; i++) 951 for (i = Color_Black; i <= Color_White; i++)
986 if (pix_colors[Color_fg] == pix_colors[i]) 952 if (pix_colors[Color_fg] == pix_colors[i])
987 { 953 {
988 sprintf (fstr, "%d", (i - Color_Black)); 954 sprintf (fstr, "%d", i - Color_Black);
989 break; 955 break;
990 } 956 }
991 957
992 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
993 if (pix_colors[Color_bg] == pix_colors[i]) 959 if (pix_colors[Color_bg] == pix_colors[i])
994 { 960 {
995 sprintf (bstr, "%d", (i - Color_Black)); 961 sprintf (bstr, "%d", i - Color_Black);
996#ifdef XPM_BACKGROUND 962#ifdef BG_IMAGE_FROM_FILE
997 xpmb = "default;"; 963 xpmb = "default;";
998#endif 964#endif
999 break; 965 break;
1000 } 966 }
1001 967
1002 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 968 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1003} 969}
1004 970
1005/*----------------------------------------------------------------------*/ 971/*----------------------------------------------------------------------*/
1006 972
1007int 973bool
1008rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 974rxvt_term::set_color (rxvt_color &color, const char *name)
1009{ 975{
1010 if (!screen_in_out->set (display, colour)) 976 if (color.set (this, name))
1011 {
1012 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1013 return false;
1014 }
1015
1016 return true; 977 return true;
978
979 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
980 return false;
981}
982
983void
984rxvt_term::alias_color (int dst, int src)
985{
986 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1017} 987}
1018 988
1019/* -------------------------------------------------------------------- * 989/* -------------------------------------------------------------------- *
1020 * - WINDOW RESIZING - * 990 * - WINDOW RESIZING - *
1021 * -------------------------------------------------------------------- */ 991 * -------------------------------------------------------------------- */
… …
1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 993rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1024{ 994{
1025 int fix_screen; 995 int fix_screen;
1026 int old_width = szHint.width; 996 int old_width = szHint.width;
1027 int old_height = szHint.height; 997 int old_height = szHint.height;
1028 dDisp;
1029 998
1030 window_calc (newwidth, newheight); 999 window_calc (newwidth, newheight);
1000
1001 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1002
1003 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1004 if (set_hint)
1005 {
1006 szHint.flags &= ~(PBaseSize | PResizeInc);
1031 XSetWMNormalHints (disp, parent[0], &szHint); 1007 XSetWMNormalHints (dpy, parent, &szHint);
1008 szHint.flags |= PBaseSize | PResizeInc;
1009 }
1032 1010
1033 if (!ignoreparent) 1011 if (!ignoreparent)
1034 { 1012 {
1035#ifdef SMART_RESIZE 1013#ifdef SMART_RESIZE
1036 /* 1014 /*
… …
1040 int x, y, x1, y1; 1018 int x, y, x1, y1;
1041 int dx, dy; 1019 int dx, dy;
1042 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1020 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1043 Window unused_cr; 1021 Window unused_cr;
1044 1022
1045 XTranslateCoordinates (disp, parent[0], display->root, 1023 XTranslateCoordinates (dpy, parent, display->root,
1046 0, 0, &x, &y, &unused_cr); 1024 0, 0, &x, &y, &unused_cr);
1047 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1025 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1048 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1026 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1049 /* 1027 /*
1050 * if display->root isn't the parent window, a WM will probably have offset 1028 * if display->root isn't the parent window, a WM will probably have offset
1051 * our position for handles and decorations. Counter it 1029 * our position for handles and decorations. Counter it
1052 */ 1030 */
… …
1054 { 1032 {
1055 x -= x1; 1033 x -= x1;
1056 y -= y1; 1034 y -= y1;
1057 } 1035 }
1058 1036
1059 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1037 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1060 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1038 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1061 dx = old_width - szHint.width; 1039 dx = old_width - szHint.width;
1062 dy = old_height - szHint.height; 1040 dy = old_height - szHint.height;
1063 1041
1064 /* Check position of the center of the window */ 1042 /* Check position of the center of the window */
1065 if (x < x1) /* left half */ 1043 if (x < x1) /* left half */
… …
1069 if (y < y1) /* top half */ 1047 if (y < y1) /* top half */
1070 dy = 0; 1048 dy = 0;
1071 else if (y == y1) /* exact center */ 1049 else if (y == y1) /* exact center */
1072 dy /= 2; 1050 dy /= 2;
1073 1051
1074 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1052 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1075 szHint.width, szHint.height); 1053 szHint.width, szHint.height);
1076#else 1054#else
1077 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1055 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1078#endif 1056#endif
1079 } 1057 }
1058
1059 if (set_hint)
1060 XSetWMNormalHints (dpy, parent, &szHint);
1080 1061
1081 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1062 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1082 1063
1083 if (fix_screen || newwidth != old_width || newheight != old_height) 1064 if (fix_screen || newwidth != old_width || newheight != old_height)
1084 { 1065 {
1085 if (scrollBar.state) 1066 if (scrollBar.state)
1086 { 1067 scrollBar.resize ();
1087 XMoveResizeWindow (disp, scrollBar.win,
1088 window_sb_x, 0,
1089 scrollbar_TotalWidth (), szHint.height);
1090 resize_scrollbar ();
1091 }
1092 1068
1093 XMoveResizeWindow (disp, vt, 1069 XMoveResizeWindow (dpy, vt,
1094 window_vt_x, window_vt_y, 1070 window_vt_x, window_vt_y,
1095 width, height); 1071 width, height);
1096 1072
1097 scr_clear (); 1073#ifdef HAVE_BG_PIXMAP
1098#ifdef XPM_BACKGROUND 1074 if (bg_window_size_sensitive ())
1099 resize_pixmap (); 1075 update_background ();
1100#endif 1076#endif
1101 } 1077 }
1102 1078
1103 if (fix_screen || old_height == 0) 1079 if (fix_screen || old_height == 0)
1104 scr_reset (); 1080 scr_reset ();
1105 1081
1106#ifdef XPM_BACKGROUND
1107 if (pixmap)
1108 scr_touch (false);
1109#endif
1110
1111#ifdef USE_XIM 1082#ifdef USE_XIM
1112 IMSetStatusPosition (); 1083 IMSetPosition ();
1113#endif 1084#endif
1114} 1085}
1115 1086
1116/* 1087/*
1117 * Set the width/height of the vt window in characters. Units are pixels. 1088 * Set the width/height of the vt window in characters. Units are pixels.
… …
1122{ 1093{
1123 XWindowAttributes wattr; 1094 XWindowAttributes wattr;
1124 1095
1125 if (newwidth == 0 || newheight == 0) 1096 if (newwidth == 0 || newheight == 0)
1126 { 1097 {
1127 XGetWindowAttributes (display->display, display->root, &wattr); 1098 XGetWindowAttributes (dpy, display->root, &wattr);
1128 1099
1129 if (newwidth == 0) 1100 if (newwidth == 0)
1130 newwidth = wattr.width - szHint.base_width; 1101 newwidth = wattr.width - szHint.base_width;
1131 if (newheight == 0) 1102 if (newheight == 0)
1132 newheight = wattr.height - szHint.base_height; 1103 newheight = wattr.height - szHint.base_height;
… …
1146#ifdef USE_XIM 1117#ifdef USE_XIM
1147 1118
1148void 1119void
1149rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1120rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1150{ 1121{
1151 fg = pix_colors[Color_fg]; 1122 fg = pix_colors [Color_fg];
1152 bg = pix_colors[Color_bg]; 1123 bg = pix_colors [Color_bg];
1153} 1124}
1154 1125
1155void 1126void
1156rxvt_term::im_set_size (XRectangle &size) 1127rxvt_term::im_set_size (XRectangle &size)
1157{ 1128{
… …
1180 1151
1181/* Checking whether input method is running. */ 1152/* Checking whether input method is running. */
1182bool 1153bool
1183rxvt_term::IMisRunning () 1154rxvt_term::IMisRunning ()
1184{ 1155{
1185 char *p;
1186 Atom atom; 1156 Atom atom;
1187 Window win; 1157 Window win;
1188 char server[IMBUFSIZ]; 1158 char server[IMBUFSIZ];
1189 1159
1190 /* get current locale modifier */ 1160 /* get current locale modifier */
1191 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1161 if (char *p = XSetLocaleModifiers (0))
1192 { 1162 {
1193 strcpy (server, "@server="); 1163 strcpy (server, "@server=");
1194 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1164 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1195 1165
1196 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1166 if (p = strchr (server + 1, '@')) /* first one only */
1197 *p = '\0'; 1167 *p = '\0';
1198 1168
1199 atom = XInternAtom (display->display, server, False); 1169 atom = XInternAtom (dpy, server, False);
1200 win = XGetSelectionOwner (display->display, atom); 1170 win = XGetSelectionOwner (dpy, atom);
1201 1171
1202 if (win != None) 1172 if (win != None)
1203 return True; 1173 return true;
1204 } 1174 }
1205 1175
1206 return False; 1176 return false;
1207} 1177}
1208 1178
1209void 1179void
1210rxvt_term::IMSendSpot () 1180rxvt_term::IMSendSpot ()
1211{ 1181{
1212 XPoint nspot; 1182 XPoint nspot;
1213 XVaNestedList preedit_attr; 1183 XVaNestedList preedit_attr;
1214 1184
1215 if (!Input_Context 1185 if (!Input_Context
1216 || !focus 1186 || !focus
1217 || !(input_style & XIMPreeditPosition)) 1187 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1218 return; 1188 return;
1219 1189
1220 im_set_position (nspot); 1190 im_set_position (nspot);
1221 1191
1222 if (nspot.x == spot.x && nspot.y == spot.y) 1192 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1241 input_method = 0; 1211 input_method = 0;
1242 } 1212 }
1243 1213
1244 Input_Context = 0; 1214 Input_Context = 0;
1245} 1215}
1216
1217#ifdef ENABLE_XIM_ONTHESPOT
1218
1219static void
1220xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1221{
1222 ((rxvt_term *)client_data)->make_current ();
1223 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1224}
1225
1226static void
1227xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1228{
1229 ((rxvt_term *)client_data)->make_current ();
1230 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1231}
1232
1233static void
1234xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1235{
1236 rxvt_term *term = (rxvt_term *)client_data;
1237 XIMText *text = call_data->text;
1238
1239 term->make_current ();
1240
1241 if (text)
1242 {
1243 wchar_t *str;
1244
1245 if (!text->encoding_is_wchar && text->string.multi_byte)
1246 {
1247 // of course, X makes it ugly again
1248 if (term->rs[Rs_imLocale])
1249 SET_LOCALE (term->rs[Rs_imLocale]);
1250
1251 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1252 mbstowcs (str, text->string.multi_byte, text->length + 1);
1253
1254 if (term->rs[Rs_imLocale])
1255 SET_LOCALE (term->locale);
1256 }
1257 else
1258 str = text->string.wide_char;
1259
1260 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1261 DT_INT, call_data->caret,
1262 DT_INT, call_data->chg_first,
1263 DT_INT, call_data->chg_length,
1264 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1265 DT_WCS_LEN, str, str ? (int)text->length : 0,
1266 DT_END));
1267 }
1268 else
1269 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1270 DT_INT, call_data->caret,
1271 DT_INT, call_data->chg_first,
1272 DT_INT, call_data->chg_length,
1273 DT_END));
1274}
1275
1276#if 0
1277static void
1278xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1279{
1280 ((rxvt_term *)client_data)->make_current ();
1281 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1282 DT_INT, call_data->position,
1283 DT_INT, call_data->direction,
1284 DT_INT, call_data->style,
1285 DT_END));
1286}
1287#endif
1288
1289#endif
1246 1290
1247/* 1291/*
1248 * Try to open a XIM with the current modifiers, then see if we can 1292 * Try to open a XIM with the current modifiers, then see if we can
1249 * open a suitable preedit type 1293 * open a suitable preedit type
1250 */ 1294 */
… …
1257 XRectangle rect, status_rect, needed_rect; 1301 XRectangle rect, status_rect, needed_rect;
1258 unsigned long fg, bg; 1302 unsigned long fg, bg;
1259 const char *p; 1303 const char *p;
1260 char **s; 1304 char **s;
1261 XIMStyles *xim_styles; 1305 XIMStyles *xim_styles;
1306#ifdef ENABLE_XIM_ONTHESPOT
1307 XIMCallback xcb[4];
1308#endif
1262 1309
1263 set_environ (envv); 1310 set_environ (envv);
1264 1311
1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1312 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1266 return false; 1313 return false;
… …
1287 p = pet[pi]; 1334 p = pet[pi];
1288 1335
1289 if (!p) 1336 if (!p)
1290 continue; 1337 continue;
1291 1338
1292 s = rxvt_splitcommastring (p); 1339 s = rxvt_strsplit (',', p);
1293 1340
1294 for (i = found = 0; !found && s[i]; i++) 1341 for (i = found = 0; !found && s[i]; i++)
1295 { 1342 {
1296 if (!strcmp (s[i], "OverTheSpot")) 1343 if (!strcmp (s[i], "OverTheSpot"))
1297 input_style = (XIMPreeditPosition | XIMStatusNothing); 1344 input_style = XIMPreeditPosition | XIMStatusNothing;
1298 else if (!strcmp (s[i], "OffTheSpot")) 1345 else if (!strcmp (s[i], "OffTheSpot"))
1299 input_style = (XIMPreeditArea | XIMStatusArea); 1346 input_style = XIMPreeditArea | XIMStatusArea;
1300 else if (!strcmp (s[i], "Root")) 1347 else if (!strcmp (s[i], "Root"))
1301 input_style = (XIMPreeditNothing | XIMStatusNothing); 1348 input_style = XIMPreeditNothing | XIMStatusNothing;
1302 else if (!strcmp (s[i], "None")) 1349 else if (!strcmp (s[i], "None"))
1303 input_style = (XIMPreeditNone | XIMStatusNone); 1350 input_style = XIMPreeditNone | XIMStatusNone;
1351#ifdef ENABLE_XIM_ONTHESPOT
1352 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1353 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1354#endif
1355 else
1356 input_style = XIMPreeditNothing | XIMStatusNothing;
1304 1357
1305 for (j = 0; j < xim_styles->count_styles; j++) 1358 for (j = 0; j < xim_styles->count_styles; j++)
1306 if (input_style == xim_styles->supported_styles[j]) 1359 if (input_style == xim_styles->supported_styles[j])
1307 { 1360 {
1308 rxvt_freecommastring (s); 1361 rxvt_free_strsplit (s);
1309 1362
1310 found = 1; 1363 found = 1;
1311 goto foundpet; 1364 goto foundpet;
1312 } 1365 }
1313 1366
1314 } 1367 }
1315 1368
1316 rxvt_freecommastring (s); 1369 rxvt_free_strsplit (s);
1317 } 1370 }
1318 1371
1319foundpet: 1372foundpet:
1320 1373
1321 XFree (xim_styles); 1374 XFree (xim_styles);
… …
1346 "*", 1399 "*",
1347 fheight, 1400 fheight,
1348 fheight + 1, fheight - 1, 1401 fheight + 1, fheight - 1,
1349 fheight - 2, fheight + 2); 1402 fheight - 2, fheight + 2);
1350 1403
1351 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1404 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1352 &missing_charset_list, &missing_charset_count, &def_string); 1405 &missing_charset_list, &missing_charset_count, &def_string);
1353 1406
1354 if (missing_charset_list) 1407 if (missing_charset_list)
1355 XFreeStringList (missing_charset_list); 1408 XFreeStringList (missing_charset_list);
1356 1409
… …
1397 XNBackground, bg, 1450 XNBackground, bg,
1398 XNArea, &status_rect, 1451 XNArea, &status_rect,
1399 XNFontSet, fs, 1452 XNFontSet, fs,
1400 NULL); 1453 NULL);
1401 } 1454 }
1455#if ENABLE_XIM_ONTHESPOT
1456 else if (input_style & XIMPreeditCallbacks)
1457 {
1458 im_set_position (spot);
1459
1460 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1461 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1462 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1463# if 0
1464 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1465# endif
1466
1467 preedit_attr = XVaCreateNestedList (0,
1468 XNSpotLocation, &spot,
1469 XNPreeditStartCallback, &xcb[0],
1470 XNPreeditDoneCallback , &xcb[1],
1471 XNPreeditDrawCallback , &xcb[2],
1472# if 0
1473 XNPreeditCaretCallback, &xcb[3],
1474# endif
1475 NULL);
1476 }
1477#endif
1402 1478
1403 Input_Context = XCreateIC (xim, 1479 Input_Context = XCreateIC (xim,
1404 XNInputStyle, input_style, 1480 XNInputStyle, input_style,
1405 XNClientWindow, vt, 1481 XNClientWindow, vt,
1406 XNFocusWindow, parent[0], 1482 XNFocusWindow, parent,
1407 preedit_attr ? XNPreeditAttributes : NULL, 1483 preedit_attr ? XNPreeditAttributes : NULL,
1408 preedit_attr, 1484 preedit_attr,
1409 status_attr ? XNStatusAttributes : NULL, 1485 status_attr ? XNStatusAttributes : NULL,
1410 status_attr, NULL); 1486 status_attr, NULL);
1411 1487
1412 if (preedit_attr) XFree (preedit_attr); 1488 if (preedit_attr) XFree (preedit_attr);
1413 if (status_attr) XFree (status_attr); 1489 if (status_attr) XFree (status_attr);
1414 if (fs) XFreeFontSet (display->display, fs); 1490 if (fs) XFreeFontSet (dpy, fs);
1415 1491
1416 if (Input_Context == NULL) 1492 if (Input_Context == NULL)
1417 { 1493 {
1418 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1494 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1419 im_destroy (); 1495 im_destroy ();
1420 return false; 1496 return false;
1421 } 1497 }
1422 1498
1499#if 0
1500 // unfortunately, only the focus window is used by XIM, hard to fix
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1501 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input (); 1502 vt_select_input ();
1503#endif
1425 1504
1426 if (input_style & XIMPreeditArea)
1427 IMSetStatusPosition (); 1505 IMSetPosition ();
1428 1506
1429 return true; 1507 return true;
1430} 1508}
1431 1509
1432void 1510void
… …
1452 p = rs[Rs_inputMethod]; 1530 p = rs[Rs_inputMethod];
1453 if (p && *p) 1531 if (p && *p)
1454 { 1532 {
1455 bool found = false; 1533 bool found = false;
1456 1534
1457 s = rxvt_splitcommastring (p); 1535 s = rxvt_strsplit (',', p);
1458 1536
1459 for (i = 0; s[i]; i++) 1537 for (i = 0; s[i]; i++)
1460 { 1538 {
1461 if (*s[i]) 1539 if (*s[i])
1462 { 1540 {
… …
1468 break; 1546 break;
1469 } 1547 }
1470 } 1548 }
1471 } 1549 }
1472 1550
1473 rxvt_freecommastring (s); 1551 rxvt_free_strsplit (s);
1474 1552
1475 if (found) 1553 if (found)
1476 goto done; 1554 goto done;
1477 } 1555 }
1478 1556
… …
1490 SET_LOCALE (locale); 1568 SET_LOCALE (locale);
1491#endif 1569#endif
1492} 1570}
1493 1571
1494void 1572void
1495rxvt_term::IMSetStatusPosition () 1573rxvt_term::IMSetPosition ()
1496{ 1574{
1497 XRectangle preedit_rect, status_rect, *needed_rect; 1575 XRectangle preedit_rect, status_rect, *needed_rect;
1498 XVaNestedList preedit_attr, status_attr; 1576 XVaNestedList preedit_attr, status_attr;
1499 1577
1500 if (!Input_Context 1578 if (!Input_Context
1501 || !focus 1579 || !focus
1502 || !(input_style & XIMPreeditArea) 1580 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1503 || !IMisRunning ()) 1581 || !IMisRunning ())
1504 return; 1582 return;
1505 1583
1584 if (input_style & XIMPreeditPosition)
1585 {
1586 im_set_size (preedit_rect);
1587 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1588
1589 XSetICValues (Input_Context,
1590 XNPreeditAttributes, preedit_attr, NULL);
1591 }
1592 else
1593 {
1506 /* Getting the necessary width of preedit area */ 1594 /* Getting the necessary width of preedit area */
1507 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1595 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1508 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1596 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1509 XFree (status_attr); 1597 XFree (status_attr);
1510 1598
1511 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1599 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1512 XFree (needed_rect); 1600 XFree (needed_rect);
1513 1601
1514 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1602 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1515 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1603 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1516 1604
1517 XSetICValues (Input_Context, 1605 XSetICValues (Input_Context,
1518 XNPreeditAttributes, preedit_attr, 1606 XNPreeditAttributes, preedit_attr,
1519 XNStatusAttributes, status_attr, NULL); 1607 XNStatusAttributes, status_attr,
1608 NULL);
1520 1609
1610 XFree (status_attr);
1611 }
1612
1521 XFree (preedit_attr); 1613 XFree (preedit_attr);
1522 XFree (status_attr);
1523} 1614}
1524#endif /* USE_XIM */ 1615#endif /* USE_XIM */
1616
1617void
1618rxvt_term::get_window_origin (int &x, int &y)
1619{
1620 Window cr;
1621 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1622}
1623
1624Pixmap
1625rxvt_term::get_pixmap_property (Atom property)
1626{
1627 Pixmap pixmap = None;
1628
1629 int aformat;
1630 unsigned long nitems, bytes_after;
1631 Atom atype;
1632 unsigned char *prop;
1633 int result = XGetWindowProperty (dpy, display->root, property,
1634 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1635 &nitems, &bytes_after, &prop);
1636 if (result == Success)
1637 {
1638 if (atype == XA_PIXMAP)
1639 pixmap = *(Pixmap *)prop;
1640 XFree (prop);
1641 }
1642
1643 return pixmap;
1644}
1645
1646#ifdef HAVE_BG_PIXMAP
1647
1648void
1649rxvt_term::update_background ()
1650{
1651 if (update_background_ev.is_active ())
1652 return;
1653
1654 bg_invalidate ();
1655
1656 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1657
1658 if (to_wait <= 0.)
1659 bg_render ();
1660 else
1661 update_background_ev.start (to_wait);
1662}
1663
1664void
1665rxvt_term::update_background_cb (ev::timer &w, int revents)
1666{
1667 make_current ();
1668
1669 update_background_ev.stop ();
1670 bg_render ();
1671 refresh_check ();
1672}
1673
1674#endif /* HAVE_BG_PIXMAP */
1525 1675
1526/*----------------------- end-of-file (C source) -----------------------*/ 1676/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines