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

Diff Legend

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