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

Diff Legend

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