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

Diff Legend

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