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.217 by root, Thu Feb 2 18:00:23 2006 UTC vs.
Revision 1.379 by root, Tue Jun 5 11:10:58 2012 UTC

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

Diff Legend

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