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

Diff Legend

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