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.203 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.376 by root, Mon Jun 4 15:18:52 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines