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.148 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.316 by root, Sun Apr 26 01:51:20 2009 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-2004 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 "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
35 39
36#include <csignal> 40#include <csignal>
37#include <cstring> 41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT
40# include <grp.h>
41#endif
42
43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
45#endif 51# endif
46
47#ifdef KEYSYM_RESOURCE
48# include "keyboard.h"
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
56// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term;
58
53static char curlocale[128]; 59static char curlocale[128], savelocale[128];
54 60
55bool 61bool
56rxvt_set_locale (const char *locale) 62rxvt_set_locale (const char *locale) NOTHROW
57{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
58 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
59 return false; 70 return false;
60 71
61 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
62 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
63 return true; 74 return true;
64} 75}
65 76
77void
78rxvt_push_locale (const char *locale) NOTHROW
79{
80 strcpy (savelocale, curlocale);
81 rxvt_set_locale (locale);
82}
83
84void
85rxvt_pop_locale () NOTHROW
86{
87 rxvt_set_locale (savelocale);
88}
89
66#if ENABLE_COMBINING 90#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
68 92
69text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
70{ 94{
71 compose_char *cc; 95 compose_char *cc;
72 96
73 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
74 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
75 cc = (*this)[c1]; 99 cc = (*this)[c1];
76 while (cc) 100 while (cc)
77 { 101 {
… …
126 150
127} 151}
128#endif 152#endif
129 153
130rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
131 : 155{
132#if TRANSPARENT 156#if HAVE_BG_PIXMAP
133 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
134#endif
135#ifdef HAVE_SCROLLBARS
136 scrollbar_ev (this, &rxvt_term::x_cb),
137#endif
138#ifdef MENUBAR
139 menubar_ev (this, &rxvt_term::x_cb),
140#endif 158#endif
141#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
142 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
143#endif 161#endif
144#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
145 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
146#endif 164#endif
147#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
148 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
149#endif 167#endif
150#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
151 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
152#endif 170#endif
153#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
154 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
155#endif 180#endif
156#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
157 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
158#endif 183#endif
159#ifdef USE_XIM 184#ifndef NO_BELL
160 im_ev (this, &rxvt_term::im_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
161#endif 186#endif
162 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
163 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
164 check_ev (this, &rxvt_term::check_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
165 flush_ev (this, &rxvt_term::flush_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
166 destroy_ev (this, &rxvt_term::destroy_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
167 pty_ev (this, &rxvt_term::pty_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
168 incr_ev (this, &rxvt_term::incr_cb) 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
169{ 194
170 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
171 196
172 termlist.push_back (this); 197 termlist.push_back (this);
173 198
174#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
175 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
176
177 if (!keyboard)
178 rxvt_fatal ("out of memory, aborting.\n");
179#endif 201#endif
180} 202}
181 203
182// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
183// for use before an emergency exit 205// for use before an emergency exit
206void
184void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
185{ 208{
186 if (cmd_pid) 209 if (cmd_pid)
187 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
188 211
189#ifdef UTMP_SUPPORT 212 pty_ev.stop ();
190 privileged_utmp (RESTORE); 213 delete pty; pty = 0;
191#endif
192
193 pty.put ();
194} 214}
195 215
196rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
197{ 217{
198 termlist.erase (find (termlist.begin (), termlist.end(), this)); 218 termlist.erase (find (termlist.begin (), termlist.end(), this));
199 219
200 emergency_cleanup (); 220 emergency_cleanup ();
201 221
202#if ENABLE_STYLES 222#if ENABLE_STYLES
203 for (int i = RS_styleCount; --i; ) 223 for (int i = RS_styleCount; --i; )
204 if (TermWin.fontset[i] != TermWin.fontset[0]) 224 if (fontset[i] != fontset[0])
205 delete TermWin.fontset[i]; 225 delete fontset[i];
206#endif 226#endif
207 delete TermWin.fontset[0]; 227 delete fontset[0];
228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif
208 238
209 if (display) 239 if (display)
210 { 240 {
211 dDisp;
212
213 selection_clear (); 241 selection_clear ();
214 242
215#ifdef USE_XIM 243#ifdef USE_XIM
216 im_destroy (); 244 im_destroy ();
217#endif 245#endif
218#ifdef MENUBAR 246 scrollBar.destroy ();
219 if (menubarGC) XFreeGC (disp, menubarGC);
220#endif
221#ifdef XTERM_SCROLLBAR
222 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
223 if (ShadowGC) XFreeGC (disp, ShadowGC);
224#endif
225#ifdef PLAIN_SCROLLBAR
226 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
227#endif
228#ifdef NEXT_SCROLLBAR
229 if (blackGC) XFreeGC (disp, blackGC);
230 if (whiteGC) XFreeGC (disp, whiteGC);
231 if (grayGC) XFreeGC (disp, grayGC);
232 if (darkGC) XFreeGC (disp, darkGC);
233 if (stippleGC) XFreeGC (disp, stippleGC);
234 if (dimple) XFreePixmap (disp, dimple);
235 if (upArrow) XFreePixmap (disp, upArrow);
236 if (downArrow) XFreePixmap (disp, downArrow);
237 if (upArrowHi) XFreePixmap (disp, upArrowHi);
238 if (downArrowHi) XFreePixmap (disp, downArrowHi);
239#endif
240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
241 if (topShadowGC) XFreeGC (disp, topShadowGC);
242 if (botShadowGC) XFreeGC (disp, botShadowGC);
243 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
244#endif
245 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 247 if (gc) XFreeGC (dpy, gc);
246 248
247#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248 delete menuBar.drawable; 249 delete drawable;
249 //if (menuBar.win)
250 // XDestroyWindow (disp, menuBar.win);
251#endif
252 delete TermWin.drawable;
253 // destroy all windows 250 // destroy all windows
254 if (TermWin.parent[0]) 251 if (parent[0])
255 XDestroyWindow (disp, TermWin.parent[0]); 252 XDestroyWindow (dpy, parent[0]);
256 }
257 253
258 // TODO: free pixcolours, colours should become part of rxvt_display 254 for (int i = 0; i < TOTAL_COLORS; i++)
259 255 if (ISSET_PIXCOLOR (i))
260 delete pix_colors_focused; 256 {
257 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
262 delete pix_colors_unfocused; 259 pix_colors_unfocused [i].free (this);
263#endif 260#endif
261 }
264 262
263 clear ();
264
265 display->flush (); /* ideally .put should do this */
265 displays.put (display); 266 displays.put (display);
267 }
266 268
267 scr_release (); 269 scr_release ();
268 270
269 /* clear all resources */ 271 /* clear all resources */
270 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
271 free (allocated [i]); 273 free (allocated [i]);
272 274
273 free (selection.text); 275 free (selection.text);
274 // TODO: manage env vars in child only(!) 276 // TODO: manage env vars in child only(!)
275 free (env_windowid);
276 free (env_display); 277 free (env_display);
277 free (env_term); 278 free (env_term);
278 free (env_colorfgbg);
279 free (locale); 279 free (locale);
280 free (v_buffer); 280 free (v_buffer);
281 free (incr_buf); 281 free (incr_buf);
282 282
283 delete envv; 283 delete envv;
284 delete argv; 284 delete argv;
285 285
286#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
287 delete keyboard; 287 delete keyboard;
288#endif 288#endif
289#ifndef NO_RESOURCES
290 XrmDestroyDatabase (option_db);
291#endif
292}
293
294// child has exited, usually destroys
295void
296rxvt_term::child_cb (ev::child &w, int status)
297{
298 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
299
300 cmd_pid = 0;
301
302 if (!option (Opt_hold))
303 destroy ();
289} 304}
290 305
291void 306void
292rxvt_term::destroy () 307rxvt_term::destroy ()
293{ 308{
294 if (destroy_ev.active) 309 if (destroy_ev.is_active ())
295 return; 310 return;
311
312 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
296 313
297#if ENABLE_OVERLAY 314#if ENABLE_OVERLAY
298 scr_overlay_off (); 315 scr_overlay_off ();
299#endif 316#endif
300 317
301 if (display) 318 if (display)
302 { 319 {
303#if USE_XIM 320#if USE_XIM
304 im_ev.stop (display); 321 im_ev.stop (display);
305#endif 322#endif
306#if HAVE_SCROLLBARS
307 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
308#endif 324#if ENABLE_TRANSPARENCY || ENABLE_PERL
309#if MENUBAR
310 menubar_ev.stop (display);
311#endif
312#if TRANSPARENT
313 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
314#endif 326#endif
315 incr_ev.stop (); 327 incr_ev.stop ();
316 termwin_ev.stop (display); 328 termwin_ev.stop (display);
317 vt_ev.stop (display); 329 vt_ev.stop (display);
318 } 330 }
319 331
320 check_ev.stop (); 332 flush_ev.stop ();
321 pty_ev.stop (); 333 pty_ev.stop ();
322#ifdef CURSOR_BLINK 334#ifdef CURSOR_BLINK
323 cursor_blink_ev.stop (); 335 cursor_blink_ev.stop ();
324#endif 336#endif
325#ifdef TEXT_BLINK 337#ifdef TEXT_BLINK
… …
333#endif 345#endif
334#ifdef POINTER_BLANK 346#ifdef POINTER_BLANK
335 pointer_ev.stop (); 347 pointer_ev.stop ();
336#endif 348#endif
337 349
338 destroy_ev.start (0); 350 destroy_ev.start ();
339} 351}
340 352
341void 353void
342rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (ev::idle &w, int revents)
343{ 355{
344 SET_R (this); 356 make_current ();
345 357
346 delete this; 358 delete this;
347} 359}
348 360
349/*----------------------------------------------------------------------*/ 361/*----------------------------------------------------------------------*/
… …
358{ 370{
359 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
360 (*t)->emergency_cleanup (); 372 (*t)->emergency_cleanup ();
361} 373}
362 374
363#if ENABLE_FRILLS 375#if !ENABLE_MINIMAL
364static void 376static void
365print_x_error (Display *dpy, XErrorEvent *event) 377print_x_error (Display *dpy, XErrorEvent *event)
366{ 378{
367 char buffer[BUFSIZ]; 379 char buffer[BUFSIZ];
368 char mesg[BUFSIZ]; 380 char mesg[BUFSIZ];
… …
401 else 413 else
402 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
403 mesg, BUFSIZ); 415 mesg, BUFSIZ);
404 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
405 } 417 }
406 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
407 mesg, BUFSIZ); 419 mesg, BUFSIZ);
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
409} 421}
410#endif 422#endif
411 423
… …
416 GET_R->allowedxerror = event->error_code; 428 GET_R->allowedxerror = event->error_code;
417 else 429 else
418 { 430 {
419 // GET_R is most likely not the terminal which caused the error, 431 // GET_R is most likely not the terminal which caused the error,
420 // so just output the error and continue 432 // so just output the error and continue
421#if ENABLE_FRILLS 433#if ENABLE_MINIMAL
434 old_xerror_handler (display, event);
435#else
422 print_x_error (display, event); 436 print_x_error (display, event);
423#else
424 old_xerror_handler (display, event);
425#endif 437#endif
426 } 438 }
427 439
428 return 0; 440 return 0;
429} 441}
… …
435 DisplayString (display)); 447 DisplayString (display));
436 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
437 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
438} 450}
439 451
440/*----------------------------------------------------------------------*/
441bool
442rxvt_term::init (int argc, const char *const *argv)
443{
444 SET_R (this);
445
446 set_locale ("");
447
448 if (!init_vars ())
449 return false;
450
451 init_secondary ();
452
453 const char **cmd_argv = init_resources (argc, argv);
454
455#ifdef KEYSYM_RESOURCE
456 keyboard->register_done ();
457#endif
458
459#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]);
461#endif
462#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar)
464 scrollBar.setIdle (); /* set existence for size calculations */
465#endif
466
467 create_windows (argc, argv);
468
469 dDisp;
470
471 init_xlocale ();
472
473 scr_reset (); /* initialize screen */
474
475#if 0
476 XSynchronize (disp, True);
477#endif
478
479#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar)
481 resize_scrollbar (); /* create and map scrollbar */
482#endif
483#if (MENUBAR_MAX)
484 if (menubar_visible ())
485 XMapWindow (disp, menuBar.win);
486#endif
487#ifdef TRANSPARENT
488 if (options & Opt_transparent)
489 {
490 XSelectInput (disp, display->root, PropertyChangeMask);
491 check_our_parents ();
492 rootwin_ev.start (display, display->root);
493 }
494#endif
495
496 XMapWindow (disp, TermWin.vt);
497 XMapWindow (disp, TermWin.parent[0]);
498
499 set_colorfgbg ();
500
501 init_command (cmd_argv);
502
503 free (cmd_argv);
504
505 pty_ev.start (pty.pty, EVENT_READ);
506
507 check_ev.start ();
508
509 return true;
510}
511
512static struct sig_handlers 452static struct sig_handlers
513{ 453{
514 sig_watcher sw_chld, sw_term, sw_int; 454 ev::sig sw_term, sw_int;
515
516 void sig_chld (sig_watcher &w)
517 {
518 // we are being called for every SIGCHLD, find the corresponding term
519 int pid;
520
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid)
524 {
525 (*t)->destroy ();
526 break;
527 }
528 }
529 455
530 /* 456 /*
531 * Catch a fatal signal and tidy up before quitting 457 * Catch a fatal signal and tidy up before quitting
532 */ 458 */
533 void 459 void sig_term (ev::sig &w, int revents);
534 sig_term (sig_watcher &w) 460
461 sig_handlers ()
535 { 462 {
536#ifdef DEBUG_CMD
537 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
538#endif
539 rxvt_emergency_cleanup ();
540 signal (w.signum, SIG_DFL);
541 kill (getpid (), w.signum);
542 }
543
544 sig_handlers ()
545 : sw_chld (this, &sig_handlers::sig_chld),
546 sw_term (this, &sig_handlers::sig_term), 463 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
547 sw_int (this, &sig_handlers::sig_term) 464 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
548 {
549 } 465 }
550} sig_handlers; 466} sig_handlers;
551 467
552void 468void
469sig_handlers::sig_term (ev::sig &w, int revents)
470{
471 rxvt_emergency_cleanup ();
472 w.stop ();
473 kill (getpid (), w.signum);
474}
475
476char **rxvt_environ; // startup environment
477
478void
553rxvt_init () 479rxvt_init ()
554{ 480{
555 /* 481 ptytty::init ();
556 * Save and then give up any super-user privileges 482
557 * If we need privileges in any area then we must specifically request it. 483 if (!ev_default_loop (0))
558 * We should only need to be root in these cases: 484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
559 * 1. write utmp entries on some systems 485
560 * 2. chown tty on some systems 486 rxvt_environ = environ;
561 */
562 rxvt_privileges (SAVE);
563 rxvt_privileges (IGNORE);
564 487
565 signal (SIGHUP, SIG_IGN); 488 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN); 489 signal (SIGPIPE, SIG_IGN);
567 490
568 sig_handlers.sw_chld.start (SIGCHLD);
569 sig_handlers.sw_term.start (SIGTERM); 491 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
570 sig_handlers.sw_int.start (SIGINT); 492 sig_handlers.sw_int.start (SIGINT); ev_unref ();
571 493
572 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
573 /* signal (SIGURG, SIG_DFL); */ 495 /* signal (SIGURG, SIG_DFL); */
574 496
575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss 498 // TODO: handle this with exceptions and tolerate the memory loss
577 XSetIOErrorHandler (rxvt_xioerror_handler); 499 XSetIOErrorHandler (rxvt_xioerror_handler);
578}
579 500
580/* ------------------------------------------------------------------------- * 501 XrmInitialize ();
581 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */
583void *
584rxvt_malloc (size_t size)
585{
586 void *p = malloc (size);
587
588 if (!p)
589 rxvt_fatal ("memory allocation failure. aborting.\n");
590
591 return p;
592} 502}
593
594void *
595rxvt_calloc (size_t number, size_t size)
596{
597 void *p = calloc (number, size);
598
599 if (!p)
600 rxvt_fatal ("memory allocation failure. aborting.\n");
601
602 return p;
603}
604
605void *
606rxvt_realloc (void *ptr, size_t size)
607{
608 void *p = realloc (ptr, size);
609
610 if (!p)
611 rxvt_fatal ("memory allocation failure. aborting.\n");
612
613 return p;
614}
615
616/* ------------------------------------------------------------------------- *
617 * PRIVILEGED OPERATIONS *
618 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */
620void
621rxvt_privileges (rxvt_privaction action)
622{
623#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
624 static uid_t euid;
625 static gid_t egid;
626#endif
627
628#if ! defined(__CYGWIN32__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a))
633# define HAVE_SETEUID
634# endif
635# ifdef HAVE_SETEUID
636 switch (action)
637 {
638 case IGNORE:
639 /*
640 * change effective uid/gid - not real uid/gid - so we can switch
641 * back to root later, as required
642 */
643 seteuid (getuid ());
644 setegid (getgid ());
645 break;
646 case SAVE:
647 euid = geteuid ();
648 egid = getegid ();
649 break;
650 case RESTORE:
651 seteuid (euid);
652 setegid (egid);
653 break;
654 }
655# else
656 switch (action)
657 {
658 case IGNORE:
659 setuid (getuid ());
660 setgid (getgid ());
661 /* FALLTHROUGH */
662 case SAVE:
663 /* FALLTHROUGH */
664 case RESTORE:
665 break;
666 }
667# endif
668#endif
669}
670
671#ifdef UTMP_SUPPORT
672void
673rxvt_term::privileged_utmp (rxvt_privaction action)
674{
675 if ((options & Opt_utmpInhibit)
676 || !pty.name || !*pty.name)
677 return;
678
679 rxvt_privileges (RESTORE);
680
681 if (action == SAVE)
682 makeutent (pty.name, rs[Rs_display_name]);
683 else
684 cleanutent ();
685
686 rxvt_privileges (IGNORE);
687}
688#endif
689 503
690/*----------------------------------------------------------------------*/ 504/*----------------------------------------------------------------------*/
691/* 505/*
692 * window size/position calculcations for XSizeHint and other storage. 506 * window size/position calculations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 507 * if width/height are non-zero then override calculated width/height
694 */ 508 */
695void 509void
696rxvt_term::window_calc (unsigned int width, unsigned int height) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 511{
698 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 513 int x, y, flags;
700 unsigned int w, h; 514 unsigned int w, h;
701 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
702 dDisp;
703 516
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705 TermWin.ncol, TermWin.nrow, szHint.width,
706 szHint.height));
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 519 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 520
711 recalc_x = recalc_y = 0; 521 recalc_x = recalc_y = 0;
712 flags = 0; 522 flags = 0;
523
713 if (!parsed_geometry) 524 if (!parsed_geometry)
714 { 525 {
715 parsed_geometry = 1; 526 parsed_geometry = 1;
527
716 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718 530
719 if (flags & WidthValue) 531 if (flags & WidthValue)
720 { 532 {
721 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 537 szHint.flags |= USSize;
723 } 538 }
724 539
725 if (flags & HeightValue) 540 if (flags & HeightValue)
726 { 541 {
727 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
728 szHint.flags |= USSize; 546 szHint.flags |= USSize;
729 } 547 }
730 548
731 if (flags & XValue) 549 if (flags & XValue)
732 { 550 {
733 szHint.x = x; 551 szHint.x = x;
734 szHint.flags |= USPosition; 552 szHint.flags |= USPosition;
553
735 if (flags & XNegative) 554 if (flags & XNegative)
736 { 555 {
737 recalc_x = 1; 556 recalc_x = 1;
738 szHint.win_gravity = NorthEastGravity; 557 szHint.win_gravity = NorthEastGravity;
739 } 558 }
… …
741 560
742 if (flags & YValue) 561 if (flags & YValue)
743 { 562 {
744 szHint.y = y; 563 szHint.y = y;
745 szHint.flags |= USPosition; 564 szHint.flags |= USPosition;
565
746 if (flags & YNegative) 566 if (flags & YNegative)
747 { 567 {
748 recalc_y = 1; 568 recalc_y = 1;
569
749 if (szHint.win_gravity == NorthEastGravity) 570 if (szHint.win_gravity == NorthEastGravity)
750 szHint.win_gravity = SouthEastGravity; 571 szHint.win_gravity = SouthEastGravity;
751 else 572 else
752 szHint.win_gravity = SouthWestGravity; 573 szHint.win_gravity = SouthWestGravity;
753 } 574 }
754 } 575 }
755 } 576 }
756 577
757 /* TODO: BOUNDS */ 578 /* TODO: BOUNDS */
758 TermWin.width = TermWin.ncol * TermWin.fwidth; 579 width = ncol * fwidth;
759 TermWin.height = TermWin.nrow * TermWin.fheight; 580 height = nrow * fheight;
760 max_width = MAX_COLS * TermWin.fwidth; 581 max_width = MAX_COLS * fwidth;
761 max_height = MAX_ROWS * TermWin.fheight; 582 max_height = MAX_ROWS * fheight;
762 583
763 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
764 585
765 sb_w = mb_h = 0;
766 window_vt_x = window_vt_y = TermWin.int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
767 587
768 if (scrollbar_visible ()) 588 if (scrollBar.state)
769 { 589 {
770 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
771 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
592
772 if (!(options & Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
773 window_vt_x += sb_w; 594 window_vt_x += sb_w;
774 } 595 }
775 596
776 if (menubar_visible ())
777 {
778 mb_h = menuBar_TotalHeight ();
779 szHint.base_height += mb_h;
780 window_vt_y += mb_h;
781 }
782
783 szHint.width_inc = TermWin.fwidth; 597 szHint.width_inc = fwidth;
784 szHint.height_inc = TermWin.fheight; 598 szHint.height_inc = fheight;
785 szHint.min_width = szHint.base_width + szHint.width_inc; 599 szHint.min_width = szHint.base_width + szHint.width_inc;
786 szHint.min_height = szHint.base_height + szHint.height_inc; 600 szHint.min_height = szHint.base_height + szHint.height_inc;
787 601
788 if (width && width - szHint.base_width < max_width) 602 if (newwidth && newwidth - szHint.base_width < max_width)
789 { 603 {
790 szHint.width = width; 604 szHint.width = newwidth;
791 TermWin.width = width - szHint.base_width; 605 width = newwidth - szHint.base_width;
792 } 606 }
793 else 607 else
794 { 608 {
795 MIN_IT (TermWin.width, max_width); 609 min_it (width, max_width);
796 szHint.width = szHint.base_width + TermWin.width; 610 szHint.width = szHint.base_width + width;
797 } 611 }
798 612
799 if (height && height - szHint.base_height < max_height) 613 if (newheight && newheight - szHint.base_height < max_height)
800 { 614 {
801 szHint.height = height; 615 szHint.height = newheight;
802 TermWin.height = height - szHint.base_height; 616 height = newheight - szHint.base_height;
803 } 617 }
804 else 618 else
805 { 619 {
806 MIN_IT (TermWin.height, max_height); 620 min_it (height, max_height);
807 szHint.height = szHint.base_height + TermWin.height; 621 szHint.height = szHint.base_height + height;
808 } 622 }
809
810 if (scrollbar_visible () && (options & Opt_scrollBar_right))
811 window_sb_x = szHint.width - sb_w;
812 623
813 if (recalc_x) 624 if (recalc_x)
814 szHint.x += (DisplayWidth (disp, display->screen) 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
815 - szHint.width - 2 * TermWin.ext_bwidth); 626
816 if (recalc_y) 627 if (recalc_y)
817 szHint.y += (DisplayHeight (disp, display->screen) 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
818 - szHint.height - 2 * TermWin.ext_bwidth);
819 629
820 TermWin.ncol = TermWin.width / TermWin.fwidth; 630 ncol = width / fwidth;
821 TermWin.nrow = TermWin.height / TermWin.fheight; 631 nrow = height / fheight;
822 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823 TermWin.ncol, TermWin.nrow, szHint.width,
824 szHint.height));
825 return;
826} 632}
827 633
828/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
829/* 635/*
830 * Tell the teletype handler what size the window is. 636 * Tell the teletype handler what size the window is.
831 * Called after a window size change. 637 * Called after a window size change.
832 */ 638 */
833void 639void
834rxvt_term::tt_winch () 640rxvt_term::tt_winch ()
835{ 641{
836 if (pty.pty < 0) 642 if (pty->pty < 0)
837 return; 643 return;
838 644
839 struct winsize ws; 645 struct winsize ws;
840 646
841 ws.ws_col = TermWin.ncol; 647 ws.ws_col = ncol;
842 ws.ws_row = TermWin.nrow; 648 ws.ws_row = nrow;
843 ws.ws_xpixel = TermWin.width; 649 ws.ws_xpixel = width;
844 ws.ws_ypixel = TermWin.height; 650 ws.ws_ypixel = height;
845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
846 652
847#if 0 653#if 0
848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 654 // TIOCSWINSZ is supposed to do this automatically and correctly
849 if (cmd_pid) /* force through to the command */ 655 if (cmd_pid) /* force through to the command */
850 kill (-cmd_pid, SIGWINCH); 656 kill (-cmd_pid, SIGWINCH);
851#endif 657#endif
852} 658}
853 659
… …
873 return false; 679 return false;
874 } 680 }
875 681
876#if ENABLE_STYLES 682#if ENABLE_STYLES
877 for (int i = RS_styleCount; --i; ) 683 for (int i = RS_styleCount; --i; )
878 if (TermWin.fontset[i] != TermWin.fontset[0]) 684 if (fontset[i] != fontset[0])
879 delete TermWin.fontset[i]; 685 delete fontset[i];
880#endif 686#endif
881 687
882 delete TermWin.fontset[0]; 688 delete fontset[0];
883 TermWin.fontset[0] = fs; 689 fontset[0] = fs;
884 690
885 prop = (*fs)[1]->properties (); 691 prop = (*fs)[1]->properties ();
886 prop.height += TermWin.lineSpace; 692 prop.height += lineSpace;
693
887 fs->set_prop (prop); 694 fs->set_prop (prop, false);
888 695
889 TermWin.fwidth = prop.width; 696 fwidth = prop.width;
890 TermWin.fheight = prop.height; 697 fheight = prop.height;
891 TermWin.fweight = prop.weight; 698 fbase = prop.ascent;
892 TermWin.fslant = prop.slant;
893 TermWin.fbase = (*fs)[1]->ascent;
894 699
895 for (int style = 1; style < 4; style++) 700 for (int style = 1; style < 4; style++)
896 { 701 {
897#if ENABLE_STYLES 702#if ENABLE_STYLES
898 const char *res = rs[Rs_font + style]; 703 const char *res = rs[Rs_font + style];
899 704
900 if (res && !*res) 705 if (res && !*res)
901 TermWin.fontset[style] = TermWin.fontset[0]; 706 fontset[style] = fontset[0];
902 else 707 else
903 { 708 {
904 TermWin.fontset[style] = fs = new rxvt_fontset (this); 709 fontset[style] = fs = new rxvt_fontset (this);
905 rxvt_fontprop prop2 = prop; 710 rxvt_fontprop prop2 = prop;
906 711
907 if (res) 712 if (res)
908 prop2.weight = prop2.slant = rxvt_fontprop::unset; 713 {
714 fs->populate (res);
715 fs->set_prop (prop2, false);
716 }
909 else 717 else
910 { 718 {
911 res = TermWin.fontset[0]->fontdesc; 719 fs->populate (fontset[0]->fontdesc);
912 720
913 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 721 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
914 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 722 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
723
724 fs->set_prop (prop2, true);
915 } 725 }
916 726
917 fs->populate (res);
918 fs->set_prop (prop2);
919 } 727 }
920#else 728#else
921 TermWin.fontset[style] = TermWin.fontset[0]; 729 fontset[style] = fontset[0];
922#endif 730#endif
923 } 731 }
924 732
925 if (TermWin.parent[0]) 733 if (parent[0])
926 { 734 {
927 resize_all_windows (0, 0, 0); 735 resize_all_windows (0, 0, 0);
928 scr_remap_chars (); 736 scr_remap_chars ();
929 scr_touch (true); 737 scr_touch (true);
930 } 738 }
931 739
932 return true; 740 return true;
933} 741}
934 742
743void
935void rxvt_term::set_string_property (Atom prop, const char *str, int len) 744rxvt_term::set_string_property (Atom prop, const char *str, int len)
936{ 745{
937 // TODO: SMART_WINDOW_TITLE
938 XChangeProperty (display->display, TermWin.parent[0], 746 XChangeProperty (dpy, parent[0],
939 prop, XA_STRING, 8, PropModeReplace, 747 prop, XA_STRING, 8, PropModeReplace,
940 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 748 (const unsigned char *)str, len >= 0 ? len : strlen (str));
941} 749}
942 750
751void
943void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 752rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944{ 753{
945 // TODO: SMART_WINDOW_TITLE
946 wchar_t *ws = rxvt_mbstowcs (str, len); 754 wchar_t *ws = rxvt_mbstowcs (str, len);
947 char *s = rxvt_wcstoutf8 (ws); 755 char *s = rxvt_wcstoutf8 (ws);
948 756
949 XChangeProperty (display->display, TermWin.parent[0], 757 XChangeProperty (dpy, parent[0],
950 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951 (const unsigned char *)s, strlen (s)); 759 (const unsigned char *)s, strlen (s));
952 760
953 free (s); 761 free (s);
954 free (ws); 762 free (ws);
… …
973#if ENABLE_EWMH 781#if ENABLE_EWMH
974 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
975#endif 783#endif
976} 784}
977 785
786void
787rxvt_term::set_window_color (int idx, const char *color)
788{
978#ifdef XTERM_COLOR_CHANGE 789#ifdef XTERM_COLOR_CHANGE
979void
980rxvt_term::set_window_color (int idx, const char *color)
981{
982 rxvt_color xcol; 790 rxvt_color xcol;
983 int i;
984 791
985 if (color == NULL || *color == '\0') 792 if (color == NULL || *color == '\0')
986 return; 793 return;
987 794
795 color = strdup (color);
796 allocated.push_back ((void *)color);
797 rs[Rs_color + idx] = color;
798
988 /* handle color aliases */ 799 /* handle color aliases */
989 if (isdigit (*color)) 800 if (isdigit (*color))
990 { 801 {
991 i = atoi (color); 802 int i = atoi (color);
992 803
993 if (i >= 8 && i <= 15) 804 if (i >= 8 && i <= 15)
805 {
994 { /* bright colors */ 806 /* bright colors */
995 i -= 8;
996# ifndef NO_BRIGHTCOLOR
997 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
998 SET_PIXCOLOR (idx);
999 goto done;
1000# endif
1001 }
1002
1003 if (i >= 0 && i <= 7)
1004 { /* normal colors */
1005 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1006 SET_PIXCOLOR (idx);
1007 goto done; 808 goto done;
1008 } 809 }
1009 }
1010 810
1011 if (!rXParseAllocColor (&xcol, color)) 811 if (i >= 0 && i <= 7)
1012 return; 812 {
813 /* normal colors */
814 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
815 goto done;
816 }
817 }
1013 818
1014 /* XStoreColor (display->display, display->cmap, XColor*); */ 819 set_color (xcol, color);
1015 820
1016 /* 821 /*
1017 * FIXME: should free colors here, but no idea how to do it so instead, 822 * FIXME: should free colors here, but no idea how to do it so instead,
1018 * so just keep gobbling up the colormap 823 * so just keep gobbling up the colormap
1019 */ 824 */
1020# if 0
1021 for (i = Color_Black; i <= Color_White; i++)
1022 if (pix_colors[idx] == pix_colors[i])
1023 break;
1024 if (i > Color_White)
1025 {
1026 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1027 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1028 DisplayPlanes (display->display, display->screen));
1029 }
1030# endif
1031 825
1032 pix_colors_focused[idx] = xcol; 826 pix_colors_focused[idx] = xcol;
1033 SET_PIXCOLOR (idx);
1034 827
1035 /* XSetWindowAttributes attr; */
1036 /* Cursor cursor; */
1037done: 828done:
1038
1039#if OFF_FOCUS_FADING
1040 if (rs[Rs_fade])
1041 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1042#endif
1043
1044 /*TODO: handle Color_BD, scrollbar background, etc. */ 829 /*TODO: handle Color_BD, scrollbar background, etc. */
1045 830
831 update_fade_color (idx);
1046 recolour_cursor (); 832 recolour_cursor ();
1047 scr_recolour (); 833 scr_recolour ();
834#endif /* XTERM_COLOR_CHANGE */
1048} 835}
1049
1050#else
1051# define set_window_color (idx,color) ((void)0)
1052#endif /* XTERM_COLOR_CHANGE */
1053 836
1054void 837void
1055rxvt_term::recolour_cursor () 838rxvt_term::recolour_cursor ()
1056{ 839{
1057 XColor xcol[2]; 840 XColor fg, bg;
1058 841
1059 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 842 (ISSET_PIXCOLOR (Color_pointer_fg)
1060 ? pix_colors_focused[Color_pointer_fg] 843 ? pix_colors_focused[Color_pointer_fg]
1061 : pix_colors_focused[Color_fg]; 844 : pix_colors_focused[Color_fg]).get (fg);
845
1062 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 846 (ISSET_PIXCOLOR (Color_pointer_bg)
1063 ? pix_colors_focused[Color_pointer_bg] 847 ? pix_colors_focused[Color_pointer_bg]
1064 : pix_colors_focused[Color_bg]; 848 : pix_colors_focused[Color_bg]).get (bg);
1065 849
1066 XQueryColors (display->display, display->cmap, xcol, 2); 850 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1067 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1068} 851}
1069 852
1070/*----------------------------------------------------------------------*/ 853/*----------------------------------------------------------------------*/
1071/* 854/*
1072 * find if fg/bg matches any of the normal (low-intensity) colors 855 * find if fg/bg matches any of the normal (low-intensity) colors
1073 */ 856 */
1074void 857void
1075rxvt_term::set_colorfgbg () 858rxvt_term::set_colorfgbg ()
1076{ 859{
1077 unsigned int i; 860 unsigned int i;
1078 const char *xpmb = "\0"; 861 const char *xpmb = "";
1079 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1080 863
1081 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1082 strcpy (fstr, "default"); 864 strcpy (fstr, "default");
1083 strcpy (bstr, "default"); 865 strcpy (bstr, "default");
1084 for (i = Color_Black; i <= Color_White; i++) 866 for (i = Color_Black; i <= Color_White; i++)
1085 if (pix_colors[Color_fg] == pix_colors[i]) 867 if (pix_colors[Color_fg] == pix_colors[i])
1086 { 868 {
… …
1090 872
1091 for (i = Color_Black; i <= Color_White; i++) 873 for (i = Color_Black; i <= Color_White; i++)
1092 if (pix_colors[Color_bg] == pix_colors[i]) 874 if (pix_colors[Color_bg] == pix_colors[i])
1093 { 875 {
1094 sprintf (bstr, "%d", (i - Color_Black)); 876 sprintf (bstr, "%d", (i - Color_Black));
1095#ifdef XPM_BACKGROUND 877#ifdef BG_IMAGE_FROM_FILE
1096 xpmb = "default;"; 878 xpmb = "default;";
1097#endif 879#endif
1098 break; 880 break;
1099 } 881 }
1100 882
1101 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 883 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1102} 884}
1103 885
1104/*----------------------------------------------------------------------*/ 886/*----------------------------------------------------------------------*/
1105 887
1106int 888bool
1107rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 889rxvt_term::set_color (rxvt_color &color, const char *name)
1108{ 890{
1109 if (!screen_in_out->set (display, colour)) 891 if (color.set (this, name))
1110 {
1111 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1112 return false;
1113 }
1114
1115 return true; 892 return true;
893
894 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
895 return false;
896}
897
898void
899rxvt_term::alias_color (int dst, int src)
900{
901 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1116} 902}
1117 903
1118/* -------------------------------------------------------------------- * 904/* -------------------------------------------------------------------- *
1119 * - WINDOW RESIZING - * 905 * - WINDOW RESIZING - *
1120 * -------------------------------------------------------------------- */ 906 * -------------------------------------------------------------------- */
1121void 907void
1122rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 908rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1123{ 909{
1124 int fix_screen; 910 int fix_screen;
1125#ifdef SMART_RESIZE 911 int old_width = szHint.width;
1126 int old_width = szHint.width, old_height = szHint.height; 912 int old_height = szHint.height;
1127#endif
1128 dDisp;
1129 913
1130 window_calc (width, height); 914 window_calc (newwidth, newheight);
915
916 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
917
918 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
919 if (set_hint)
920 {
921 szHint.flags &= ~(PBaseSize | PResizeInc);
1131 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 922 XSetWMNormalHints (dpy, parent[0], &szHint);
923 szHint.flags |= PBaseSize | PResizeInc;
924 }
1132 925
1133 if (!ignoreparent) 926 if (!ignoreparent)
1134 { 927 {
1135#ifdef SMART_RESIZE 928#ifdef SMART_RESIZE
1136 /* 929 /*
… …
1140 int x, y, x1, y1; 933 int x, y, x1, y1;
1141 int dx, dy; 934 int dx, dy;
1142 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 935 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1143 Window unused_cr; 936 Window unused_cr;
1144 937
1145 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 938 XTranslateCoordinates (dpy, parent[0], display->root,
1146 0, 0, &x, &y, &unused_cr); 939 0, 0, &x, &y, &unused_cr);
1147 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 940 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1148 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 941 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1149 /* 942 /*
1150 * if display->root isn't the parent window, a WM will probably have offset 943 * if display->root isn't the parent window, a WM will probably have offset
1151 * our position for handles and decorations. Counter it 944 * our position for handles and decorations. Counter it
1152 */ 945 */
… …
1154 { 947 {
1155 x -= x1; 948 x -= x1;
1156 y -= y1; 949 y -= y1;
1157 } 950 }
1158 951
1159 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 952 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1160 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 953 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1161 dx = old_width - szHint.width; 954 dx = old_width - szHint.width;
1162 dy = old_height - szHint.height; 955 dy = old_height - szHint.height;
1163 956
1164 /* Check position of the center of the window */ 957 /* Check position of the center of the window */
1165 if (x < x1) /* left half */ 958 if (x < x1) /* left half */
1166 dx = 0; 959 dx = 0;
… …
1169 if (y < y1) /* top half */ 962 if (y < y1) /* top half */
1170 dy = 0; 963 dy = 0;
1171 else if (y == y1) /* exact center */ 964 else if (y == y1) /* exact center */
1172 dy /= 2; 965 dy /= 2;
1173 966
1174 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 967 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1175 szHint.width, szHint.height); 968 szHint.width, szHint.height);
1176#else 969#else
1177 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 970 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1178#endif 971#endif
1179 } 972 }
1180 973
974 if (set_hint)
975 XSetWMNormalHints (dpy, parent[0], &szHint);
976
1181 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 977 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1182 978
1183 if (fix_screen || width != old_width || height != old_height) 979 if (fix_screen || newwidth != old_width || newheight != old_height)
1184 { 980 {
1185 if (scrollbar_visible ()) 981 if (scrollBar.state)
1186 { 982 scrollBar.resize ();
1187 XMoveResizeWindow (disp, scrollBar.win,
1188 window_sb_x, 0,
1189 scrollbar_TotalWidth (), szHint.height);
1190 resize_scrollbar ();
1191 }
1192 983
1193 if (menubar_visible ())
1194 XMoveResizeWindow (disp, menuBar.win,
1195 window_vt_x, 0,
1196 TermWin_TotalWidth (), menuBar_TotalHeight ());
1197
1198 XMoveResizeWindow (disp, TermWin.vt, 984 XMoveResizeWindow (dpy, vt,
1199 window_vt_x, window_vt_y, 985 window_vt_x, window_vt_y,
1200 TermWin_TotalWidth (), TermWin_TotalHeight ()); 986 width, height);
1201 987
1202 scr_clear (); 988#ifdef HAVE_BG_PIXMAP
1203#ifdef XPM_BACKGROUND 989 if (bgPixmap.window_size_sensitive ())
1204 resize_pixmap (); 990 update_background ();
1205#endif 991#endif
1206 } 992 }
1207 993
1208 if (fix_screen || old_height == 0) 994 if (fix_screen || old_height == 0)
1209 {
1210 int curr_screen = -1;
1211 int old_ncol = prev_ncol;
1212
1213 /* scr_reset only works on the primary screen */
1214 if (old_height) /* this is not the first time through */
1215 {
1216 unsigned int ncol = TermWin.ncol;
1217 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1218 curr_screen = scr_change_screen (PRIMARY);
1219 TermWin.ncol = ncol;
1220 }
1221
1222 scr_reset (); 995 scr_reset ();
1223 996
1224 if (curr_screen >= 0) /* this is not the first time through */ 997 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1225 { 998 //scr_touch (false);
1226 scr_change_screen (curr_screen);
1227 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1228 }
1229 }
1230 999
1231 old_width = szHint.width; 1000#ifdef HAVE_BG_PIXMAP
1232 old_height = szHint.height; 1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1233 1002// if (bgPixmap.pixmap)
1234#ifdef XPM_BACKGROUND
1235 if (TermWin.pixmap)
1236 scr_touch (false); 1003// scr_touch (false);
1237#endif 1004#endif
1238 1005
1239#ifdef USE_XIM 1006#ifdef USE_XIM
1240 IMSetStatusPosition (); 1007 IMSetPosition ();
1241#endif 1008#endif
1242} 1009}
1243 1010
1244/* 1011/*
1245 * Set the width/height of the vt window in characters. Units are pixels. 1012 * Set the width/height of the vt window in characters. Units are pixels.
1246 * good for toggling 80/132 columns 1013 * good for toggling 80/132 columns
1247 */ 1014 */
1248void 1015void
1249rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1016rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1250{ 1017{
1251 XWindowAttributes wattr; 1018 XWindowAttributes wattr;
1252 1019
1253 if (width == 0 || height == 0) 1020 if (newwidth == 0 || newheight == 0)
1254 { 1021 {
1255 XGetWindowAttributes (display->display, display->root, &wattr); 1022 XGetWindowAttributes (dpy, display->root, &wattr);
1256 1023
1257 if (width == 0) 1024 if (newwidth == 0)
1258 width = wattr.width - szHint.base_width; 1025 newwidth = wattr.width - szHint.base_width;
1259 if (height == 0) 1026 if (newheight == 0)
1260 height = wattr.height - szHint.base_height; 1027 newheight = wattr.height - szHint.base_height;
1261 }
1262
1263 if (width != TermWin.width || height != TermWin.height)
1264 { 1028 }
1029
1030 if (newwidth != width || newheight != height)
1031 {
1265 width += szHint.base_width; 1032 newwidth += szHint.base_width;
1266 height += szHint.base_height; 1033 newheight += szHint.base_height;
1267 resize_all_windows (width, height, 0); 1034 resize_all_windows (newwidth, newheight, 0);
1268 } 1035 }
1269} 1036}
1270 1037
1271/* -------------------------------------------------------------------- * 1038/* -------------------------------------------------------------------- *
1272 * - X INPUT METHOD ROUTINES - * 1039 * - X INPUT METHOD ROUTINES - *
… …
1274#ifdef USE_XIM 1041#ifdef USE_XIM
1275 1042
1276void 1043void
1277rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1044rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1278{ 1045{
1279 fg = pix_colors[Color_fg]; 1046 fg = pix_colors [Color_fg];
1280 bg = pix_colors[Color_bg]; 1047 bg = pix_colors [Color_bg];
1281} 1048}
1282 1049
1283void 1050void
1284rxvt_term::im_set_size (XRectangle &size) 1051rxvt_term::im_set_size (XRectangle &size)
1285{ 1052{
1286 // the int_bwidth terms make no sense to me 1053 // the int_bwidth terms make no sense to me
1287 size.x = TermWin.int_bwidth; 1054 size.x = int_bwidth;
1288 size.y = TermWin.int_bwidth; 1055 size.y = int_bwidth;
1289 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1056 size.width = Width2Pixel (ncol) + int_bwidth;
1290 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1057 size.height = Height2Pixel (nrow) + int_bwidth;
1291} 1058}
1292 1059
1293void 1060void
1294rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1061rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295 XRectangle &status_rect, 1062 XRectangle &status_rect,
1296 const XRectangle &needed_rect) 1063 const XRectangle &needed_rect)
1297{ 1064{
1298 preedit_rect.x = needed_rect.width; 1065 preedit_rect.x = needed_rect.width;
1299 preedit_rect.y = 0; 1066 preedit_rect.y = 0;
1300 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1067 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301 preedit_rect.height = TermWin.fheight; 1068 preedit_rect.height = fheight;
1302 1069
1303 status_rect.x = 0; 1070 status_rect.x = 0;
1304 status_rect.y = 0; 1071 status_rect.y = 0;
1305 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1072 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306 status_rect.height = TermWin.fheight; 1073 status_rect.height = fheight;
1307} 1074}
1308 1075
1309/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1310bool 1077bool
1311rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1312{ 1079{
1313 char *p;
1314 Atom atom; 1080 Atom atom;
1315 Window win; 1081 Window win;
1316 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1317 1083
1318 /* get current locale modifier */ 1084 /* get current locale modifier */
1319 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1320 { 1086 {
1321 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1322 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1323 1089
1324 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1325 *p = '\0'; 1091 *p = '\0';
1326 1092
1327 atom = XInternAtom (display->display, server, False); 1093 atom = XInternAtom (dpy, server, False);
1328 win = XGetSelectionOwner (display->display, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1329 1095
1330 if (win != None) 1096 if (win != None)
1331 return True; 1097 return True;
1332 } 1098 }
1333 1099
… …
1339{ 1105{
1340 XPoint nspot; 1106 XPoint nspot;
1341 XVaNestedList preedit_attr; 1107 XVaNestedList preedit_attr;
1342 1108
1343 if (!Input_Context 1109 if (!Input_Context
1344 || !TermWin.focus 1110 || !focus
1345 || !(input_style & XIMPreeditPosition)) 1111 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1346 return; 1112 return;
1347 1113
1348 im_set_position (nspot); 1114 im_set_position (nspot);
1349 1115
1350 if (nspot.x == spot.x && nspot.y == spot.y) 1116 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1369 input_method = 0; 1135 input_method = 0;
1370 } 1136 }
1371 1137
1372 Input_Context = 0; 1138 Input_Context = 0;
1373} 1139}
1140
1141#ifdef ENABLE_XIM_ONTHESPOT
1142
1143static void
1144xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1145{
1146 ((rxvt_term *)client_data)->make_current ();
1147 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1148}
1149
1150static void
1151xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1152{
1153 ((rxvt_term *)client_data)->make_current ();
1154 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1155}
1156
1157static void
1158xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1159{
1160 rxvt_term *term = (rxvt_term *)client_data;
1161 XIMText *text = call_data->text;
1162
1163 term->make_current ();
1164
1165 if (text)
1166 {
1167 void *str;
1168
1169 if (!text->encoding_is_wchar && text->string.multi_byte)
1170 {
1171 // of course, X makes it ugly again
1172 if (term->rs[Rs_imLocale])
1173 SET_LOCALE (term->rs[Rs_imLocale]);
1174
1175 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1176 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1177
1178 if (term->rs[Rs_imLocale])
1179 SET_LOCALE (term->locale);
1180 }
1181 else
1182 str = (void *)text->string.wide_char;
1183
1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1185 DT_INT, call_data->caret,
1186 DT_INT, call_data->chg_first,
1187 DT_INT, call_data->chg_length,
1188 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1189 DT_WCS_LEN, str, str ? (int)text->length : 0,
1190 DT_END));
1191 }
1192 else
1193 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1194 DT_INT, call_data->caret,
1195 DT_INT, call_data->chg_first,
1196 DT_INT, call_data->chg_length,
1197 DT_END));
1198}
1199
1200#if 0
1201static void
1202xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1203{
1204 ((rxvt_term *)client_data)->make_current ();
1205 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1206 DT_INT, call_data->position,
1207 DT_INT, call_data->direction,
1208 DT_INT, call_data->style,
1209 DT_END));
1210}
1211#endif
1212
1213#endif
1374 1214
1375/* 1215/*
1376 * Try to open a XIM with the current modifiers, then see if we can 1216 * Try to open a XIM with the current modifiers, then see if we can
1377 * open a suitable preedit type 1217 * open a suitable preedit type
1378 */ 1218 */
… …
1385 XRectangle rect, status_rect, needed_rect; 1225 XRectangle rect, status_rect, needed_rect;
1386 unsigned long fg, bg; 1226 unsigned long fg, bg;
1387 const char *p; 1227 const char *p;
1388 char **s; 1228 char **s;
1389 XIMStyles *xim_styles; 1229 XIMStyles *xim_styles;
1230#ifdef ENABLE_XIM_ONTHESPOT
1231 XIMCallback xcb[4];
1232#endif
1233
1234 set_environ (envv);
1390 1235
1391 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1236 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1392 return false; 1237 return false;
1393 1238
1394 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1395 input_method = display->get_xim (locale, modifiers); 1239 input_method = display->get_xim (locale, modifiers);
1396 if (input_method == NULL) 1240 if (input_method == NULL)
1397 return false; 1241 return false;
1398 1242
1399 xim = input_method->xim; 1243 xim = input_method->xim;
… …
1419 s = rxvt_splitcommastring (p); 1263 s = rxvt_splitcommastring (p);
1420 1264
1421 for (i = found = 0; !found && s[i]; i++) 1265 for (i = found = 0; !found && s[i]; i++)
1422 { 1266 {
1423 if (!strcmp (s[i], "OverTheSpot")) 1267 if (!strcmp (s[i], "OverTheSpot"))
1424 input_style = (XIMPreeditPosition | XIMStatusNothing); 1268 input_style = XIMPreeditPosition | XIMStatusNothing;
1425 else if (!strcmp (s[i], "OffTheSpot")) 1269 else if (!strcmp (s[i], "OffTheSpot"))
1426 input_style = (XIMPreeditArea | XIMStatusArea); 1270 input_style = XIMPreeditArea | XIMStatusArea;
1427 else if (!strcmp (s[i], "Root")) 1271 else if (!strcmp (s[i], "Root"))
1428 input_style = (XIMPreeditNothing | XIMStatusNothing); 1272 input_style = XIMPreeditNothing | XIMStatusNothing;
1429 else if (!strcmp (s[i], "None")) 1273 else if (!strcmp (s[i], "None"))
1430 input_style = (XIMPreeditNone | XIMStatusNone); 1274 input_style = XIMPreeditNone | XIMStatusNone;
1275#ifdef ENABLE_XIM_ONTHESPOT
1276 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1277 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1278#endif
1279 else
1280 input_style = XIMPreeditNothing | XIMStatusNothing;
1431 1281
1432 for (j = 0; j < xim_styles->count_styles; j++) 1282 for (j = 0; j < xim_styles->count_styles; j++)
1433 if (input_style == xim_styles->supported_styles[j]) 1283 if (input_style == xim_styles->supported_styles[j])
1434 { 1284 {
1435 rxvt_freecommastring (s); 1285 rxvt_freecommastring (s);
… …
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1319 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1320 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1321 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1322 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "*", 1323 "*",
1474 TermWin.fheight, 1324 fheight,
1475 TermWin.fheight + 1, TermWin.fheight - 1, 1325 fheight + 1, fheight - 1,
1476 TermWin.fheight - 2, TermWin.fheight + 2); 1326 fheight - 2, fheight + 2);
1477 1327
1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1328 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479 &missing_charset_list, &missing_charset_count, &def_string); 1329 &missing_charset_list, &missing_charset_count, &def_string);
1480 1330
1481 if (missing_charset_list) 1331 if (missing_charset_list)
1482 XFreeStringList (missing_charset_list); 1332 XFreeStringList (missing_charset_list);
1483 1333
… …
1524 XNBackground, bg, 1374 XNBackground, bg,
1525 XNArea, &status_rect, 1375 XNArea, &status_rect,
1526 XNFontSet, fs, 1376 XNFontSet, fs,
1527 NULL); 1377 NULL);
1528 } 1378 }
1379#if ENABLE_XIM_ONTHESPOT
1380 else if (input_style & XIMPreeditCallbacks)
1381 {
1382 im_set_position (spot);
1383
1384 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1385 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1386 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1387# if 0
1388 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1389# endif
1390
1391 preedit_attr = XVaCreateNestedList (0,
1392 XNSpotLocation, &spot,
1393 XNPreeditStartCallback, &xcb[0],
1394 XNPreeditDoneCallback , &xcb[1],
1395 XNPreeditDrawCallback , &xcb[2],
1396# if 0
1397 XNPreeditCaretCallback, &xcb[3],
1398# endif
1399 NULL);
1400 }
1401#endif
1529 1402
1530 Input_Context = XCreateIC (xim, 1403 Input_Context = XCreateIC (xim,
1531 XNInputStyle, input_style, 1404 XNInputStyle, input_style,
1532 XNClientWindow, TermWin.vt, 1405 XNClientWindow, vt,
1533 XNFocusWindow, TermWin.parent[0], 1406 XNFocusWindow, parent[0],
1534 preedit_attr ? XNPreeditAttributes : NULL, 1407 preedit_attr ? XNPreeditAttributes : NULL,
1535 preedit_attr, 1408 preedit_attr,
1536 status_attr ? XNStatusAttributes : NULL, 1409 status_attr ? XNStatusAttributes : NULL,
1537 status_attr, NULL); 1410 status_attr, NULL);
1538 1411
1539 if (preedit_attr) XFree (preedit_attr); 1412 if (preedit_attr) XFree (preedit_attr);
1540 if (status_attr) XFree (status_attr); 1413 if (status_attr) XFree (status_attr);
1541 if (fs) XFreeFontSet (display->display, fs); 1414 if (fs) XFreeFontSet (dpy, fs);
1542 1415
1543 if (Input_Context == NULL) 1416 if (Input_Context == NULL)
1544 { 1417 {
1545 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1418 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1546 im_destroy (); 1419 im_destroy ();
1547 return false; 1420 return false;
1548 } 1421 }
1549 1422
1550 if (input_style & XIMPreeditArea) 1423#if 0
1424 // unfortunately, only the focus window is used by XIM, hard to fix
1425 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1426 vt_select_input ();
1427#endif
1428
1551 IMSetStatusPosition (); 1429 IMSetPosition ();
1552 1430
1553 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1554 return true; 1431 return true;
1555} 1432}
1556 1433
1557void 1434void
1558rxvt_term::im_cb () 1435rxvt_term::im_cb ()
… …
1560 int i; 1437 int i;
1561 const char *p; 1438 const char *p;
1562 char **s; 1439 char **s;
1563 char buf[IMBUFSIZ]; 1440 char buf[IMBUFSIZ];
1564 1441
1565 SET_R (this); 1442 make_current ();
1566 1443
1567 im_destroy (); 1444 im_destroy ();
1568 1445
1569 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1570 if (Input_Context) 1446 if (Input_Context)
1571 return; 1447 return;
1572 1448
1573#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1449#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1574 if (rs[Rs_imLocale]) 1450 if (rs[Rs_imLocale])
… …
1616 SET_LOCALE (locale); 1492 SET_LOCALE (locale);
1617#endif 1493#endif
1618} 1494}
1619 1495
1620void 1496void
1621rxvt_term::IMSetStatusPosition () 1497rxvt_term::IMSetPosition ()
1622{ 1498{
1623 XRectangle preedit_rect, status_rect, *needed_rect; 1499 XRectangle preedit_rect, status_rect, *needed_rect;
1624 XVaNestedList preedit_attr, status_attr; 1500 XVaNestedList preedit_attr, status_attr;
1625 1501
1626 if (!Input_Context 1502 if (!Input_Context
1627 || !TermWin.focus 1503 || !focus
1628 || !(input_style & XIMPreeditArea) 1504 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1629 || !IMisRunning ()) 1505 || !IMisRunning ())
1630 return; 1506 return;
1631 1507
1508 if (input_style & XIMPreeditPosition)
1509 {
1510 im_set_size (preedit_rect);
1511 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1512
1513 XSetICValues (Input_Context,
1514 XNPreeditAttributes, preedit_attr, NULL);
1515 }
1516 else
1517 {
1632 /* Getting the necessary width of preedit area */ 1518 /* Getting the necessary width of preedit area */
1633 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1519 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1634 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1520 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1635 XFree (status_attr); 1521 XFree (status_attr);
1636 1522
1637 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1523 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1638 XFree (needed_rect); 1524 XFree (needed_rect);
1639 1525
1640 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1526 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1641 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1527 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1642 1528
1643 XSetICValues (Input_Context, 1529 XSetICValues (Input_Context,
1644 XNPreeditAttributes, preedit_attr, 1530 XNPreeditAttributes, preedit_attr,
1645 XNStatusAttributes, status_attr, NULL); 1531 XNStatusAttributes, status_attr,
1532 NULL);
1646 1533
1534 XFree (status_attr);
1535 }
1536
1647 XFree (preedit_attr); 1537 XFree (preedit_attr);
1648 XFree (status_attr);
1649} 1538}
1650#endif /* USE_XIM */ 1539#endif /* USE_XIM */
1651 1540
1652/*----------------------------------------------------------------------*/ 1541void
1653rxvt_t rxvt_current_term; 1542rxvt_term::get_window_origin (int &x, int &y)
1543{
1544 Window cr;
1545 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1546/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1547}
1548
1549Pixmap
1550rxvt_term::get_pixmap_property (int prop_id)
1551{
1552 if (prop_id > 0 && prop_id < NUM_XA)
1553 if (xa[prop_id])
1554 {
1555 int aformat;
1556 unsigned long nitems, bytes_after;
1557 Atom atype;
1558 unsigned char *prop = NULL;
1559 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1560 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1561 &nitems, &bytes_after, &prop);
1562 if (result == Success && prop && atype == XA_PIXMAP)
1563 return *(Pixmap *)prop;
1564 }
1565
1566 return None;
1567}
1568
1569#ifdef HAVE_BG_PIXMAP
1570# if TRACE_PIXMAPS
1571# undef update_background
1572void
1573rxvt_term::trace_update_background (const char *file, int line)
1574{
1575 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1576 update_background ();
1577}
1578# endif
1579
1580void
1581rxvt_term::update_background ()
1582{
1583 if (update_background_ev.is_active ())
1584 return;
1585
1586 bgPixmap.invalidate ();
1587
1588 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1589
1590 if (to_wait <= 0.)
1591 bgPixmap.render ();
1592 else
1593 update_background_ev.start (to_wait);
1594}
1595
1596void
1597rxvt_term::update_background_cb (ev::timer &w, int revents)
1598{
1599 make_current ();
1600
1601 update_background_ev.stop ();
1602 bgPixmap.render ();
1603 refresh_check ();
1604}
1605
1606#endif /* HAVE_BG_PIXMAP */
1654 1607
1655/*----------------------- end-of-file (C source) -----------------------*/ 1608/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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