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.193 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.335 by root, Sun Oct 24 17:52:50 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)
456{
457 SET_R (this);
458 set_locale ("");
459 set_environ (envv); // few things in X do not call setlocale :(
460
461 if (!init_vars ())
462 return false;
463
464 init_secondary ();
465
466 const char **cmd_argv = init_resources (argc, argv);
467
468#ifdef KEYSYM_RESOURCE
469 keyboard->register_done ();
470#endif
471
472#ifdef HAVE_SCROLLBARS
473 if (OPTION (Opt_scrollBar))
474 scrollBar.setIdle (); /* set existence for size calculations */
475#endif
476
477 pty = rxvt_new_ptytty ();
478
479 create_windows (argc, argv);
480
481 dDisp;
482
483 init_xlocale ();
484
485 scr_reset (); // initialize screen
486
487#if 0
488 XSynchronize (disp, True);
489#endif
490
491#ifdef HAVE_SCROLLBARS
492 if (OPTION (Opt_scrollBar))
493 resize_scrollbar (); /* create and map scrollbar */
494#endif
495#ifdef TRANSPARENT
496 if (OPTION (Opt_transparent))
497 {
498 XSelectInput (disp, display->root, PropertyChangeMask);
499 check_our_parents ();
500 rootwin_ev.start (display, display->root);
501 }
502#endif
503
504 set_colorfgbg ();
505
506 init_command (cmd_argv);
507
508 free (cmd_argv);
509
510 if (pty->pty >= 0)
511 pty_ev.start (pty->pty, EVENT_READ);
512
513 check_ev.start ();
514
515 HOOK_INVOKE ((this, HOOK_START, DT_END));
516
517 XMapWindow (disp, vt);
518 XMapWindow (disp, parent[0]);
519
520 return true;
521}
522
523static struct sig_handlers 457static struct sig_handlers
524{ 458{
525 sig_watcher sw_term, sw_int; 459 ev::sig sw_term, sw_int;
526 460
527 /* 461 /*
528 * Catch a fatal signal and tidy up before quitting 462 * Catch a fatal signal and tidy up before quitting
529 */ 463 */
530 void 464 void sig_term (ev::sig &w, int revents);
531 sig_term (sig_watcher &w) 465
466 sig_handlers ()
532 { 467 {
533#ifdef DEBUG_CMD 468 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
534 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
535#endif
536 rxvt_emergency_cleanup ();
537 signal (w.signum, SIG_DFL);
538 kill (getpid (), w.signum);
539 }
540
541 sig_handlers ()
542 : sw_term (this, &sig_handlers::sig_term),
543 sw_int (this, &sig_handlers::sig_term) 469 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
544 {
545 } 470 }
546} sig_handlers; 471} sig_handlers;
547 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
548char **rxvt_environ; // startup environment 545char **rxvt_environ; // startup environment
549 546
550void 547void
551rxvt_init () 548rxvt_init ()
552{ 549{
553 uid_t uid = getuid (); 550 assert (("fontMask must not overlap other RS masks",
554 gid_t gid = getgid (); 551 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
555
556 // before doing anything else, check for setuid/setgid operation,
557 // start the helper process and drop privileges
558 if (uid != geteuid ()
559 || gid != getegid ())
560 {
561#if PTYTTY_HELPER
562 rxvt_ptytty_server ();
563#else
564 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
565#endif
566 552
567 // drop privileges 553 rxvt_get_ttymode (&rxvt_term::def_tio);
568#if HAVE_SETRESUID
569 setresgid (gid, gid, gid);
570 setresuid (uid, uid, uid);
571#elif HAVE_SETREUID
572 setregid (gid, gid);
573 setreuid (uid, uid);
574#elif HAVE_SETUID
575 setgid (gid);
576 setuid (uid);
577#endif
578 554
579 if (uid != geteuid () 555 // get rid of stdin/stdout as we don't need them, to free resources
580 || gid != getegid ()) 556 dup2 (STDERR_FILENO, STDIN_FILENO);
581 rxvt_fatal ("unable to drop privileges, aborting.\n"); 557 dup2 (STDERR_FILENO, STDOUT_FILENO);
582 } 558
559 if (!ev_default_loop ())
560 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
583 561
584 rxvt_environ = environ; 562 rxvt_environ = environ;
585 563
586 signal (SIGHUP, SIG_IGN); 564 signal (SIGHUP, SIG_IGN);
587 signal (SIGPIPE, SIG_IGN); 565 signal (SIGPIPE, SIG_IGN);
588 566
589 sig_handlers.sw_term.start (SIGTERM); 567 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
590 sig_handlers.sw_int.start (SIGINT); 568 sig_handlers.sw_int.start (SIGINT); ev_unref ();
591
592 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
593 /* signal (SIGURG, SIG_DFL); */
594 569
595 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
596 // TODO: handle this with exceptions and tolerate the memory loss 571 // TODO: handle this with exceptions and tolerate the memory loss
597 XSetIOErrorHandler (rxvt_xioerror_handler); 572 XSetIOErrorHandler (rxvt_xioerror_handler);
598 573
599 XrmInitialize (); 574 XrmInitialize ();
600} 575}
601 576
602/* ------------------------------------------------------------------------- *
603 * MEMORY ALLOCATION WRAPPERS *
604 * ------------------------------------------------------------------------- */
605void *
606rxvt_malloc (size_t size)
607{
608 void *p = malloc (size);
609
610 if (!p)
611 rxvt_fatal ("memory allocation failure. aborting.\n");
612
613 return p;
614}
615
616void *
617rxvt_calloc (size_t number, size_t size)
618{
619 void *p = calloc (number, size);
620
621 if (!p)
622 rxvt_fatal ("memory allocation failure. aborting.\n");
623
624 return p;
625}
626
627void *
628rxvt_realloc (void *ptr, size_t size)
629{
630 void *p = realloc (ptr, size);
631
632 if (!p)
633 rxvt_fatal ("memory allocation failure. aborting.\n");
634
635 return p;
636}
637
638/*----------------------------------------------------------------------*/ 577/*----------------------------------------------------------------------*/
639/* 578/*
640 * window size/position calculcations for XSizeHint and other storage. 579 * window size/position calculations for XSizeHint and other storage.
641 * if width/height are non-zero then override calculated width/height 580 * if width/height are non-zero then override calculated width/height
642 */ 581 */
643void 582void
644rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 583rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
645{ 584{
646 short recalc_x, recalc_y; 585 short recalc_x, recalc_y;
647 int x, y, sb_w, flags; 586 int x, y, flags;
648 unsigned int w, h; 587 unsigned int w, h;
649 unsigned int max_width, max_height; 588 unsigned int max_width, max_height;
650 dDisp;
651
652 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
653 ncol, nrow, szHint.width, szHint.height));
654 589
655 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 590 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
656 szHint.win_gravity = NorthWestGravity; 591 szHint.win_gravity = NorthWestGravity;
657 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 592 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
658 593
… …
666 if (rs[Rs_geometry]) 601 if (rs[Rs_geometry])
667 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 602 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
668 603
669 if (flags & WidthValue) 604 if (flags & WidthValue)
670 { 605 {
606 if (!w)
607 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
608
671 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 609 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
672 szHint.flags |= USSize; 610 szHint.flags |= USSize;
673 } 611 }
674 612
675 if (flags & HeightValue) 613 if (flags & HeightValue)
676 { 614 {
615 if (!h)
616 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
617
677 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 618 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
678 szHint.flags |= USSize; 619 szHint.flags |= USSize;
679 } 620 }
680 621
681 if (flags & XValue) 622 if (flags & XValue)
682 { 623 {
… …
713 max_width = MAX_COLS * fwidth; 654 max_width = MAX_COLS * fwidth;
714 max_height = MAX_ROWS * fheight; 655 max_height = MAX_ROWS * fheight;
715 656
716 szHint.base_width = szHint.base_height = 2 * int_bwidth; 657 szHint.base_width = szHint.base_height = 2 * int_bwidth;
717 658
718 sb_w = 0;
719 window_vt_x = window_vt_y = int_bwidth; 659 window_vt_x = window_vt_y = int_bwidth;
720 660
721 if (scrollBar.state) 661 if (scrollBar.state)
722 { 662 {
723 sb_w = scrollbar_TotalWidth (); 663 int sb_w = scrollBar.total_width ();
724 szHint.base_width += sb_w; 664 szHint.base_width += sb_w;
665
725 if (!OPTION (Opt_scrollBar_right)) 666 if (!option (Opt_scrollBar_right))
726 window_vt_x += sb_w; 667 window_vt_x += sb_w;
727 } 668 }
728 669
729 szHint.width_inc = fwidth; 670 szHint.width_inc = fwidth;
730 szHint.height_inc = fheight; 671 szHint.height_inc = fheight;
731 szHint.min_width = szHint.base_width + szHint.width_inc; 672 szHint.min_width = szHint.base_width + szHint.width_inc;
732 szHint.min_height = szHint.base_height + szHint.height_inc; 673 szHint.min_height = szHint.base_height + szHint.height_inc;
733 674
734 if (newwidth && newwidth - szHint.base_width < max_width) 675 if (newwidth && newwidth - szHint.base_width < max_width)
735 { 676 {
736 szHint.width = newwidth; 677 szHint.width = newwidth;
… …
751 { 692 {
752 min_it (height, max_height); 693 min_it (height, max_height);
753 szHint.height = szHint.base_height + height; 694 szHint.height = szHint.base_height + height;
754 } 695 }
755 696
756 if (scrollBar.state && OPTION (Opt_scrollBar_right))
757 window_sb_x = szHint.width - sb_w;
758
759 if (recalc_x) 697 if (recalc_x)
760 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 698 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
699
761 if (recalc_y) 700 if (recalc_y)
762 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 701 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
763 702
764 ncol = width / fwidth; 703 ncol = width / fwidth;
765 nrow = height / fheight; 704 nrow = height / fheight;
766 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
767 ncol, nrow, szHint.width,
768 szHint.height));
769 return;
770} 705}
771 706
772/*----------------------------------------------------------------------*/ 707/*----------------------------------------------------------------------*/
773/* 708/*
774 * Tell the teletype handler what size the window is. 709 * Tell the teletype handler what size the window is.
… …
784 719
785 ws.ws_col = ncol; 720 ws.ws_col = ncol;
786 ws.ws_row = nrow; 721 ws.ws_row = nrow;
787 ws.ws_xpixel = width; 722 ws.ws_xpixel = width;
788 ws.ws_ypixel = height; 723 ws.ws_ypixel = height;
789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 724 ioctl (pty->pty, TIOCSWINSZ, &ws);
790 725
791#if 0 726#if 0
792 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 727 // TIOCSWINSZ is supposed to do this automatically and correctly
793 if (cmd_pid) /* force through to the command */ 728 if (cmd_pid) /* force through to the command */
794 kill (-cmd_pid, SIGWINCH); 729 kill (-cmd_pid, SIGWINCH);
795#endif 730#endif
796} 731}
797 732
… …
824#endif 759#endif
825 760
826 delete fontset[0]; 761 delete fontset[0];
827 fontset[0] = fs; 762 fontset[0] = fs;
828 763
829 prop = (*fs)[1]->properties (); 764 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
830 prop.height += lineSpace; 765 prop.height += lineSpace;
766 prop.width += letterSpace;
767
831 fs->set_prop (prop); 768 fs->set_prop (prop, false);
832 769
833 fwidth = prop.width; 770 fwidth = prop.width;
834 fheight = prop.height; 771 fheight = prop.height;
835 fbase = prop.ascent; 772 fbase = prop.ascent;
836 773
… …
845 { 782 {
846 fontset[style] = fs = new rxvt_fontset (this); 783 fontset[style] = fs = new rxvt_fontset (this);
847 rxvt_fontprop prop2 = prop; 784 rxvt_fontprop prop2 = prop;
848 785
849 if (res) 786 if (res)
850 prop2.weight = prop2.slant = rxvt_fontprop::unset; 787 {
788 fs->populate (res);
789 fs->set_prop (prop2, false);
790 }
851 else 791 else
852 { 792 {
853 res = fontset[0]->fontdesc; 793 fs->populate (fontset[0]->fontdesc);
854 794
855 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 795 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
856 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 796 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
797
798 fs->set_prop (prop2, true);
857 } 799 }
858 800
859 fs->populate (res);
860 fs->set_prop (prop2);
861 } 801 }
862#else 802#else
863 fontset[style] = fontset[0]; 803 fontset[style] = fontset[0];
864#endif 804#endif
865 } 805 }
… …
867 if (parent[0]) 807 if (parent[0])
868 { 808 {
869 resize_all_windows (0, 0, 0); 809 resize_all_windows (0, 0, 0);
870 scr_remap_chars (); 810 scr_remap_chars ();
871 scr_touch (true); 811 scr_touch (true);
872 } 812 }
873 813
874 return true; 814 return true;
875} 815}
876 816
817void
877void rxvt_term::set_string_property (Atom prop, const char *str, int len) 818rxvt_term::set_string_property (Atom prop, const char *str, int len)
878{ 819{
879 XChangeProperty (display->display, parent[0], 820 XChangeProperty (dpy, parent[0],
880 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
881 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
882} 823}
883 824
825void
826rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
827{
828 XTextProperty ct;
829
830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
831 {
832 XSetTextProperty (dpy, parent[0], &ct, prop);
833 XFree (ct.value);
834 }
835}
836
837void
884void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
885{ 839{
886 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
887 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
888 842
889 XChangeProperty (display->display, parent[0], 843 XChangeProperty (dpy, parent[0],
890 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
891 (const unsigned char *)s, strlen (s)); 845 (const unsigned char *)s, strlen (s));
892 846
893 free (s); 847 free (s);
894 free (ws); 848 free (ws);
… …
898/*----------------------------------------------------------------------*/ 852/*----------------------------------------------------------------------*/
899/* xterm sequences - title, iconName, color (exptl) */ 853/* xterm sequences - title, iconName, color (exptl) */
900void 854void
901rxvt_term::set_title (const char *str) 855rxvt_term::set_title (const char *str)
902{ 856{
903 set_string_property (XA_WM_NAME, str); 857 set_mbstring_property (XA_WM_NAME, str);
904#if ENABLE_EWMH 858#if ENABLE_EWMH
905 set_utf8_property (xa[XA_NET_WM_NAME], str); 859 set_utf8_property (xa[XA_NET_WM_NAME], str);
906#endif 860#endif
907} 861}
908 862
909void 863void
910rxvt_term::set_icon_name (const char *str) 864rxvt_term::set_icon_name (const char *str)
911{ 865{
912 set_string_property (XA_WM_ICON_NAME, str); 866 set_mbstring_property (XA_WM_ICON_NAME, str);
913#if ENABLE_EWMH 867#if ENABLE_EWMH
914 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
915#endif 869#endif
916} 870}
917 871
872void
873rxvt_term::set_window_color (int idx, const char *color)
874{
918#ifdef XTERM_COLOR_CHANGE 875#ifdef XTERM_COLOR_CHANGE
919void
920rxvt_term::set_window_color (int idx, const char *color)
921{
922 rxvt_color xcol; 876 rxvt_color xcol;
923 int i;
924 877
925 if (color == NULL || *color == '\0') 878 if (color == NULL || *color == '\0')
926 return; 879 return;
927 880
881 color = strdup (color);
882 allocated.push_back ((void *)color);
883 rs[Rs_color + idx] = color;
884
928 /* handle color aliases */ 885 /* handle color aliases */
929 if (isdigit (*color)) 886 if (isdigit (*color))
930 { 887 {
931 i = atoi (color); 888 int i = atoi (color);
932 889
933 if (i >= 8 && i <= 15) 890 if (i >= 8 && i <= 15)
891 {
934 { /* bright colors */ 892 /* bright colors */
935 i -= 8;
936 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 893 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
937 SET_PIXCOLOR (idx);
938 goto done; 894 goto done;
939 } 895 }
940 896
941 if (i >= 0 && i <= 7) 897 if (i >= 0 && i <= 7)
898 {
942 { /* normal colors */ 899 /* normal colors */
943 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 900 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
944 SET_PIXCOLOR (idx);
945 goto done; 901 goto done;
946 } 902 }
947 } 903 }
948 904
949 if (!rXParseAllocColor (&xcol, color)) 905 set_color (xcol, color);
950 return;
951
952 /* XStoreColor (display->display, display->cmap, XColor*); */
953 906
954 /* 907 /*
955 * FIXME: should free colors here, but no idea how to do it so instead, 908 * FIXME: should free colors here, but no idea how to do it so instead,
956 * so just keep gobbling up the colormap 909 * so just keep gobbling up the colormap
957 */ 910 */
958# if 0
959 for (i = Color_Black; i <= Color_White; i++)
960 if (pix_colors[idx] == pix_colors[i])
961 break;
962 if (i > Color_White)
963 {
964 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
965 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
966 DisplayPlanes (display->display, display->screen));
967 }
968# endif
969 911
970 pix_colors_focused[idx] = xcol; 912 pix_colors_focused[idx] = xcol;
971 SET_PIXCOLOR (idx);
972 913
973 /* XSetWindowAttributes attr; */
974 /* Cursor cursor; */
975done: 914done:
976
977#if OFF_FOCUS_FADING
978 if (rs[Rs_fade])
979 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
980#endif
981
982 /*TODO: handle Color_BD, scrollbar background, etc. */ 915 /*TODO: handle Color_BD, scrollbar background, etc. */
983 916
917 update_fade_color (idx);
984 recolour_cursor (); 918 recolour_cursor ();
985 scr_recolour (); 919 scr_recolour ();
920#endif /* XTERM_COLOR_CHANGE */
986} 921}
987
988#else
989# define set_window_color (idx,color) ((void)0)
990#endif /* XTERM_COLOR_CHANGE */
991 922
992void 923void
993rxvt_term::recolour_cursor () 924rxvt_term::recolour_cursor ()
994{ 925{
995 XColor xcol[2]; 926 XColor fg, bg;
996 927
997 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 928 (ISSET_PIXCOLOR (Color_pointer_fg)
998 ? pix_colors_focused[Color_pointer_fg] 929 ? pix_colors_focused[Color_pointer_fg]
999 : pix_colors_focused[Color_fg]; 930 : pix_colors_focused[Color_fg]).get (fg);
931
1000 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 932 (ISSET_PIXCOLOR (Color_pointer_bg)
1001 ? pix_colors_focused[Color_pointer_bg] 933 ? pix_colors_focused[Color_pointer_bg]
1002 : pix_colors_focused[Color_bg]; 934 : pix_colors_focused[Color_bg]).get (bg);
1003 935
1004 XQueryColors (display->display, display->cmap, xcol, 2); 936 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1005 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1006} 937}
1007 938
1008/*----------------------------------------------------------------------*/ 939/*----------------------------------------------------------------------*/
1009/* 940/*
1010 * find if fg/bg matches any of the normal (low-intensity) colors 941 * find if fg/bg matches any of the normal (low-intensity) colors
1011 */ 942 */
1012void 943void
1013rxvt_term::set_colorfgbg () 944rxvt_term::set_colorfgbg ()
1014{ 945{
1015 unsigned int i; 946 unsigned int i;
1016 const char *xpmb = "\0"; 947 const char *xpmb = "";
1017 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 948 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1018 949
1019 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1020 strcpy (fstr, "default"); 950 strcpy (fstr, "default");
1021 strcpy (bstr, "default"); 951 strcpy (bstr, "default");
1022 for (i = Color_Black; i <= Color_White; i++) 952 for (i = Color_Black; i <= Color_White; i++)
1023 if (pix_colors[Color_fg] == pix_colors[i]) 953 if (pix_colors[Color_fg] == pix_colors[i])
1024 { 954 {
… …
1028 958
1029 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
1030 if (pix_colors[Color_bg] == pix_colors[i]) 960 if (pix_colors[Color_bg] == pix_colors[i])
1031 { 961 {
1032 sprintf (bstr, "%d", (i - Color_Black)); 962 sprintf (bstr, "%d", (i - Color_Black));
1033#ifdef XPM_BACKGROUND 963#ifdef BG_IMAGE_FROM_FILE
1034 xpmb = "default;"; 964 xpmb = "default;";
1035#endif 965#endif
1036 break; 966 break;
1037 } 967 }
1038 968
1039 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 969 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1040} 970}
1041 971
1042/*----------------------------------------------------------------------*/ 972/*----------------------------------------------------------------------*/
1043 973
1044int 974bool
1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 975rxvt_term::set_color (rxvt_color &color, const char *name)
1046{ 976{
1047 if (!screen_in_out->set (display, colour)) 977 if (color.set (this, name))
1048 {
1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1050 return false;
1051 }
1052
1053 return true; 978 return true;
979
980 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
981 return false;
982}
983
984void
985rxvt_term::alias_color (int dst, int src)
986{
987 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1054} 988}
1055 989
1056/* -------------------------------------------------------------------- * 990/* -------------------------------------------------------------------- *
1057 * - WINDOW RESIZING - * 991 * - WINDOW RESIZING - *
1058 * -------------------------------------------------------------------- */ 992 * -------------------------------------------------------------------- */
1059void 993void
1060rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 994rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1061{ 995{
1062 int fix_screen; 996 int fix_screen;
1063 int old_width = szHint.width, old_height = szHint.height; 997 int old_width = szHint.width;
1064 dDisp; 998 int old_height = szHint.height;
1065 999
1066 window_calc (newwidth, newheight); 1000 window_calc (newwidth, newheight);
1001
1002 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1003
1004 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1005 if (set_hint)
1006 {
1007 szHint.flags &= ~(PBaseSize | PResizeInc);
1067 XSetWMNormalHints (disp, parent[0], &szHint); 1008 XSetWMNormalHints (dpy, parent[0], &szHint);
1009 szHint.flags |= PBaseSize | PResizeInc;
1010 }
1068 1011
1069 if (!ignoreparent) 1012 if (!ignoreparent)
1070 { 1013 {
1071#ifdef SMART_RESIZE 1014#ifdef SMART_RESIZE
1072 /* 1015 /*
… …
1076 int x, y, x1, y1; 1019 int x, y, x1, y1;
1077 int dx, dy; 1020 int dx, dy;
1078 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1021 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1079 Window unused_cr; 1022 Window unused_cr;
1080 1023
1081 XTranslateCoordinates (disp, parent[0], display->root, 1024 XTranslateCoordinates (dpy, parent[0], display->root,
1082 0, 0, &x, &y, &unused_cr); 1025 0, 0, &x, &y, &unused_cr);
1083 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1026 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1084 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1027 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1085 /* 1028 /*
1086 * if display->root isn't the parent window, a WM will probably have offset 1029 * if display->root isn't the parent window, a WM will probably have offset
1087 * our position for handles and decorations. Counter it 1030 * our position for handles and decorations. Counter it
1088 */ 1031 */
… …
1090 { 1033 {
1091 x -= x1; 1034 x -= x1;
1092 y -= y1; 1035 y -= y1;
1093 } 1036 }
1094 1037
1095 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1038 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1096 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1039 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1097 dx = old_width - szHint.width; 1040 dx = old_width - szHint.width;
1098 dy = old_height - szHint.height; 1041 dy = old_height - szHint.height;
1099 1042
1100 /* Check position of the center of the window */ 1043 /* Check position of the center of the window */
1101 if (x < x1) /* left half */ 1044 if (x < x1) /* left half */
1102 dx = 0; 1045 dx = 0;
… …
1105 if (y < y1) /* top half */ 1048 if (y < y1) /* top half */
1106 dy = 0; 1049 dy = 0;
1107 else if (y == y1) /* exact center */ 1050 else if (y == y1) /* exact center */
1108 dy /= 2; 1051 dy /= 2;
1109 1052
1110 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1053 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1111 szHint.width, szHint.height); 1054 szHint.width, szHint.height);
1112#else 1055#else
1113 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1056 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1114#endif 1057#endif
1115 } 1058 }
1059
1060 if (set_hint)
1061 XSetWMNormalHints (dpy, parent[0], &szHint);
1116 1062
1117 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1063 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1118 1064
1119 if (fix_screen || newwidth != old_width || newheight != old_height) 1065 if (fix_screen || newwidth != old_width || newheight != old_height)
1120 { 1066 {
1121 if (scrollBar.state) 1067 if (scrollBar.state)
1122 { 1068 scrollBar.resize ();
1123 XMoveResizeWindow (disp, scrollBar.win,
1124 window_sb_x, 0,
1125 scrollbar_TotalWidth (), szHint.height);
1126 resize_scrollbar ();
1127 }
1128 1069
1129 XMoveResizeWindow (disp, vt, 1070 XMoveResizeWindow (dpy, vt,
1130 window_vt_x, window_vt_y, 1071 window_vt_x, window_vt_y,
1131 width, height); 1072 width, height);
1132 1073
1133 scr_clear (); 1074#ifdef HAVE_BG_PIXMAP
1134#ifdef XPM_BACKGROUND 1075 if (bgPixmap.window_size_sensitive ())
1135 resize_pixmap (); 1076 update_background ();
1136#endif 1077#endif
1137 } 1078 }
1138 1079
1139 if (fix_screen || old_height == 0) 1080 if (fix_screen || old_height == 0)
1140 {
1141 int curr_screen = -1;
1142 int old_ncol = prev_ncol;
1143
1144 /* scr_reset only works on the primary screen */
1145 if (old_height) /* this is not the first time through */
1146 {
1147 unsigned int ocol = ncol;
1148 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1149 curr_screen = scr_change_screen (PRIMARY);
1150 ncol = ocol;
1151 }
1152
1153 scr_reset (); 1081 scr_reset ();
1154 1082
1155 if (curr_screen >= 0) /* this is not the first time through */ 1083#ifdef HAVE_BG_PIXMAP
1156 { 1084// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1157 scr_change_screen (curr_screen); 1085// if (bgPixmap.pixmap)
1158 selection_check (old_ncol != ncol ? 4 : 0);
1159 }
1160 }
1161
1162 old_width = szHint.width;
1163 old_height = szHint.height;
1164
1165#ifdef XPM_BACKGROUND
1166 if (pixmap)
1167 scr_touch (false); 1086// scr_touch (false);
1168#endif 1087#endif
1169 1088
1170#ifdef USE_XIM 1089#ifdef USE_XIM
1171 IMSetStatusPosition (); 1090 IMSetPosition ();
1172#endif 1091#endif
1173} 1092}
1174 1093
1175/* 1094/*
1176 * Set the width/height of the vt window in characters. Units are pixels. 1095 * Set the width/height of the vt window in characters. Units are pixels.
… …
1181{ 1100{
1182 XWindowAttributes wattr; 1101 XWindowAttributes wattr;
1183 1102
1184 if (newwidth == 0 || newheight == 0) 1103 if (newwidth == 0 || newheight == 0)
1185 { 1104 {
1186 XGetWindowAttributes (display->display, display->root, &wattr); 1105 XGetWindowAttributes (dpy, display->root, &wattr);
1187 1106
1188 if (newwidth == 0) 1107 if (newwidth == 0)
1189 newwidth = wattr.width - szHint.base_width; 1108 newwidth = wattr.width - szHint.base_width;
1190 if (newheight == 0) 1109 if (newheight == 0)
1191 newheight = wattr.height - szHint.base_height; 1110 newheight = wattr.height - szHint.base_height;
… …
1205#ifdef USE_XIM 1124#ifdef USE_XIM
1206 1125
1207void 1126void
1208rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1127rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1209{ 1128{
1210 fg = pix_colors[Color_fg]; 1129 fg = pix_colors [Color_fg];
1211 bg = pix_colors[Color_bg]; 1130 bg = pix_colors [Color_bg];
1212} 1131}
1213 1132
1214void 1133void
1215rxvt_term::im_set_size (XRectangle &size) 1134rxvt_term::im_set_size (XRectangle &size)
1216{ 1135{
… …
1239 1158
1240/* Checking whether input method is running. */ 1159/* Checking whether input method is running. */
1241bool 1160bool
1242rxvt_term::IMisRunning () 1161rxvt_term::IMisRunning ()
1243{ 1162{
1244 char *p;
1245 Atom atom; 1163 Atom atom;
1246 Window win; 1164 Window win;
1247 char server[IMBUFSIZ]; 1165 char server[IMBUFSIZ];
1248 1166
1249 /* get current locale modifier */ 1167 /* get current locale modifier */
1250 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1168 if (char *p = XSetLocaleModifiers (0))
1251 { 1169 {
1252 strcpy (server, "@server="); 1170 strcpy (server, "@server=");
1253 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1171 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1254 1172
1255 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1173 if (p = strchr (server + 1, '@')) /* first one only */
1256 *p = '\0'; 1174 *p = '\0';
1257 1175
1258 atom = XInternAtom (display->display, server, False); 1176 atom = XInternAtom (dpy, server, False);
1259 win = XGetSelectionOwner (display->display, atom); 1177 win = XGetSelectionOwner (dpy, atom);
1260 1178
1261 if (win != None) 1179 if (win != None)
1262 return True; 1180 return True;
1263 } 1181 }
1264 1182
… …
1271 XPoint nspot; 1189 XPoint nspot;
1272 XVaNestedList preedit_attr; 1190 XVaNestedList preedit_attr;
1273 1191
1274 if (!Input_Context 1192 if (!Input_Context
1275 || !focus 1193 || !focus
1276 || !(input_style & XIMPreeditPosition)) 1194 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1277 return; 1195 return;
1278 1196
1279 im_set_position (nspot); 1197 im_set_position (nspot);
1280 1198
1281 if (nspot.x == spot.x && nspot.y == spot.y) 1199 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1300 input_method = 0; 1218 input_method = 0;
1301 } 1219 }
1302 1220
1303 Input_Context = 0; 1221 Input_Context = 0;
1304} 1222}
1223
1224#ifdef ENABLE_XIM_ONTHESPOT
1225
1226static void
1227xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1228{
1229 ((rxvt_term *)client_data)->make_current ();
1230 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1231}
1232
1233static void
1234xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1235{
1236 ((rxvt_term *)client_data)->make_current ();
1237 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1238}
1239
1240static void
1241xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1242{
1243 rxvt_term *term = (rxvt_term *)client_data;
1244 XIMText *text = call_data->text;
1245
1246 term->make_current ();
1247
1248 if (text)
1249 {
1250 wchar_t *str;
1251
1252 if (!text->encoding_is_wchar && text->string.multi_byte)
1253 {
1254 // of course, X makes it ugly again
1255 if (term->rs[Rs_imLocale])
1256 SET_LOCALE (term->rs[Rs_imLocale]);
1257
1258 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1259 mbstowcs (str, text->string.multi_byte, text->length + 1);
1260
1261 if (term->rs[Rs_imLocale])
1262 SET_LOCALE (term->locale);
1263 }
1264 else
1265 str = text->string.wide_char;
1266
1267 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1268 DT_INT, call_data->caret,
1269 DT_INT, call_data->chg_first,
1270 DT_INT, call_data->chg_length,
1271 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1272 DT_WCS_LEN, str, str ? (int)text->length : 0,
1273 DT_END));
1274 }
1275 else
1276 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1277 DT_INT, call_data->caret,
1278 DT_INT, call_data->chg_first,
1279 DT_INT, call_data->chg_length,
1280 DT_END));
1281}
1282
1283#if 0
1284static void
1285xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1286{
1287 ((rxvt_term *)client_data)->make_current ();
1288 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1289 DT_INT, call_data->position,
1290 DT_INT, call_data->direction,
1291 DT_INT, call_data->style,
1292 DT_END));
1293}
1294#endif
1295
1296#endif
1305 1297
1306/* 1298/*
1307 * Try to open a XIM with the current modifiers, then see if we can 1299 * Try to open a XIM with the current modifiers, then see if we can
1308 * open a suitable preedit type 1300 * open a suitable preedit type
1309 */ 1301 */
… …
1316 XRectangle rect, status_rect, needed_rect; 1308 XRectangle rect, status_rect, needed_rect;
1317 unsigned long fg, bg; 1309 unsigned long fg, bg;
1318 const char *p; 1310 const char *p;
1319 char **s; 1311 char **s;
1320 XIMStyles *xim_styles; 1312 XIMStyles *xim_styles;
1313#ifdef ENABLE_XIM_ONTHESPOT
1314 XIMCallback xcb[4];
1315#endif
1321 1316
1322 set_environ (envv); 1317 set_environ (envv);
1323 1318
1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1325 return false; 1320 return false;
1326 1321
1327 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1328 input_method = display->get_xim (locale, modifiers); 1322 input_method = display->get_xim (locale, modifiers);
1329 if (input_method == NULL) 1323 if (input_method == NULL)
1330 return false; 1324 return false;
1331 1325
1332 xim = input_method->xim; 1326 xim = input_method->xim;
… …
1352 s = rxvt_splitcommastring (p); 1346 s = rxvt_splitcommastring (p);
1353 1347
1354 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1355 { 1349 {
1356 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1357 input_style = (XIMPreeditPosition | XIMStatusNothing); 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
1358 else if (!strcmp (s[i], "OffTheSpot")) 1352 else if (!strcmp (s[i], "OffTheSpot"))
1359 input_style = (XIMPreeditArea | XIMStatusArea); 1353 input_style = XIMPreeditArea | XIMStatusArea;
1360 else if (!strcmp (s[i], "Root")) 1354 else if (!strcmp (s[i], "Root"))
1361 input_style = (XIMPreeditNothing | XIMStatusNothing); 1355 input_style = XIMPreeditNothing | XIMStatusNothing;
1362 else if (!strcmp (s[i], "None")) 1356 else if (!strcmp (s[i], "None"))
1363 input_style = (XIMPreeditNone | XIMStatusNone); 1357 input_style = XIMPreeditNone | XIMStatusNone;
1358#ifdef ENABLE_XIM_ONTHESPOT
1359 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1360 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1361#endif
1362 else
1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 1364
1365 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1366 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1367 { 1367 {
1368 rxvt_freecommastring (s); 1368 rxvt_freecommastring (s);
… …
1406 "*", 1406 "*",
1407 fheight, 1407 fheight,
1408 fheight + 1, fheight - 1, 1408 fheight + 1, fheight - 1,
1409 fheight - 2, fheight + 2); 1409 fheight - 2, fheight + 2);
1410 1410
1411 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1411 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1412 &missing_charset_list, &missing_charset_count, &def_string); 1412 &missing_charset_list, &missing_charset_count, &def_string);
1413 1413
1414 if (missing_charset_list) 1414 if (missing_charset_list)
1415 XFreeStringList (missing_charset_list); 1415 XFreeStringList (missing_charset_list);
1416 1416
… …
1457 XNBackground, bg, 1457 XNBackground, bg,
1458 XNArea, &status_rect, 1458 XNArea, &status_rect,
1459 XNFontSet, fs, 1459 XNFontSet, fs,
1460 NULL); 1460 NULL);
1461 } 1461 }
1462#if ENABLE_XIM_ONTHESPOT
1463 else if (input_style & XIMPreeditCallbacks)
1464 {
1465 im_set_position (spot);
1466
1467 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1468 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1469 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1470# if 0
1471 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1472# endif
1473
1474 preedit_attr = XVaCreateNestedList (0,
1475 XNSpotLocation, &spot,
1476 XNPreeditStartCallback, &xcb[0],
1477 XNPreeditDoneCallback , &xcb[1],
1478 XNPreeditDrawCallback , &xcb[2],
1479# if 0
1480 XNPreeditCaretCallback, &xcb[3],
1481# endif
1482 NULL);
1483 }
1484#endif
1462 1485
1463 Input_Context = XCreateIC (xim, 1486 Input_Context = XCreateIC (xim,
1464 XNInputStyle, input_style, 1487 XNInputStyle, input_style,
1465 XNClientWindow, vt, 1488 XNClientWindow, vt,
1466 XNFocusWindow, parent[0], 1489 XNFocusWindow, parent[0],
… …
1468 preedit_attr, 1491 preedit_attr,
1469 status_attr ? XNStatusAttributes : NULL, 1492 status_attr ? XNStatusAttributes : NULL,
1470 status_attr, NULL); 1493 status_attr, NULL);
1471 1494
1472 if (preedit_attr) XFree (preedit_attr); 1495 if (preedit_attr) XFree (preedit_attr);
1473 if (status_attr) XFree (status_attr); 1496 if (status_attr) XFree (status_attr);
1474 if (fs) XFreeFontSet (display->display, fs); 1497 if (fs) XFreeFontSet (dpy, fs);
1475 1498
1476 if (Input_Context == NULL) 1499 if (Input_Context == NULL)
1477 { 1500 {
1478 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1501 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1479 im_destroy (); 1502 im_destroy ();
1480 return false; 1503 return false;
1481 } 1504 }
1482 1505
1483 if (input_style & XIMPreeditArea) 1506#if 0
1507 // unfortunately, only the focus window is used by XIM, hard to fix
1508 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1509 vt_select_input ();
1510#endif
1511
1484 IMSetStatusPosition (); 1512 IMSetPosition ();
1485 1513
1486 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1487 return true; 1514 return true;
1488} 1515}
1489 1516
1490void 1517void
1491rxvt_term::im_cb () 1518rxvt_term::im_cb ()
… …
1497 1524
1498 make_current (); 1525 make_current ();
1499 1526
1500 im_destroy (); 1527 im_destroy ();
1501 1528
1502 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1503 if (Input_Context) 1529 if (Input_Context)
1504 return; 1530 return;
1505 1531
1506#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1532#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1507 if (rs[Rs_imLocale]) 1533 if (rs[Rs_imLocale])
… …
1549 SET_LOCALE (locale); 1575 SET_LOCALE (locale);
1550#endif 1576#endif
1551} 1577}
1552 1578
1553void 1579void
1554rxvt_term::IMSetStatusPosition () 1580rxvt_term::IMSetPosition ()
1555{ 1581{
1556 XRectangle preedit_rect, status_rect, *needed_rect; 1582 XRectangle preedit_rect, status_rect, *needed_rect;
1557 XVaNestedList preedit_attr, status_attr; 1583 XVaNestedList preedit_attr, status_attr;
1558 1584
1559 if (!Input_Context 1585 if (!Input_Context
1560 || !focus 1586 || !focus
1561 || !(input_style & XIMPreeditArea) 1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1562 || !IMisRunning ()) 1588 || !IMisRunning ())
1563 return; 1589 return;
1564 1590
1591 if (input_style & XIMPreeditPosition)
1592 {
1593 im_set_size (preedit_rect);
1594 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1595
1596 XSetICValues (Input_Context,
1597 XNPreeditAttributes, preedit_attr, NULL);
1598 }
1599 else
1600 {
1565 /* Getting the necessary width of preedit area */ 1601 /* Getting the necessary width of preedit area */
1566 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1602 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1567 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1603 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1568 XFree (status_attr); 1604 XFree (status_attr);
1569 1605
1570 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1606 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1571 XFree (needed_rect); 1607 XFree (needed_rect);
1572 1608
1573 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1609 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1574 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1610 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1575 1611
1576 XSetICValues (Input_Context, 1612 XSetICValues (Input_Context,
1577 XNPreeditAttributes, preedit_attr, 1613 XNPreeditAttributes, preedit_attr,
1578 XNStatusAttributes, status_attr, NULL); 1614 XNStatusAttributes, status_attr,
1615 NULL);
1579 1616
1617 XFree (status_attr);
1618 }
1619
1580 XFree (preedit_attr); 1620 XFree (preedit_attr);
1581 XFree (status_attr);
1582} 1621}
1583#endif /* USE_XIM */ 1622#endif /* USE_XIM */
1623
1624void
1625rxvt_term::get_window_origin (int &x, int &y)
1626{
1627 Window cr;
1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1629}
1630
1631Pixmap
1632rxvt_term::get_pixmap_property (int prop_id)
1633{
1634 if (prop_id > 0 && prop_id < NUM_XA)
1635 if (xa[prop_id])
1636 {
1637 int aformat;
1638 unsigned long nitems, bytes_after;
1639 Atom atype;
1640 unsigned char *prop = NULL;
1641 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1643 &nitems, &bytes_after, &prop);
1644 if (result == Success && prop && atype == XA_PIXMAP)
1645 return *(Pixmap *)prop;
1646 }
1647
1648 return None;
1649}
1650
1651#ifdef HAVE_BG_PIXMAP
1652
1653void
1654rxvt_term::update_background ()
1655{
1656 if (update_background_ev.is_active ())
1657 return;
1658
1659 bgPixmap.invalidate ();
1660
1661 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1662
1663 if (to_wait <= 0.)
1664 bgPixmap.render ();
1665 else
1666 update_background_ev.start (to_wait);
1667}
1668
1669void
1670rxvt_term::update_background_cb (ev::timer &w, int revents)
1671{
1672 make_current ();
1673
1674 update_background_ev.stop ();
1675 bgPixmap.render ();
1676 refresh_check ();
1677}
1678
1679#endif /* HAVE_BG_PIXMAP */
1584 1680
1585/*----------------------- end-of-file (C source) -----------------------*/ 1681/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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