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.189 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.317 by root, Tue May 12 08:21:56 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-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# 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>
51# endif
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], savelocale[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
66void 77void
67rxvt_push_locale (const char *locale) 78rxvt_push_locale (const char *locale) NOTHROW
68{ 79{
69 strcpy (savelocale, curlocale); 80 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 81 rxvt_set_locale (locale);
71} 82}
72 83
73void 84void
74rxvt_pop_locale () 85rxvt_pop_locale () NOTHROW
75{ 86{
76 rxvt_set_locale (savelocale); 87 rxvt_set_locale (savelocale);
77} 88}
78 89
79#if ENABLE_COMBINING 90#if ENABLE_COMBINING
80class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
81 92
82text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
83{ 94{
84 compose_char *cc; 95 compose_char *cc;
85 96
86 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
87 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
88 cc = (*this)[c1]; 99 cc = (*this)[c1];
89 while (cc) 100 while (cc)
90 { 101 {
… …
139 150
140} 151}
141#endif 152#endif
142 153
143rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
144 : 155{
145#if TRANSPARENT 156#if HAVE_BG_PIXMAP
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
147#endif
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 158#endif
151#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
152 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);
153#endif 161#endif
154#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
155 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);
156#endif 164#endif
157#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
158 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
159#endif 167#endif
160#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
161 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
162#endif 170#endif
163#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
164 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),
165#endif 180#endif
166#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
167 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
168#endif 183#endif
169#ifdef USE_XIM 184#ifndef NO_BELL
170 im_ev (this, &rxvt_term::im_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
171#endif 186#endif
172 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
173 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
174 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
175 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
176 flush_ev (this, &rxvt_term::flush_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
177 destroy_ev (this, &rxvt_term::destroy_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
178 pty_ev (this, &rxvt_term::pty_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
179 incr_ev (this, &rxvt_term::incr_cb) 194
180{
181 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
182 196
183 termlist.push_back (this); 197 termlist.push_back (this);
184 198
185#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
186 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
187
188 if (!keyboard)
189 rxvt_fatal ("out of memory, aborting.\n");
190#endif 201#endif
191} 202}
192 203
193// 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.
194// for use before an emergency exit 205// for use before an emergency exit
206void
195void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
196{ 208{
197 if (cmd_pid) 209 if (cmd_pid)
198 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
199 211
212 pty_ev.stop ();
200 delete pty; pty = 0; 213 delete pty; pty = 0;
201} 214}
202 215
203rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
204{ 217{
205 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
206
207 termlist.erase (find (termlist.begin (), termlist.end(), this)); 218 termlist.erase (find (termlist.begin (), termlist.end(), this));
208 219
209 emergency_cleanup (); 220 emergency_cleanup ();
210 221
211#if ENABLE_STYLES 222#if ENABLE_STYLES
… …
213 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
214 delete fontset[i]; 225 delete fontset[i];
215#endif 226#endif
216 delete fontset[0]; 227 delete fontset[0];
217 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
238
218 if (display) 239 if (display)
219 { 240 {
220 dDisp;
221
222 selection_clear (); 241 selection_clear ();
223 242
224#ifdef USE_XIM 243#ifdef USE_XIM
225 im_destroy (); 244 im_destroy ();
226#endif 245#endif
227#ifdef XTERM_SCROLLBAR 246 scrollBar.destroy ();
228 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
229 if (ShadowGC) XFreeGC (disp, ShadowGC);
230#endif
231#ifdef PLAIN_SCROLLBAR
232 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
233#endif
234#ifdef NEXT_SCROLLBAR
235 if (blackGC) XFreeGC (disp, blackGC);
236 if (whiteGC) XFreeGC (disp, whiteGC);
237 if (grayGC) XFreeGC (disp, grayGC);
238 if (darkGC) XFreeGC (disp, darkGC);
239 if (stippleGC) XFreeGC (disp, stippleGC);
240 if (dimple) XFreePixmap (disp, dimple);
241 if (upArrow) XFreePixmap (disp, upArrow);
242 if (downArrow) XFreePixmap (disp, downArrow);
243 if (upArrowHi) XFreePixmap (disp, upArrowHi);
244 if (downArrowHi) XFreePixmap (disp, downArrowHi);
245#endif
246#ifdef RXVT_SCROLLBAR
247 if (topShadowGC) XFreeGC (disp, topShadowGC);
248 if (botShadowGC) XFreeGC (disp, botShadowGC);
249 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
250#endif
251 if (gc) XFreeGC (disp, gc); 247 if (gc) XFreeGC (dpy, gc);
252 248
253 delete drawable; 249 delete drawable;
254 // destroy all windows 250 // destroy all windows
255 if (parent[0]) 251 if (parent[0])
256 XDestroyWindow (disp, parent[0]); 252 XDestroyWindow (dpy, parent[0]);
257 }
258 253
259 // TODO: free pixcolours, colours should become part of rxvt_display 254 for (int i = 0; i < TOTAL_COLORS; i++)
260 delete pix_colors_focused; 255 if (ISSET_PIXCOLOR (i))
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
289} 292}
290 293
291// child has exited, usually destroys 294// child has exited, usually destroys
292void 295void
293rxvt_term::child_cb (child_watcher &w, int status) 296rxvt_term::child_cb (ev::child &w, int status)
294{ 297{
295 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 298 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
296 299
297 cmd_pid = 0; 300 cmd_pid = 0;
298 301
299 if (!OPTION (Opt_hold)) 302 if (!option (Opt_hold))
300 destroy (); 303 destroy ();
301} 304}
302 305
303void 306void
304rxvt_term::destroy () 307rxvt_term::destroy ()
305{ 308{
306 if (destroy_ev.active) 309 if (destroy_ev.is_active ())
307 return; 310 return;
311
312 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 313
309#if ENABLE_OVERLAY 314#if ENABLE_OVERLAY
310 scr_overlay_off (); 315 scr_overlay_off ();
311#endif 316#endif
312 317
313 if (display) 318 if (display)
314 { 319 {
315#if USE_XIM 320#if USE_XIM
316 im_ev.stop (display); 321 im_ev.stop (display);
317#endif 322#endif
318#if HAVE_SCROLLBARS
319 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
320#endif 324#if ENABLE_TRANSPARENCY || ENABLE_PERL
321#if TRANSPARENT
322 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
323#endif 326#endif
324 incr_ev.stop (); 327 incr_ev.stop ();
325 termwin_ev.stop (display); 328 termwin_ev.stop (display);
326 vt_ev.stop (display); 329 vt_ev.stop (display);
327 } 330 }
328 331
329 check_ev.stop (); 332 flush_ev.stop ();
330 pty_ev.stop (); 333 pty_ev.stop ();
331#ifdef CURSOR_BLINK 334#ifdef CURSOR_BLINK
332 cursor_blink_ev.stop (); 335 cursor_blink_ev.stop ();
333#endif 336#endif
334#ifdef TEXT_BLINK 337#ifdef TEXT_BLINK
… …
342#endif 345#endif
343#ifdef POINTER_BLANK 346#ifdef POINTER_BLANK
344 pointer_ev.stop (); 347 pointer_ev.stop ();
345#endif 348#endif
346 349
347 destroy_ev.start (0); 350 destroy_ev.start ();
348} 351}
349 352
350void 353void
351rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (ev::idle &w, int revents)
352{ 355{
353 make_current (); 356 make_current ();
354 357
355 delete this; 358 delete this;
356} 359}
… …
367{ 370{
368 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++)
369 (*t)->emergency_cleanup (); 372 (*t)->emergency_cleanup ();
370} 373}
371 374
372#if ENABLE_FRILLS 375#if !ENABLE_MINIMAL
373static void 376static void
374print_x_error (Display *dpy, XErrorEvent *event) 377print_x_error (Display *dpy, XErrorEvent *event)
375{ 378{
376 char buffer[BUFSIZ]; 379 char buffer[BUFSIZ];
377 char mesg[BUFSIZ]; 380 char mesg[BUFSIZ];
… …
410 else 413 else
411 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
412 mesg, BUFSIZ); 415 mesg, BUFSIZ);
413 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
414 } 417 }
415 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
416 mesg, BUFSIZ); 419 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
418} 421}
419#endif 422#endif
420 423
… …
425 GET_R->allowedxerror = event->error_code; 428 GET_R->allowedxerror = event->error_code;
426 else 429 else
427 { 430 {
428 // 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,
429 // so just output the error and continue 432 // so just output the error and continue
430#if ENABLE_FRILLS 433#if ENABLE_MINIMAL
434 old_xerror_handler (display, event);
435#else
431 print_x_error (display, event); 436 print_x_error (display, event);
432#else
433 old_xerror_handler (display, event);
434#endif 437#endif
435 } 438 }
436 439
437 return 0; 440 return 0;
438} 441}
… …
444 DisplayString (display)); 447 DisplayString (display));
445 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
446 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
447} 450}
448 451
449/*----------------------------------------------------------------------*/
450bool
451rxvt_term::init (int argc, const char *const *argv)
452{
453 SET_R (this);
454 set_locale ("");
455 set_environ (envv); // few things in X do not call setlocale :(
456
457 if (!init_vars ())
458 return false;
459
460 init_secondary ();
461
462 const char **cmd_argv = init_resources (argc, argv);
463
464#ifdef KEYSYM_RESOURCE
465 keyboard->register_done ();
466#endif
467
468#ifdef HAVE_SCROLLBARS
469 if (OPTION (Opt_scrollBar))
470 scrollBar.setIdle (); /* set existence for size calculations */
471#endif
472
473#if ENABLE_PERL
474 if (!rs[Rs_perl_ext_1])
475 rs[Rs_perl_ext_1] = "default";
476
477 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
478 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
479 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
480 {
481 rxvt_perl.init (this);
482 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
483 }
484#endif
485
486 pty = rxvt_new_ptytty ();
487
488 create_windows (argc, argv);
489
490 dDisp;
491
492 init_xlocale ();
493
494 scr_reset (); // initialize screen
495
496#if 0
497 XSynchronize (disp, True);
498#endif
499
500#ifdef HAVE_SCROLLBARS
501 if (OPTION (Opt_scrollBar))
502 resize_scrollbar (); /* create and map scrollbar */
503#endif
504#ifdef TRANSPARENT
505 if (OPTION (Opt_transparent))
506 {
507 XSelectInput (disp, display->root, PropertyChangeMask);
508 check_our_parents ();
509 rootwin_ev.start (display, display->root);
510 }
511#endif
512
513 XMapWindow (disp, vt);
514 XMapWindow (disp, parent[0]);
515
516 set_colorfgbg ();
517
518 init_command (cmd_argv);
519
520 free (cmd_argv);
521
522 if (pty->pty >= 0)
523 pty_ev.start (pty->pty, EVENT_READ);
524
525 check_ev.start ();
526
527 HOOK_INVOKE ((this, HOOK_START, DT_END));
528
529 return true;
530}
531
532static struct sig_handlers 452static struct sig_handlers
533{ 453{
534 sig_watcher sw_term, sw_int; 454 ev::sig sw_term, sw_int;
535 455
536 /* 456 /*
537 * Catch a fatal signal and tidy up before quitting 457 * Catch a fatal signal and tidy up before quitting
538 */ 458 */
539 void 459 void sig_term (ev::sig &w, int revents);
540 sig_term (sig_watcher &w) 460
461 sig_handlers ()
541 { 462 {
542#ifdef DEBUG_CMD 463 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
543 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
544#endif
545 rxvt_emergency_cleanup ();
546 signal (w.signum, SIG_DFL);
547 kill (getpid (), w.signum);
548 }
549
550 sig_handlers ()
551 : sw_term (this, &sig_handlers::sig_term),
552 sw_int (this, &sig_handlers::sig_term) 464 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
553 {
554 } 465 }
555} sig_handlers; 466} sig_handlers;
556 467
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
557char **rxvt_environ; // startup environment 476char **rxvt_environ; // startup environment
558 477
559void 478void
560rxvt_init () 479rxvt_init ()
561{ 480{
562 uid_t uid = getuid (); 481 ptytty::init ();
563 gid_t gid = getgid ();
564
565 // before doing anything else, check for setuid/setgid operation,
566 // start the helper process and drop privileges
567 if (uid != geteuid ()
568 || gid != getegid ())
569 {
570#if PTYTTY_HELPER
571 rxvt_ptytty_server ();
572#else
573 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
574#endif
575 482
576 // drop privileges 483 if (!ev_default_loop (0))
577#if HAVE_SETRESUID 484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
578 setresgid (gid, gid, gid);
579 setresuid (uid, uid, uid);
580#elif HAVE_SETREUID
581 setregid (gid, gid);
582 setreuid (uid, uid);
583#elif HAVE_SETUID
584 setgid (gid);
585 setuid (uid);
586#endif
587
588 if (uid != geteuid ()
589 || gid != getegid ())
590 rxvt_fatal ("unable to drop privileges, aborting.\n");
591 }
592 485
593 rxvt_environ = environ; 486 rxvt_environ = environ;
594 487
595 signal (SIGHUP, SIG_IGN); 488 signal (SIGHUP, SIG_IGN);
596 signal (SIGPIPE, SIG_IGN); 489 signal (SIGPIPE, SIG_IGN);
597 490
598 sig_handlers.sw_term.start (SIGTERM); 491 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
599 sig_handlers.sw_int.start (SIGINT); 492 sig_handlers.sw_int.start (SIGINT); ev_unref ();
600 493
601 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
602 /* signal (SIGURG, SIG_DFL); */ 495 /* signal (SIGURG, SIG_DFL); */
603 496
604 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
606 XSetIOErrorHandler (rxvt_xioerror_handler); 499 XSetIOErrorHandler (rxvt_xioerror_handler);
607 500
608 XrmInitialize (); 501 XrmInitialize ();
609} 502}
610 503
611/* ------------------------------------------------------------------------- *
612 * MEMORY ALLOCATION WRAPPERS *
613 * ------------------------------------------------------------------------- */
614void *
615rxvt_malloc (size_t size)
616{
617 void *p = malloc (size);
618
619 if (!p)
620 rxvt_fatal ("memory allocation failure. aborting.\n");
621
622 return p;
623}
624
625void *
626rxvt_calloc (size_t number, size_t size)
627{
628 void *p = calloc (number, size);
629
630 if (!p)
631 rxvt_fatal ("memory allocation failure. aborting.\n");
632
633 return p;
634}
635
636void *
637rxvt_realloc (void *ptr, size_t size)
638{
639 void *p = realloc (ptr, size);
640
641 if (!p)
642 rxvt_fatal ("memory allocation failure. aborting.\n");
643
644 return p;
645}
646
647/*----------------------------------------------------------------------*/ 504/*----------------------------------------------------------------------*/
648/* 505/*
649 * window size/position calculcations for XSizeHint and other storage. 506 * window size/position calculations for XSizeHint and other storage.
650 * if width/height are non-zero then override calculated width/height 507 * if width/height are non-zero then override calculated width/height
651 */ 508 */
652void 509void
653rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
654{ 511{
655 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
656 int x, y, sb_w, flags; 513 int x, y, flags;
657 unsigned int w, h; 514 unsigned int w, h;
658 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
659 dDisp;
660
661 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
662 ncol, nrow, szHint.width, szHint.height));
663 516
664 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
665 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
666 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 519 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
667 520
… …
675 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
676 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
677 530
678 if (flags & WidthValue) 531 if (flags & WidthValue)
679 { 532 {
533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
680 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
681 szHint.flags |= USSize; 537 szHint.flags |= USSize;
682 } 538 }
683 539
684 if (flags & HeightValue) 540 if (flags & HeightValue)
685 { 541 {
542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
686 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
687 szHint.flags |= USSize; 546 szHint.flags |= USSize;
688 } 547 }
689 548
690 if (flags & XValue) 549 if (flags & XValue)
691 { 550 {
… …
722 max_width = MAX_COLS * fwidth; 581 max_width = MAX_COLS * fwidth;
723 max_height = MAX_ROWS * fheight; 582 max_height = MAX_ROWS * fheight;
724 583
725 szHint.base_width = szHint.base_height = 2 * int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
726 585
727 sb_w = 0;
728 window_vt_x = window_vt_y = int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
729 587
730 if (scrollBar.state) 588 if (scrollBar.state)
731 { 589 {
732 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
733 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
592
734 if (!OPTION (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
735 window_vt_x += sb_w; 594 window_vt_x += sb_w;
736 } 595 }
737 596
738 szHint.width_inc = fwidth; 597 szHint.width_inc = fwidth;
739 szHint.height_inc = fheight; 598 szHint.height_inc = fheight;
740 szHint.min_width = szHint.base_width + szHint.width_inc; 599 szHint.min_width = szHint.base_width + szHint.width_inc;
741 szHint.min_height = szHint.base_height + szHint.height_inc; 600 szHint.min_height = szHint.base_height + szHint.height_inc;
742 601
743 if (newwidth && newwidth - szHint.base_width < max_width) 602 if (newwidth && newwidth - szHint.base_width < max_width)
744 { 603 {
745 szHint.width = newwidth; 604 szHint.width = newwidth;
… …
760 { 619 {
761 min_it (height, max_height); 620 min_it (height, max_height);
762 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
763 } 622 }
764 623
765 if (scrollBar.state && OPTION (Opt_scrollBar_right))
766 window_sb_x = szHint.width - sb_w;
767
768 if (recalc_x) 624 if (recalc_x)
769 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
626
770 if (recalc_y) 627 if (recalc_y)
771 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
772 629
773 ncol = width / fwidth; 630 ncol = width / fwidth;
774 nrow = height / fheight; 631 nrow = height / fheight;
775 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
776 ncol, nrow, szHint.width,
777 szHint.height));
778 return;
779} 632}
780 633
781/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
782/* 635/*
783 * Tell the teletype handler what size the window is. 636 * Tell the teletype handler what size the window is.
… …
793 646
794 ws.ws_col = ncol; 647 ws.ws_col = ncol;
795 ws.ws_row = nrow; 648 ws.ws_row = nrow;
796 ws.ws_xpixel = width; 649 ws.ws_xpixel = width;
797 ws.ws_ypixel = height; 650 ws.ws_ypixel = height;
798 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 651 ioctl (pty->pty, TIOCSWINSZ, &ws);
799 652
800#if 0 653#if 0
801 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 654 // TIOCSWINSZ is supposed to do this automatically and correctly
802 if (cmd_pid) /* force through to the command */ 655 if (cmd_pid) /* force through to the command */
803 kill (-cmd_pid, SIGWINCH); 656 kill (-cmd_pid, SIGWINCH);
804#endif 657#endif
805} 658}
806 659
… …
835 delete fontset[0]; 688 delete fontset[0];
836 fontset[0] = fs; 689 fontset[0] = fs;
837 690
838 prop = (*fs)[1]->properties (); 691 prop = (*fs)[1]->properties ();
839 prop.height += lineSpace; 692 prop.height += lineSpace;
693
840 fs->set_prop (prop); 694 fs->set_prop (prop, false);
841 695
842 fwidth = prop.width; 696 fwidth = prop.width;
843 fheight = prop.height; 697 fheight = prop.height;
844 fbase = prop.ascent; 698 fbase = prop.ascent;
845 699
… …
854 { 708 {
855 fontset[style] = fs = new rxvt_fontset (this); 709 fontset[style] = fs = new rxvt_fontset (this);
856 rxvt_fontprop prop2 = prop; 710 rxvt_fontprop prop2 = prop;
857 711
858 if (res) 712 if (res)
859 prop2.weight = prop2.slant = rxvt_fontprop::unset; 713 {
714 fs->populate (res);
715 fs->set_prop (prop2, false);
716 }
860 else 717 else
861 { 718 {
862 res = fontset[0]->fontdesc; 719 fs->populate (fontset[0]->fontdesc);
863 720
864 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;
865 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);
866 } 725 }
867 726
868 fs->populate (res);
869 fs->set_prop (prop2);
870 } 727 }
871#else 728#else
872 fontset[style] = fontset[0]; 729 fontset[style] = fontset[0];
873#endif 730#endif
874 } 731 }
… …
876 if (parent[0]) 733 if (parent[0])
877 { 734 {
878 resize_all_windows (0, 0, 0); 735 resize_all_windows (0, 0, 0);
879 scr_remap_chars (); 736 scr_remap_chars ();
880 scr_touch (true); 737 scr_touch (true);
881 } 738 }
882 739
883 return true; 740 return true;
884} 741}
885 742
743void
886void rxvt_term::set_string_property (Atom prop, const char *str, int len) 744rxvt_term::set_string_property (Atom prop, const char *str, int len)
887{ 745{
888 XChangeProperty (display->display, parent[0], 746 XChangeProperty (dpy, parent[0],
889 prop, XA_STRING, 8, PropModeReplace, 747 prop, XA_STRING, 8, PropModeReplace,
890 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 748 (const unsigned char *)str, len >= 0 ? len : strlen (str));
891} 749}
892 750
751void
893void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 752rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
894{ 753{
895 wchar_t *ws = rxvt_mbstowcs (str, len); 754 wchar_t *ws = rxvt_mbstowcs (str, len);
896 char *s = rxvt_wcstoutf8 (ws); 755 char *s = rxvt_wcstoutf8 (ws);
897 756
898 XChangeProperty (display->display, parent[0], 757 XChangeProperty (dpy, parent[0],
899 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
900 (const unsigned char *)s, strlen (s)); 759 (const unsigned char *)s, strlen (s));
901 760
902 free (s); 761 free (s);
903 free (ws); 762 free (ws);
… …
922#if ENABLE_EWMH 781#if ENABLE_EWMH
923 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
924#endif 783#endif
925} 784}
926 785
786void
787rxvt_term::set_window_color (int idx, const char *color)
788{
927#ifdef XTERM_COLOR_CHANGE 789#ifdef XTERM_COLOR_CHANGE
928void
929rxvt_term::set_window_color (int idx, const char *color)
930{
931 rxvt_color xcol; 790 rxvt_color xcol;
932 int i;
933 791
934 if (color == NULL || *color == '\0') 792 if (color == NULL || *color == '\0')
935 return; 793 return;
936 794
795 color = strdup (color);
796 allocated.push_back ((void *)color);
797 rs[Rs_color + idx] = color;
798
937 /* handle color aliases */ 799 /* handle color aliases */
938 if (isdigit (*color)) 800 if (isdigit (*color))
939 { 801 {
940 i = atoi (color); 802 int i = atoi (color);
941 803
942 if (i >= 8 && i <= 15) 804 if (i >= 8 && i <= 15)
805 {
943 { /* bright colors */ 806 /* bright colors */
944 i -= 8;
945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
946 SET_PIXCOLOR (idx);
947 goto done; 808 goto done;
948 } 809 }
949 810
950 if (i >= 0 && i <= 7) 811 if (i >= 0 && i <= 7)
812 {
951 { /* normal colors */ 813 /* normal colors */
952 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 814 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
953 SET_PIXCOLOR (idx);
954 goto done; 815 goto done;
955 } 816 }
956 } 817 }
957 818
958 if (!rXParseAllocColor (&xcol, color)) 819 set_color (xcol, color);
959 return;
960
961 /* XStoreColor (display->display, display->cmap, XColor*); */
962 820
963 /* 821 /*
964 * 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,
965 * so just keep gobbling up the colormap 823 * so just keep gobbling up the colormap
966 */ 824 */
967# if 0
968 for (i = Color_Black; i <= Color_White; i++)
969 if (pix_colors[idx] == pix_colors[i])
970 break;
971 if (i > Color_White)
972 {
973 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
974 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
975 DisplayPlanes (display->display, display->screen));
976 }
977# endif
978 825
979 pix_colors_focused[idx] = xcol; 826 pix_colors_focused[idx] = xcol;
980 SET_PIXCOLOR (idx);
981 827
982 /* XSetWindowAttributes attr; */
983 /* Cursor cursor; */
984done: 828done:
985
986#if OFF_FOCUS_FADING
987 if (rs[Rs_fade])
988 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
989#endif
990
991 /*TODO: handle Color_BD, scrollbar background, etc. */ 829 /*TODO: handle Color_BD, scrollbar background, etc. */
992 830
831 update_fade_color (idx);
993 recolour_cursor (); 832 recolour_cursor ();
994 scr_recolour (); 833 scr_recolour ();
834#endif /* XTERM_COLOR_CHANGE */
995} 835}
996
997#else
998# define set_window_color (idx,color) ((void)0)
999#endif /* XTERM_COLOR_CHANGE */
1000 836
1001void 837void
1002rxvt_term::recolour_cursor () 838rxvt_term::recolour_cursor ()
1003{ 839{
1004 XColor xcol[2]; 840 XColor fg, bg;
1005 841
1006 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 842 (ISSET_PIXCOLOR (Color_pointer_fg)
1007 ? pix_colors_focused[Color_pointer_fg] 843 ? pix_colors_focused[Color_pointer_fg]
1008 : pix_colors_focused[Color_fg]; 844 : pix_colors_focused[Color_fg]).get (fg);
845
1009 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 846 (ISSET_PIXCOLOR (Color_pointer_bg)
1010 ? pix_colors_focused[Color_pointer_bg] 847 ? pix_colors_focused[Color_pointer_bg]
1011 : pix_colors_focused[Color_bg]; 848 : pix_colors_focused[Color_bg]).get (bg);
1012 849
1013 XQueryColors (display->display, display->cmap, xcol, 2); 850 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1014 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1015} 851}
1016 852
1017/*----------------------------------------------------------------------*/ 853/*----------------------------------------------------------------------*/
1018/* 854/*
1019 * 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
1020 */ 856 */
1021void 857void
1022rxvt_term::set_colorfgbg () 858rxvt_term::set_colorfgbg ()
1023{ 859{
1024 unsigned int i; 860 unsigned int i;
1025 const char *xpmb = "\0"; 861 const char *xpmb = "";
1026 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1027 863
1028 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1029 strcpy (fstr, "default"); 864 strcpy (fstr, "default");
1030 strcpy (bstr, "default"); 865 strcpy (bstr, "default");
1031 for (i = Color_Black; i <= Color_White; i++) 866 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[Color_fg] == pix_colors[i]) 867 if (pix_colors[Color_fg] == pix_colors[i])
1033 { 868 {
… …
1037 872
1038 for (i = Color_Black; i <= Color_White; i++) 873 for (i = Color_Black; i <= Color_White; i++)
1039 if (pix_colors[Color_bg] == pix_colors[i]) 874 if (pix_colors[Color_bg] == pix_colors[i])
1040 { 875 {
1041 sprintf (bstr, "%d", (i - Color_Black)); 876 sprintf (bstr, "%d", (i - Color_Black));
1042#ifdef XPM_BACKGROUND 877#ifdef BG_IMAGE_FROM_FILE
1043 xpmb = "default;"; 878 xpmb = "default;";
1044#endif 879#endif
1045 break; 880 break;
1046 } 881 }
1047 882
1048 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 883 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1049} 884}
1050 885
1051/*----------------------------------------------------------------------*/ 886/*----------------------------------------------------------------------*/
1052 887
1053int 888bool
1054rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 889rxvt_term::set_color (rxvt_color &color, const char *name)
1055{ 890{
1056 if (!screen_in_out->set (display, colour)) 891 if (color.set (this, name))
1057 {
1058 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1059 return false;
1060 }
1061
1062 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]);
1063} 902}
1064 903
1065/* -------------------------------------------------------------------- * 904/* -------------------------------------------------------------------- *
1066 * - WINDOW RESIZING - * 905 * - WINDOW RESIZING - *
1067 * -------------------------------------------------------------------- */ 906 * -------------------------------------------------------------------- */
1068void 907void
1069rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 908rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1070{ 909{
1071 int fix_screen; 910 int fix_screen;
1072 int old_width = szHint.width, old_height = szHint.height; 911 int old_width = szHint.width;
1073 dDisp; 912 int old_height = szHint.height;
1074 913
1075 window_calc (newwidth, newheight); 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);
1076 XSetWMNormalHints (disp, parent[0], &szHint); 922 XSetWMNormalHints (dpy, parent[0], &szHint);
923 szHint.flags |= PBaseSize | PResizeInc;
924 }
1077 925
1078 if (!ignoreparent) 926 if (!ignoreparent)
1079 { 927 {
1080#ifdef SMART_RESIZE 928#ifdef SMART_RESIZE
1081 /* 929 /*
… …
1085 int x, y, x1, y1; 933 int x, y, x1, y1;
1086 int dx, dy; 934 int dx, dy;
1087 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 935 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1088 Window unused_cr; 936 Window unused_cr;
1089 937
1090 XTranslateCoordinates (disp, parent[0], display->root, 938 XTranslateCoordinates (dpy, parent[0], display->root,
1091 0, 0, &x, &y, &unused_cr); 939 0, 0, &x, &y, &unused_cr);
1092 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 940 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1093 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 941 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1094 /* 942 /*
1095 * 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
1096 * our position for handles and decorations. Counter it 944 * our position for handles and decorations. Counter it
1097 */ 945 */
… …
1099 { 947 {
1100 x -= x1; 948 x -= x1;
1101 y -= y1; 949 y -= y1;
1102 } 950 }
1103 951
1104 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 952 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1105 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 953 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1106 dx = old_width - szHint.width; 954 dx = old_width - szHint.width;
1107 dy = old_height - szHint.height; 955 dy = old_height - szHint.height;
1108 956
1109 /* Check position of the center of the window */ 957 /* Check position of the center of the window */
1110 if (x < x1) /* left half */ 958 if (x < x1) /* left half */
1111 dx = 0; 959 dx = 0;
… …
1114 if (y < y1) /* top half */ 962 if (y < y1) /* top half */
1115 dy = 0; 963 dy = 0;
1116 else if (y == y1) /* exact center */ 964 else if (y == y1) /* exact center */
1117 dy /= 2; 965 dy /= 2;
1118 966
1119 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 967 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1120 szHint.width, szHint.height); 968 szHint.width, szHint.height);
1121#else 969#else
1122 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 970 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1123#endif 971#endif
1124 } 972 }
973
974 if (set_hint)
975 XSetWMNormalHints (dpy, parent[0], &szHint);
1125 976
1126 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 977 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1127 978
1128 if (fix_screen || newwidth != old_width || newheight != old_height) 979 if (fix_screen || newwidth != old_width || newheight != old_height)
1129 { 980 {
1130 if (scrollBar.state) 981 if (scrollBar.state)
1131 { 982 scrollBar.resize ();
1132 XMoveResizeWindow (disp, scrollBar.win,
1133 window_sb_x, 0,
1134 scrollbar_TotalWidth (), szHint.height);
1135 resize_scrollbar ();
1136 }
1137 983
1138 XMoveResizeWindow (disp, vt, 984 XMoveResizeWindow (dpy, vt,
1139 window_vt_x, window_vt_y, 985 window_vt_x, window_vt_y,
1140 width, height); 986 width, height);
1141 987
1142 scr_clear (); 988#ifdef HAVE_BG_PIXMAP
1143#ifdef XPM_BACKGROUND 989 if (bgPixmap.window_size_sensitive ())
1144 resize_pixmap (); 990 update_background ();
1145#endif 991#endif
1146 } 992 }
1147 993
1148 if (fix_screen || old_height == 0) 994 if (fix_screen || old_height == 0)
1149 {
1150 int curr_screen = -1;
1151 int old_ncol = prev_ncol;
1152
1153 /* scr_reset only works on the primary screen */
1154 if (old_height) /* this is not the first time through */
1155 {
1156 unsigned int ocol = ncol;
1157 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1158 curr_screen = scr_change_screen (PRIMARY);
1159 ncol = ocol;
1160 }
1161
1162 scr_reset (); 995 scr_reset ();
1163 996
1164 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
1165 { 998 //scr_touch (false);
1166 scr_change_screen (curr_screen);
1167 selection_check (old_ncol != ncol ? 4 : 0);
1168 }
1169 }
1170 999
1171 old_width = szHint.width; 1000#ifdef HAVE_BG_PIXMAP
1172 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 ?
1173 1002// if (bgPixmap.pixmap)
1174#ifdef XPM_BACKGROUND
1175 if (pixmap)
1176 scr_touch (false); 1003// scr_touch (false);
1177#endif 1004#endif
1178 1005
1179#ifdef USE_XIM 1006#ifdef USE_XIM
1180 IMSetStatusPosition (); 1007 IMSetPosition ();
1181#endif 1008#endif
1182} 1009}
1183 1010
1184/* 1011/*
1185 * 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.
… …
1190{ 1017{
1191 XWindowAttributes wattr; 1018 XWindowAttributes wattr;
1192 1019
1193 if (newwidth == 0 || newheight == 0) 1020 if (newwidth == 0 || newheight == 0)
1194 { 1021 {
1195 XGetWindowAttributes (display->display, display->root, &wattr); 1022 XGetWindowAttributes (dpy, display->root, &wattr);
1196 1023
1197 if (newwidth == 0) 1024 if (newwidth == 0)
1198 newwidth = wattr.width - szHint.base_width; 1025 newwidth = wattr.width - szHint.base_width;
1199 if (newheight == 0) 1026 if (newheight == 0)
1200 newheight = wattr.height - szHint.base_height; 1027 newheight = wattr.height - szHint.base_height;
… …
1214#ifdef USE_XIM 1041#ifdef USE_XIM
1215 1042
1216void 1043void
1217rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1044rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1218{ 1045{
1219 fg = pix_colors[Color_fg]; 1046 fg = pix_colors [Color_fg];
1220 bg = pix_colors[Color_bg]; 1047 bg = pix_colors [Color_bg];
1221} 1048}
1222 1049
1223void 1050void
1224rxvt_term::im_set_size (XRectangle &size) 1051rxvt_term::im_set_size (XRectangle &size)
1225{ 1052{
… …
1248 1075
1249/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1250bool 1077bool
1251rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1252{ 1079{
1253 char *p;
1254 Atom atom; 1080 Atom atom;
1255 Window win; 1081 Window win;
1256 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1257 1083
1258 /* get current locale modifier */ 1084 /* get current locale modifier */
1259 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1260 { 1086 {
1261 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1262 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1263 1089
1264 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1265 *p = '\0'; 1091 *p = '\0';
1266 1092
1267 atom = XInternAtom (display->display, server, False); 1093 atom = XInternAtom (dpy, server, False);
1268 win = XGetSelectionOwner (display->display, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1269 1095
1270 if (win != None) 1096 if (win != None)
1271 return True; 1097 return True;
1272 } 1098 }
1273 1099
… …
1280 XPoint nspot; 1106 XPoint nspot;
1281 XVaNestedList preedit_attr; 1107 XVaNestedList preedit_attr;
1282 1108
1283 if (!Input_Context 1109 if (!Input_Context
1284 || !focus 1110 || !focus
1285 || !(input_style & XIMPreeditPosition)) 1111 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1286 return; 1112 return;
1287 1113
1288 im_set_position (nspot); 1114 im_set_position (nspot);
1289 1115
1290 if (nspot.x == spot.x && nspot.y == spot.y) 1116 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1309 input_method = 0; 1135 input_method = 0;
1310 } 1136 }
1311 1137
1312 Input_Context = 0; 1138 Input_Context = 0;
1313} 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
1314 1214
1315/* 1215/*
1316 * 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
1317 * open a suitable preedit type 1217 * open a suitable preedit type
1318 */ 1218 */
… …
1325 XRectangle rect, status_rect, needed_rect; 1225 XRectangle rect, status_rect, needed_rect;
1326 unsigned long fg, bg; 1226 unsigned long fg, bg;
1327 const char *p; 1227 const char *p;
1328 char **s; 1228 char **s;
1329 XIMStyles *xim_styles; 1229 XIMStyles *xim_styles;
1230#ifdef ENABLE_XIM_ONTHESPOT
1231 XIMCallback xcb[4];
1232#endif
1330 1233
1331 set_environ (envv); 1234 set_environ (envv);
1332 1235
1333 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1236 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1334 return false; 1237 return false;
1335 1238
1336 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1337 input_method = display->get_xim (locale, modifiers); 1239 input_method = display->get_xim (locale, modifiers);
1338 if (input_method == NULL) 1240 if (input_method == NULL)
1339 return false; 1241 return false;
1340 1242
1341 xim = input_method->xim; 1243 xim = input_method->xim;
… …
1361 s = rxvt_splitcommastring (p); 1263 s = rxvt_splitcommastring (p);
1362 1264
1363 for (i = found = 0; !found && s[i]; i++) 1265 for (i = found = 0; !found && s[i]; i++)
1364 { 1266 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1267 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = (XIMPreeditPosition | XIMStatusNothing); 1268 input_style = XIMPreeditPosition | XIMStatusNothing;
1367 else if (!strcmp (s[i], "OffTheSpot")) 1269 else if (!strcmp (s[i], "OffTheSpot"))
1368 input_style = (XIMPreeditArea | XIMStatusArea); 1270 input_style = XIMPreeditArea | XIMStatusArea;
1369 else if (!strcmp (s[i], "Root")) 1271 else if (!strcmp (s[i], "Root"))
1370 input_style = (XIMPreeditNothing | XIMStatusNothing); 1272 input_style = XIMPreeditNothing | XIMStatusNothing;
1371 else if (!strcmp (s[i], "None")) 1273 else if (!strcmp (s[i], "None"))
1372 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;
1373 1281
1374 for (j = 0; j < xim_styles->count_styles; j++) 1282 for (j = 0; j < xim_styles->count_styles; j++)
1375 if (input_style == xim_styles->supported_styles[j]) 1283 if (input_style == xim_styles->supported_styles[j])
1376 { 1284 {
1377 rxvt_freecommastring (s); 1285 rxvt_freecommastring (s);
… …
1415 "*", 1323 "*",
1416 fheight, 1324 fheight,
1417 fheight + 1, fheight - 1, 1325 fheight + 1, fheight - 1,
1418 fheight - 2, fheight + 2); 1326 fheight - 2, fheight + 2);
1419 1327
1420 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1328 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1421 &missing_charset_list, &missing_charset_count, &def_string); 1329 &missing_charset_list, &missing_charset_count, &def_string);
1422 1330
1423 if (missing_charset_list) 1331 if (missing_charset_list)
1424 XFreeStringList (missing_charset_list); 1332 XFreeStringList (missing_charset_list);
1425 1333
… …
1466 XNBackground, bg, 1374 XNBackground, bg,
1467 XNArea, &status_rect, 1375 XNArea, &status_rect,
1468 XNFontSet, fs, 1376 XNFontSet, fs,
1469 NULL); 1377 NULL);
1470 } 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
1471 1402
1472 Input_Context = XCreateIC (xim, 1403 Input_Context = XCreateIC (xim,
1473 XNInputStyle, input_style, 1404 XNInputStyle, input_style,
1474 XNClientWindow, vt, 1405 XNClientWindow, vt,
1475 XNFocusWindow, parent[0], 1406 XNFocusWindow, parent[0],
… …
1477 preedit_attr, 1408 preedit_attr,
1478 status_attr ? XNStatusAttributes : NULL, 1409 status_attr ? XNStatusAttributes : NULL,
1479 status_attr, NULL); 1410 status_attr, NULL);
1480 1411
1481 if (preedit_attr) XFree (preedit_attr); 1412 if (preedit_attr) XFree (preedit_attr);
1482 if (status_attr) XFree (status_attr); 1413 if (status_attr) XFree (status_attr);
1483 if (fs) XFreeFontSet (display->display, fs); 1414 if (fs) XFreeFontSet (dpy, fs);
1484 1415
1485 if (Input_Context == NULL) 1416 if (Input_Context == NULL)
1486 { 1417 {
1487 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1418 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1488 im_destroy (); 1419 im_destroy ();
1489 return false; 1420 return false;
1490 } 1421 }
1491 1422
1492 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
1493 IMSetStatusPosition (); 1429 IMSetPosition ();
1494 1430
1495 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1496 return true; 1431 return true;
1497} 1432}
1498 1433
1499void 1434void
1500rxvt_term::im_cb () 1435rxvt_term::im_cb ()
… …
1506 1441
1507 make_current (); 1442 make_current ();
1508 1443
1509 im_destroy (); 1444 im_destroy ();
1510 1445
1511 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1512 if (Input_Context) 1446 if (Input_Context)
1513 return; 1447 return;
1514 1448
1515#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1449#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1516 if (rs[Rs_imLocale]) 1450 if (rs[Rs_imLocale])
… …
1558 SET_LOCALE (locale); 1492 SET_LOCALE (locale);
1559#endif 1493#endif
1560} 1494}
1561 1495
1562void 1496void
1563rxvt_term::IMSetStatusPosition () 1497rxvt_term::IMSetPosition ()
1564{ 1498{
1565 XRectangle preedit_rect, status_rect, *needed_rect; 1499 XRectangle preedit_rect, status_rect, *needed_rect;
1566 XVaNestedList preedit_attr, status_attr; 1500 XVaNestedList preedit_attr, status_attr;
1567 1501
1568 if (!Input_Context 1502 if (!Input_Context
1569 || !focus 1503 || !focus
1570 || !(input_style & XIMPreeditArea) 1504 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1571 || !IMisRunning ()) 1505 || !IMisRunning ())
1572 return; 1506 return;
1573 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 {
1574 /* Getting the necessary width of preedit area */ 1518 /* Getting the necessary width of preedit area */
1575 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1519 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1576 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1520 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1577 XFree (status_attr); 1521 XFree (status_attr);
1578 1522
1579 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1523 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1580 XFree (needed_rect); 1524 XFree (needed_rect);
1581 1525
1582 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1526 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1583 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1527 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1584 1528
1585 XSetICValues (Input_Context, 1529 XSetICValues (Input_Context,
1586 XNPreeditAttributes, preedit_attr, 1530 XNPreeditAttributes, preedit_attr,
1587 XNStatusAttributes, status_attr, NULL); 1531 XNStatusAttributes, status_attr,
1532 NULL);
1588 1533
1534 XFree (status_attr);
1535 }
1536
1589 XFree (preedit_attr); 1537 XFree (preedit_attr);
1590 XFree (status_attr);
1591} 1538}
1592#endif /* USE_XIM */ 1539#endif /* USE_XIM */
1593 1540
1594/*----------------------------------------------------------------------*/ 1541void
1595rxvt_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 */
1596 1607
1597/*----------------------- end-of-file (C source) -----------------------*/ 1608/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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