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.163 by root, Fri Jan 6 02:11:15 2006 UTC vs.
Revision 1.228 by root, Wed Aug 2 09:14:19 2006 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-2006 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.
… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
58 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
59 return false; 67 return false;
60 68
61 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
62 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
63 return true; 71 return true;
64} 72}
65 73
66bool 74void
67rxvt_push_locale (const char *locale) 75rxvt_push_locale (const char *locale) NOTHROW
68{ 76{
69 strcpy (savelocale, curlocale); 77 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 78 rxvt_set_locale (locale);
71} 79}
72 80
73void 81void
74rxvt_pop_locale () 82rxvt_pop_locale () NOTHROW
75{ 83{
76 rxvt_set_locale (savelocale); 84 rxvt_set_locale (savelocale);
77} 85}
78 86
79#if ENABLE_COMBINING 87#if ENABLE_COMBINING
… …
140} 148}
141#endif 149#endif
142 150
143rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
144 : 152 :
145#if TRANSPARENT 153#if TRANSPARENT || ENABLE_PERL
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 155#endif
148#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 157 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 158#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 161#endif
157#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
170 pointer_ev (this, &rxvt_term::pointer_cb), 175 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 176#endif
172#ifdef USE_XIM 177#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 178 im_ev (this, &rxvt_term::im_cb),
174#endif 179#endif
180#ifndef NO_BELL
181 bell_ev (this, &rxvt_term::bell_cb),
182#endif
175 termwin_ev (this, &rxvt_term::x_cb), 183 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 184 vt_ev (this, &rxvt_term::x_cb),
185 child_ev (this, &rxvt_term::child_cb),
177 check_ev (this, &rxvt_term::check_cb), 186 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb), 187 flush_ev (this, &rxvt_term::flush_cb),
179 destroy_ev (this, &rxvt_term::destroy_cb), 188 destroy_ev (this, &rxvt_term::destroy_cb),
180 pty_ev (this, &rxvt_term::pty_cb), 189 pty_ev (this, &rxvt_term::pty_cb),
181 incr_ev (this, &rxvt_term::incr_cb) 190 incr_ev (this, &rxvt_term::incr_cb)
… …
184 193
185 termlist.push_back (this); 194 termlist.push_back (this);
186 195
187#ifdef KEYSYM_RESOURCE 196#ifdef KEYSYM_RESOURCE
188 keyboard = new keyboard_manager; 197 keyboard = new keyboard_manager;
189
190 if (!keyboard)
191 rxvt_fatal ("out of memory, aborting.\n");
192#endif 198#endif
193} 199}
194 200
195// clean up the most important stuff, do *not* call x or free mem etc. 201// clean up the most important stuff, do *not* call x or free mem etc.
196// for use before an emergency exit 202// for use before an emergency exit
197void rxvt_term::emergency_cleanup () 203void rxvt_term::emergency_cleanup ()
198{ 204{
199 if (cmd_pid) 205 if (cmd_pid)
200 kill (-cmd_pid, SIGHUP); 206 kill (-cmd_pid, SIGHUP);
201 207
202#ifdef UTMP_SUPPORT 208 pty_ev.stop ();
203 privileged_utmp (RESTORE); 209 delete pty; pty = 0;
204#endif
205
206 pty.put ();
207} 210}
208 211
209rxvt_term::~rxvt_term () 212rxvt_term::~rxvt_term ()
210{ 213{
211 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 214 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 215
215 emergency_cleanup (); 216 emergency_cleanup ();
216 217
217#if ENABLE_STYLES 218#if ENABLE_STYLES
… …
221#endif 222#endif
222 delete fontset[0]; 223 delete fontset[0];
223 224
224 if (display) 225 if (display)
225 { 226 {
226 dDisp;
227
228 selection_clear (); 227 selection_clear ();
229 228
230#ifdef USE_XIM 229#ifdef USE_XIM
231 im_destroy (); 230 im_destroy ();
232#endif 231#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif
236#ifdef XTERM_SCROLLBAR 232#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 233 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 234 if (ShadowGC) XFreeGC (dpy, ShadowGC);
239#endif 235#endif
240#ifdef PLAIN_SCROLLBAR 236#ifdef PLAIN_SCROLLBAR
241 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 237 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
242#endif 238#endif
243#ifdef NEXT_SCROLLBAR 239#ifdef NEXT_SCROLLBAR
244 if (blackGC) XFreeGC (disp, blackGC); 240 if (blackGC) XFreeGC (dpy, blackGC);
245 if (whiteGC) XFreeGC (disp, whiteGC); 241 if (whiteGC) XFreeGC (dpy, whiteGC);
246 if (grayGC) XFreeGC (disp, grayGC); 242 if (grayGC) XFreeGC (dpy, grayGC);
247 if (darkGC) XFreeGC (disp, darkGC); 243 if (darkGC) XFreeGC (dpy, darkGC);
248 if (stippleGC) XFreeGC (disp, stippleGC); 244 if (stippleGC) XFreeGC (dpy, stippleGC);
249 if (dimple) XFreePixmap (disp, dimple); 245 if (dimple) XFreePixmap (dpy, dimple);
250 if (upArrow) XFreePixmap (disp, upArrow); 246 if (upArrow) XFreePixmap (dpy, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 247 if (downArrow) XFreePixmap (dpy, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 248 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 249 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
254#endif 250#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 251#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 252 if (topShadowGC) XFreeGC (dpy, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 253 if (botShadowGC) XFreeGC (dpy, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 254 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
259#endif 255#endif
260 if (gc) XFreeGC (disp, gc); 256 if (gc) XFreeGC (dpy, gc);
261 257
262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
263 delete menuBar.drawable;
264 //if (menuBar.win)
265 // XDestroyWindow (disp, menuBar.win);
266#endif
267 delete drawable; 258 delete drawable;
268 // destroy all windows 259 // destroy all windows
269 if (parent[0]) 260 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 261 XDestroyWindow (dpy, parent[0]);
271 }
272 262
273 // TODO: free pixcolours, colours should become part of rxvt_display 263 for (int i = 0; i < TOTAL_COLORS; i++)
264 if (ISSET_PIXCOLOR (i))
265 {
266 pix_colors_focused [i].free (this);
267#if OFF_FOCUS_FADING
268 pix_colors_unfocused [i].free (this);
269#endif
270 }
271
272 clear ();
273 }
274 274
275 delete pix_colors_focused; 275 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 277 delete pix_colors_unfocused;
278#endif 278#endif
… …
285 for (int i = 0; i < allocated.size (); i++) 285 for (int i = 0; i < allocated.size (); i++)
286 free (allocated [i]); 286 free (allocated [i]);
287 287
288 free (selection.text); 288 free (selection.text);
289 // TODO: manage env vars in child only(!) 289 // TODO: manage env vars in child only(!)
290 free (env_windowid);
291 free (env_display); 290 free (env_display);
292 free (env_term); 291 free (env_term);
293 free (env_colorfgbg);
294 free (locale); 292 free (locale);
295 free (v_buffer); 293 free (v_buffer);
296 free (incr_buf); 294 free (incr_buf);
297 295
298 delete envv; 296 delete envv;
… …
301#ifdef KEYSYM_RESOURCE 299#ifdef KEYSYM_RESOURCE
302 delete keyboard; 300 delete keyboard;
303#endif 301#endif
304} 302}
305 303
304// child has exited, usually destroys
306void 305void
307rxvt_term::child_exit () 306rxvt_term::child_cb (child_watcher &w, int status)
308{ 307{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309
309 cmd_pid = 0; 310 cmd_pid = 0;
310 311
311 if (!OPTION (Opt_hold)) 312 if (!OPTION (Opt_hold))
312 destroy (); 313 destroy ();
313} 314}
… …
316rxvt_term::destroy () 317rxvt_term::destroy ()
317{ 318{
318 if (destroy_ev.active) 319 if (destroy_ev.active)
319 return; 320 return;
320 321
322 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323
321#if ENABLE_OVERLAY 324#if ENABLE_OVERLAY
322 scr_overlay_off (); 325 scr_overlay_off ();
323#endif 326#endif
324 327
325 if (display) 328 if (display)
… …
328 im_ev.stop (display); 331 im_ev.stop (display);
329#endif 332#endif
330#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
332#endif 335#endif
333#if MENUBAR 336#if TRANSPARENT || ENABLE_PERL
334 menubar_ev.stop (display);
335#endif
336#if TRANSPARENT
337 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
338#endif 338#endif
339 incr_ev.stop (); 339 incr_ev.stop ();
340 termwin_ev.stop (display); 340 termwin_ev.stop (display);
341 vt_ev.stop (display); 341 vt_ev.stop (display);
… …
363} 363}
364 364
365void 365void
366rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
367{ 367{
368 SET_R (this); 368 make_current ();
369 369
370 delete this; 370 delete this;
371} 371}
372 372
373/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
… …
382{ 382{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup (); 384 (*t)->emergency_cleanup ();
385} 385}
386 386
387#if ENABLE_FRILLS 387#if !ENABLE_MINIMAL
388static void 388static void
389print_x_error (Display *dpy, XErrorEvent *event) 389print_x_error (Display *dpy, XErrorEvent *event)
390{ 390{
391 char buffer[BUFSIZ]; 391 char buffer[BUFSIZ];
392 char mesg[BUFSIZ]; 392 char mesg[BUFSIZ];
… …
440 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
441 else 441 else
442 { 442 {
443 // GET_R is most likely not the terminal which caused the error, 443 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue 444 // so just output the error and continue
445#if ENABLE_FRILLS 445#if ENABLE_MINIMAL
446 old_xerror_handler (display, event);
447#else
446 print_x_error (display, event); 448 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif 449#endif
450 } 450 }
451 451
452 return 0; 452 return 0;
453} 453}
… …
461 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
462} 462}
463 463
464/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
465bool 465bool
466rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 467{
468 this->envv = envv;
469
468 SET_R (this); 470 SET_R (this);
469
470 set_locale (""); 471 set_locale ("");
472 set_environ (envv); // few things in X do not call setlocale :(
471 473
472 if (!init_vars ()) 474 if (!init_vars ())
473 return false; 475 return false;
474 476
475 init_secondary (); 477 init_secondary ();
… …
478 480
479#ifdef KEYSYM_RESOURCE 481#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 482 keyboard->register_done ();
481#endif 483#endif
482 484
483#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 486 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 488#endif
490 489
491#if ENABLE_PERL 490 pty = ptytty::create ();
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496 rxvt_perl.init ();
497 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
498 }
499#endif
500 491
501 create_windows (argc, argv); 492 create_windows (argc, argv);
502 493
503 dDisp;
504
505 init_xlocale (); 494 init_xlocale ();
506 495
507 scr_reset (); /* initialize screen */ 496 scr_reset (); // initialize screen
508 497
509#if 0 498#if 0
510 XSynchronize (disp, True); 499 XSynchronize (dpy, True);
511#endif 500#endif
512 501
513#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
514 if (OPTION (Opt_scrollBar)) 503 if (OPTION (Opt_scrollBar))
515 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
516#endif 505#endif
517#if (MENUBAR_MAX)
518 if (menubar_visible ())
519 XMapWindow (disp, menuBar.win);
520#endif
521#ifdef TRANSPARENT 506#ifdef TRANSPARENT
522 if (OPTION (Opt_transparent)) 507 if (OPTION (Opt_transparent))
523 { 508 {
524 XSelectInput (disp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
525 check_our_parents (); 510 check_our_parents ();
526 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
527 } 512 }
528#endif 513#endif
529 514#if ENABLE_PERL
530 XMapWindow (disp, vt); 515 rootwin_ev.start (display, display->root);
531 XMapWindow (disp, parent[0]); 516#endif
532 517
533 set_colorfgbg (); 518 set_colorfgbg ();
534 519
535 init_command (cmd_argv); 520 init_command (cmd_argv);
536 521
537 free (cmd_argv); 522 free (cmd_argv);
538 523
539 if (pty.pty >= 0) 524 if (pty->pty >= 0)
540 pty_ev.start (pty.pty, EVENT_READ); 525 pty_ev.start (pty->pty, EVENT_READ);
541 526
542 check_ev.start (); 527 check_ev.start ();
543 528
544 HOOK_INVOKE ((this, HOOK_START, DT_END)); 529 HOOK_INVOKE ((this, HOOK_START, DT_END));
545 530
531#if ENABLE_XEMBED
532 if (rs[Rs_embed])
533 {
534 long info[2] = { 0, XEMBED_MAPPED };
535
536 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
537 32, PropModeReplace, (unsigned char *)&info, 2);
538 }
539#endif
540
541 XMapWindow (dpy, vt);
542 XMapWindow (dpy, parent[0]);
543
546 return true; 544 return true;
547} 545}
548 546
549static struct sig_handlers 547static struct sig_handlers
550{ 548{
551 sig_watcher sw_chld, sw_term, sw_int; 549 sig_watcher sw_term, sw_int;
552 550
553 void sig_chld (sig_watcher &w)
554 {
555 // we are being called for every SIGCHLD, find the corresponding term
556 int pid;
557
558 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
559 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
560 if (pid == (*t)->cmd_pid)
561 {
562 (*t)->child_exit ();
563 break;
564 }
565 }
566
567 /* 551 /*
568 * Catch a fatal signal and tidy up before quitting 552 * Catch a fatal signal and tidy up before quitting
569 */ 553 */
570 void 554 void
571 sig_term (sig_watcher &w) 555 sig_term (sig_watcher &w)
572 { 556 {
573#ifdef DEBUG_CMD
574 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
575#endif
576 rxvt_emergency_cleanup (); 557 rxvt_emergency_cleanup ();
577 signal (w.signum, SIG_DFL); 558 signal (w.signum, SIG_DFL);
578 kill (getpid (), w.signum); 559 kill (getpid (), w.signum);
579 } 560 }
580 561
581 sig_handlers () 562 sig_handlers ()
582 : sw_chld (this, &sig_handlers::sig_chld),
583 sw_term (this, &sig_handlers::sig_term), 563 : sw_term (this, &sig_handlers::sig_term),
584 sw_int (this, &sig_handlers::sig_term) 564 sw_int (this, &sig_handlers::sig_term)
585 { 565 {
586 } 566 }
587} sig_handlers; 567} sig_handlers;
588 568
569char **rxvt_environ; // startup environment
570
589void 571void
590rxvt_init () 572rxvt_init ()
591{ 573{
592 /* 574 ptytty::init ();
593 * Save and then give up any super-user privileges 575
594 * If we need privileges in any area then we must specifically request it. 576 rxvt_environ = environ;
595 * We should only need to be root in these cases:
596 * 1. write utmp entries on some systems
597 * 2. chown tty on some systems
598 */
599 rxvt_privileges (SAVE);
600 rxvt_privileges (IGNORE);
601 577
602 signal (SIGHUP, SIG_IGN); 578 signal (SIGHUP, SIG_IGN);
603 signal (SIGPIPE, SIG_IGN); 579 signal (SIGPIPE, SIG_IGN);
604 580
605 sig_handlers.sw_chld.start (SIGCHLD);
606 sig_handlers.sw_term.start (SIGTERM); 581 sig_handlers.sw_term.start (SIGTERM);
607 sig_handlers.sw_int.start (SIGINT); 582 sig_handlers.sw_int.start (SIGINT);
608 583
609 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
610 /* signal (SIGURG, SIG_DFL); */ 585 /* signal (SIGURG, SIG_DFL); */
611 586
612 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 587 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
613 // TODO: handle this with exceptions and tolerate the memory loss 588 // TODO: handle this with exceptions and tolerate the memory loss
614 XSetIOErrorHandler (rxvt_xioerror_handler); 589 XSetIOErrorHandler (rxvt_xioerror_handler);
590
591 XrmInitialize ();
615} 592}
616 593
617/* ------------------------------------------------------------------------- * 594/* ------------------------------------------------------------------------- *
618 * MEMORY ALLOCATION WRAPPERS * 595 * MEMORY ALLOCATION WRAPPERS *
619 * ------------------------------------------------------------------------- */ 596 * ------------------------------------------------------------------------- */
… …
637 rxvt_fatal ("memory allocation failure. aborting.\n"); 614 rxvt_fatal ("memory allocation failure. aborting.\n");
638 615
639 return p; 616 return p;
640} 617}
641 618
642void * 619void *
643rxvt_realloc (void *ptr, size_t size) 620rxvt_realloc (void *ptr, size_t size)
644{ 621{
645 void *p = realloc (ptr, size); 622 void *p = realloc (ptr, size);
646 623
647 if (!p) 624 if (!p)
648 rxvt_fatal ("memory allocation failure. aborting.\n"); 625 rxvt_fatal ("memory allocation failure. aborting.\n");
649 626
650 return p; 627 return p;
651} 628}
652
653/* ------------------------------------------------------------------------- *
654 * PRIVILEGED OPERATIONS *
655 * ------------------------------------------------------------------------- */
656/* take care of suid/sgid super-user (root) privileges */
657void
658rxvt_privileges (rxvt_privaction action)
659{
660#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
661 static uid_t euid;
662 static gid_t egid;
663#endif
664
665#if ! defined(__CYGWIN32__)
666# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
667 /* setreuid () is the poor man's setuid (), seteuid () */
668# define seteuid(a) setreuid(-1, (a))
669# define setegid(a) setregid(-1, (a))
670# define HAVE_SETEUID
671# endif
672# ifdef HAVE_SETEUID
673 switch (action)
674 {
675 case IGNORE:
676 /*
677 * change effective uid/gid - not real uid/gid - so we can switch
678 * back to root later, as required
679 */
680 seteuid (getuid ());
681 setegid (getgid ());
682 break;
683 case SAVE:
684 euid = geteuid ();
685 egid = getegid ();
686 break;
687 case RESTORE:
688 seteuid (euid);
689 setegid (egid);
690 break;
691 }
692# else
693 switch (action)
694 {
695 case IGNORE:
696 setuid (getuid ());
697 setgid (getgid ());
698 /* FALLTHROUGH */
699 case SAVE:
700 /* FALLTHROUGH */
701 case RESTORE:
702 break;
703 }
704# endif
705#endif
706}
707
708#ifdef UTMP_SUPPORT
709void
710rxvt_term::privileged_utmp (rxvt_privaction action)
711{
712 if (OPTION (Opt_utmpInhibit)
713 || !pty.name || !*pty.name)
714 return;
715
716 rxvt_privileges (RESTORE);
717
718 if (action == SAVE)
719 makeutent (pty.name, rs[Rs_display_name]);
720 else
721 cleanutent ();
722
723 rxvt_privileges (IGNORE);
724}
725#endif
726 629
727/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
728/* 631/*
729 * window size/position calculcations for XSizeHint and other storage. 632 * window size/position calculcations for XSizeHint and other storage.
730 * if width/height are non-zero then override calculated width/height 633 * if width/height are non-zero then override calculated width/height
731 */ 634 */
732void 635void
733rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 636rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
734{ 637{
735 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
736 int x, y, sb_w, mb_h, flags; 639 int x, y, sb_w, flags;
737 unsigned int w, h; 640 unsigned int w, h;
738 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
739 dDisp;
740
741 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
742 ncol, nrow, szHint.width, szHint.height));
743 642
744 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
745 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
746 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
747 646
… …
802 max_width = MAX_COLS * fwidth; 701 max_width = MAX_COLS * fwidth;
803 max_height = MAX_ROWS * fheight; 702 max_height = MAX_ROWS * fheight;
804 703
805 szHint.base_width = szHint.base_height = 2 * int_bwidth; 704 szHint.base_width = szHint.base_height = 2 * int_bwidth;
806 705
807 sb_w = mb_h = 0; 706 sb_w = 0;
808 window_vt_x = window_vt_y = int_bwidth; 707 window_vt_x = window_vt_y = int_bwidth;
809 708
810 if (scrollbar_visible ()) 709 if (scrollBar.state)
811 { 710 {
812 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
813 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
814 if (!OPTION (Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
815 window_vt_x += sb_w; 715 window_vt_x += sb_w;
816 } 716 }
817 717
818 if (menubar_visible ())
819 {
820 mb_h = menuBar_TotalHeight ();
821 szHint.base_height += mb_h;
822 window_vt_y += mb_h;
823 }
824
825 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
826 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
827 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
828 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
829 722
830 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
831 { 724 {
832 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
847 { 740 {
848 min_it (height, max_height); 741 min_it (height, max_height);
849 szHint.height = szHint.base_height + height; 742 szHint.height = szHint.base_height + height;
850 } 743 }
851 744
852 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
853 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
854 747
855 if (recalc_x) 748 if (recalc_x)
856 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750
857 if (recalc_y) 751 if (recalc_y)
858 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
859 753
860 ncol = width / fwidth; 754 ncol = width / fwidth;
861 nrow = height / fheight; 755 nrow = height / fheight;
862 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
863 ncol, nrow, szHint.width,
864 szHint.height));
865 return;
866} 756}
867 757
868/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
869/* 759/*
870 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
871 * Called after a window size change. 761 * Called after a window size change.
872 */ 762 */
873void 763void
874rxvt_term::tt_winch () 764rxvt_term::tt_winch ()
875{ 765{
876 if (pty.pty < 0) 766 if (pty->pty < 0)
877 return; 767 return;
878 768
879 struct winsize ws; 769 struct winsize ws;
880 770
881 ws.ws_col = ncol; 771 ws.ws_col = ncol;
882 ws.ws_row = nrow; 772 ws.ws_row = nrow;
883 ws.ws_xpixel = width; 773 ws.ws_xpixel = width;
884 ws.ws_ypixel = height; 774 ws.ws_ypixel = height;
885 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 775 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
886 776
887#if 0 777#if 0
888 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 778 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
889 if (cmd_pid) /* force through to the command */ 779 if (cmd_pid) /* force through to the command */
890 kill (-cmd_pid, SIGWINCH); 780 kill (-cmd_pid, SIGWINCH);
… …
970 return true; 860 return true;
971} 861}
972 862
973void rxvt_term::set_string_property (Atom prop, const char *str, int len) 863void rxvt_term::set_string_property (Atom prop, const char *str, int len)
974{ 864{
975 XChangeProperty (display->display, parent[0], 865 XChangeProperty (dpy, parent[0],
976 prop, XA_STRING, 8, PropModeReplace, 866 prop, XA_STRING, 8, PropModeReplace,
977 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 867 (const unsigned char *)str, len >= 0 ? len : strlen (str));
978} 868}
979 869
980void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 870void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
981{ 871{
982 wchar_t *ws = rxvt_mbstowcs (str, len); 872 wchar_t *ws = rxvt_mbstowcs (str, len);
983 char *s = rxvt_wcstoutf8 (ws); 873 char *s = rxvt_wcstoutf8 (ws);
984 874
985 XChangeProperty (display->display, parent[0], 875 XChangeProperty (dpy, parent[0],
986 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 876 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
987 (const unsigned char *)s, strlen (s)); 877 (const unsigned char *)s, strlen (s));
988 878
989 free (s); 879 free (s);
990 free (ws); 880 free (ws);
… …
1015void 905void
1016rxvt_term::set_window_color (int idx, const char *color) 906rxvt_term::set_window_color (int idx, const char *color)
1017{ 907{
1018 rxvt_color xcol; 908 rxvt_color xcol;
1019 int i; 909 int i;
1020 910
1021 if (color == NULL || *color == '\0') 911 if (color == NULL || *color == '\0')
1022 return; 912 return;
913
914 color = strdup (color);
915 allocated.push_back ((void *)color);
916 rs[Rs_color + idx] = color;
1023 917
1024 /* handle color aliases */ 918 /* handle color aliases */
1025 if (isdigit (*color)) 919 if (isdigit (*color))
1026 { 920 {
1027 i = atoi (color); 921 i = atoi (color);
1028 922
1029 if (i >= 8 && i <= 15) 923 if (i >= 8 && i <= 15)
1030 { /* bright colors */ 924 { /* bright colors */
1031 i -= 8; 925 i -= 8;
1032 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 926 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1033 SET_PIXCOLOR (idx);
1034 goto done; 927 goto done;
1035 } 928 }
1036 929
1037 if (i >= 0 && i <= 7) 930 if (i >= 0 && i <= 7)
1038 { /* normal colors */ 931 { /* normal colors */
1039 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 932 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1040 SET_PIXCOLOR (idx);
1041 goto done; 933 goto done;
1042 } 934 }
1043 } 935 }
1044 936
1045 if (!rXParseAllocColor (&xcol, color)) 937 set_color (xcol, color);
1046 return;
1047
1048 /* XStoreColor (display->display, display->cmap, XColor*); */
1049 938
1050 /* 939 /*
1051 * FIXME: should free colors here, but no idea how to do it so instead, 940 * FIXME: should free colors here, but no idea how to do it so instead,
1052 * so just keep gobbling up the colormap 941 * so just keep gobbling up the colormap
1053 */ 942 */
1054# if 0
1055 for (i = Color_Black; i <= Color_White; i++)
1056 if (pix_colors[idx] == pix_colors[i])
1057 break;
1058 if (i > Color_White)
1059 {
1060 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1061 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1062 DisplayPlanes (display->display, display->screen));
1063 }
1064# endif
1065 943
1066 pix_colors_focused[idx] = xcol; 944 pix_colors_focused[idx] = xcol;
1067 SET_PIXCOLOR (idx);
1068 945
1069 /* XSetWindowAttributes attr; */ 946 /* XSetWindowAttributes attr; */
1070 /* Cursor cursor; */ 947 /* Cursor cursor; */
1071done: 948done:
1072
1073#if OFF_FOCUS_FADING
1074 if (rs[Rs_fade])
1075 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1076#endif
1077
1078 /*TODO: handle Color_BD, scrollbar background, etc. */ 949 /*TODO: handle Color_BD, scrollbar background, etc. */
1079 950
951 update_fade_color (idx);
1080 recolour_cursor (); 952 recolour_cursor ();
1081 scr_recolour (); 953 scr_recolour ();
1082} 954}
1083 955
1084#else 956#else
… …
1086#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1087 959
1088void 960void
1089rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1090{ 962{
1091 XColor xcol[2]; 963 XColor fg, bg;
1092 964
1093 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1094 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1095 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1096 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1097 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1098 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1099 972
1100 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1101 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1102} 974}
1103 975
1104/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1105/* 977/*
1106 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1110{ 982{
1111 unsigned int i; 983 unsigned int i;
1112 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1113 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1114 986
1115 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1116 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1117 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1118 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1119 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1120 { 991 {
… …
1135 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1136} 1007}
1137 1008
1138/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1139 1010
1140int 1011bool
1141rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1142{ 1013{
1143 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1144 {
1145 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1146 return false;
1147 }
1148
1149 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1150} 1025}
1151 1026
1152/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1153 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1154 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1155void 1030void
1156rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1157{ 1032{
1158 int fix_screen; 1033 int fix_screen;
1159 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1160 dDisp; 1035 int old_height = szHint.height;
1161 1036
1162 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1038
1039 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1163 XSetWMNormalHints (disp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1164 1041
1165 if (!ignoreparent) 1042 if (!ignoreparent)
1166 { 1043 {
1167#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1168 /* 1045 /*
… …
1172 int x, y, x1, y1; 1049 int x, y, x1, y1;
1173 int dx, dy; 1050 int dx, dy;
1174 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1175 Window unused_cr; 1052 Window unused_cr;
1176 1053
1177 XTranslateCoordinates (disp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1178 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1179 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1180 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1181 /* 1058 /*
1182 * if display->root isn't the parent window, a WM will probably have offset 1059 * if display->root isn't the parent window, a WM will probably have offset
1183 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1184 */ 1061 */
… …
1186 { 1063 {
1187 x -= x1; 1064 x -= x1;
1188 y -= y1; 1065 y -= y1;
1189 } 1066 }
1190 1067
1191 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1192 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1193 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1194 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1195 1072
1196 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1197 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
1198 dx = 0; 1075 dx = 0;
… …
1201 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1202 dy = 0; 1079 dy = 0;
1203 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1204 dy /= 2; 1081 dy /= 2;
1205 1082
1206 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1207 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1208#else 1085#else
1209 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1210#endif 1087#endif
1211 } 1088 }
1212 1089
1213 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1214 1091
1215 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1216 { 1093 {
1217 if (scrollbar_visible ()) 1094 if (scrollBar.state)
1218 { 1095 {
1219 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1220 window_sb_x, 0, 1097 window_sb_x, 0,
1221 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1222 resize_scrollbar (); 1099 resize_scrollbar ();
1223 } 1100 }
1224 1101
1225 if (menubar_visible ())
1226 XMoveResizeWindow (disp, menuBar.win,
1227 window_vt_x, 0,
1228 width, menuBar_TotalHeight ());
1229
1230 XMoveResizeWindow (disp, vt, 1102 XMoveResizeWindow (dpy, vt,
1231 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1232 width, height); 1104 width, height);
1233 1105
1234 scr_clear (); 1106 scr_clear ();
1235#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1236 resize_pixmap (); 1108 resize_pixmap ();
1237#endif 1109#endif
1238 } 1110 }
1239 1111
1240 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1241 {
1242 int curr_screen = -1;
1243 int old_ncol = prev_ncol;
1244
1245 /* scr_reset only works on the primary screen */
1246 if (old_height) /* this is not the first time through */
1247 {
1248 unsigned int ocol = ncol;
1249 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1250 curr_screen = scr_change_screen (PRIMARY);
1251 ncol = ocol;
1252 }
1253
1254 scr_reset (); 1113 scr_reset ();
1255 1114
1256 if (curr_screen >= 0) /* this is not the first time through */ 1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1257 { 1116 //scr_touch (false);
1258 scr_change_screen (curr_screen);
1259 selection_check (old_ncol != ncol ? 4 : 0);
1260 }
1261 }
1262
1263 old_width = szHint.width;
1264 old_height = szHint.height;
1265 1117
1266#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1267 if (pixmap) 1119 if (pixmap)
1268 scr_touch (false); 1120 scr_touch (false);
1269#endif 1121#endif
1270 1122
1271#ifdef USE_XIM 1123#ifdef USE_XIM
1272 IMSetStatusPosition (); 1124 IMSetPosition ();
1273#endif 1125#endif
1274} 1126}
1275 1127
1276/* 1128/*
1277 * Set the width/height of the vt window in characters. Units are pixels. 1129 * Set the width/height of the vt window in characters. Units are pixels.
… …
1282{ 1134{
1283 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1284 1136
1285 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1286 { 1138 {
1287 XGetWindowAttributes (display->display, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1288 1140
1289 if (newwidth == 0) 1141 if (newwidth == 0)
1290 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1291 if (newheight == 0) 1143 if (newheight == 0)
1292 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1306#ifdef USE_XIM 1158#ifdef USE_XIM
1307 1159
1308void 1160void
1309rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1310{ 1162{
1311 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1312 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1313} 1165}
1314 1166
1315void 1167void
1316rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1317{ 1169{
… …
1354 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1355 1207
1356 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1357 *p = '\0'; 1209 *p = '\0';
1358 1210
1359 atom = XInternAtom (display->display, server, False); 1211 atom = XInternAtom (dpy, server, False);
1360 win = XGetSelectionOwner (display->display, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1361 1213
1362 if (win != None) 1214 if (win != None)
1363 return True; 1215 return True;
1364 } 1216 }
1365 1217
… …
1372 XPoint nspot; 1224 XPoint nspot;
1373 XVaNestedList preedit_attr; 1225 XVaNestedList preedit_attr;
1374 1226
1375 if (!Input_Context 1227 if (!Input_Context
1376 || !focus 1228 || !focus
1377 || !(input_style & XIMPreeditPosition)) 1229 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1378 return; 1230 return;
1379 1231
1380 im_set_position (nspot); 1232 im_set_position (nspot);
1381 1233
1382 if (nspot.x == spot.x && nspot.y == spot.y) 1234 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1401 input_method = 0; 1253 input_method = 0;
1402 } 1254 }
1403 1255
1404 Input_Context = 0; 1256 Input_Context = 0;
1405} 1257}
1258
1259#ifdef ENABLE_XIM_ONTHESPOT
1260
1261static void
1262xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1263{
1264 ((rxvt_term *)client_data)->make_current ();
1265 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1266}
1267
1268static void
1269xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1270{
1271 ((rxvt_term *)client_data)->make_current ();
1272 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1273}
1274
1275static void
1276xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1277{
1278 rxvt_term *term = (rxvt_term *)client_data;
1279 XIMText *text = call_data->text;
1280
1281 term->make_current ();
1282
1283 if (text)
1284 {
1285 void *str;
1286
1287 if (!text->encoding_is_wchar && text->string.multi_byte)
1288 {
1289 // of course, X makes it ugly again
1290 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->rs[Rs_imLocale]);
1292
1293 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1294 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1295
1296 if (term->rs[Rs_imLocale])
1297 SET_LOCALE (term->locale);
1298 }
1299 else
1300 str = (void *)text->string.wide_char;
1301
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length,
1306 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1307 DT_WCS_LEN, str, str ? (int)text->length : 0,
1308 DT_END));
1309 }
1310 else
1311 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1312 DT_INT, call_data->caret,
1313 DT_INT, call_data->chg_first,
1314 DT_INT, call_data->chg_length,
1315 DT_END));
1316}
1317
1318#if 0
1319static void
1320xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1321{
1322 ((rxvt_term *)client_data)->make_current ();
1323 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1324 DT_INT, call_data->position,
1325 DT_INT, call_data->direction,
1326 DT_INT, call_data->style,
1327 DT_END));
1328}
1329#endif
1330
1331#endif
1406 1332
1407/* 1333/*
1408 * Try to open a XIM with the current modifiers, then see if we can 1334 * Try to open a XIM with the current modifiers, then see if we can
1409 * open a suitable preedit type 1335 * open a suitable preedit type
1410 */ 1336 */
… …
1417 XRectangle rect, status_rect, needed_rect; 1343 XRectangle rect, status_rect, needed_rect;
1418 unsigned long fg, bg; 1344 unsigned long fg, bg;
1419 const char *p; 1345 const char *p;
1420 char **s; 1346 char **s;
1421 XIMStyles *xim_styles; 1347 XIMStyles *xim_styles;
1348#ifdef ENABLE_XIM_ONTHESPOT
1349 XIMCallback xcb[4];
1350#endif
1351
1352 set_environ (envv);
1422 1353
1423 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1354 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1424 return false; 1355 return false;
1425 1356
1426 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1427 input_method = display->get_xim (locale, modifiers); 1357 input_method = display->get_xim (locale, modifiers);
1428 if (input_method == NULL) 1358 if (input_method == NULL)
1429 return false; 1359 return false;
1430 1360
1431 xim = input_method->xim; 1361 xim = input_method->xim;
… …
1451 s = rxvt_splitcommastring (p); 1381 s = rxvt_splitcommastring (p);
1452 1382
1453 for (i = found = 0; !found && s[i]; i++) 1383 for (i = found = 0; !found && s[i]; i++)
1454 { 1384 {
1455 if (!strcmp (s[i], "OverTheSpot")) 1385 if (!strcmp (s[i], "OverTheSpot"))
1456 input_style = (XIMPreeditPosition | XIMStatusNothing); 1386 input_style = XIMPreeditPosition | XIMStatusNothing;
1457 else if (!strcmp (s[i], "OffTheSpot")) 1387 else if (!strcmp (s[i], "OffTheSpot"))
1458 input_style = (XIMPreeditArea | XIMStatusArea); 1388 input_style = XIMPreeditArea | XIMStatusArea;
1459 else if (!strcmp (s[i], "Root")) 1389 else if (!strcmp (s[i], "Root"))
1460 input_style = (XIMPreeditNothing | XIMStatusNothing); 1390 input_style = XIMPreeditNothing | XIMStatusNothing;
1461 else if (!strcmp (s[i], "None")) 1391 else if (!strcmp (s[i], "None"))
1462 input_style = (XIMPreeditNone | XIMStatusNone); 1392 input_style = XIMPreeditNone | XIMStatusNone;
1393#ifdef ENABLE_XIM_ONTHESPOT
1394 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1395 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1396#endif
1397 else
1398 input_style = XIMPreeditNothing | XIMStatusNothing;
1463 1399
1464 for (j = 0; j < xim_styles->count_styles; j++) 1400 for (j = 0; j < xim_styles->count_styles; j++)
1465 if (input_style == xim_styles->supported_styles[j]) 1401 if (input_style == xim_styles->supported_styles[j])
1466 { 1402 {
1467 rxvt_freecommastring (s); 1403 rxvt_freecommastring (s);
… …
1505 "*", 1441 "*",
1506 fheight, 1442 fheight,
1507 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1508 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1509 1445
1510 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1511 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1512 1448
1513 if (missing_charset_list) 1449 if (missing_charset_list)
1514 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1515 1451
… …
1556 XNBackground, bg, 1492 XNBackground, bg,
1557 XNArea, &status_rect, 1493 XNArea, &status_rect,
1558 XNFontSet, fs, 1494 XNFontSet, fs,
1559 NULL); 1495 NULL);
1560 } 1496 }
1497#if ENABLE_XIM_ONTHESPOT
1498 else if (input_style & XIMPreeditCallbacks)
1499 {
1500 im_set_position (spot);
1501
1502 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1503 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1504 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1505# if 0
1506 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1507# endif
1508
1509 preedit_attr = XVaCreateNestedList (0,
1510 XNSpotLocation, &spot,
1511 XNPreeditStartCallback, &xcb[0],
1512 XNPreeditDoneCallback , &xcb[1],
1513 XNPreeditDrawCallback , &xcb[2],
1514# if 0
1515 XNPreeditCaretCallback, &xcb[3],
1516# endif
1517 NULL);
1518 }
1519#endif
1561 1520
1562 Input_Context = XCreateIC (xim, 1521 Input_Context = XCreateIC (xim,
1563 XNInputStyle, input_style, 1522 XNInputStyle, input_style,
1564 XNClientWindow, vt, 1523 XNClientWindow, vt,
1565 XNFocusWindow, parent[0], 1524 XNFocusWindow, parent[0],
… …
1567 preedit_attr, 1526 preedit_attr,
1568 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1569 status_attr, NULL); 1528 status_attr, NULL);
1570 1529
1571 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1572 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1573 if (fs) XFreeFontSet (display->display, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1574 1533
1575 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1576 { 1535 {
1577 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1578 im_destroy (); 1537 im_destroy ();
1579 return false; 1538 return false;
1580 } 1539 }
1581 1540
1582 if (input_style & XIMPreeditArea) 1541#if 0
1542 // unfortunately, only the focus window is used by XIM, hard to fix
1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1544 vt_select_input ();
1545#endif
1546
1583 IMSetStatusPosition (); 1547 IMSetPosition ();
1584 1548
1585 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1586 return true; 1549 return true;
1587} 1550}
1588 1551
1589void 1552void
1590rxvt_term::im_cb () 1553rxvt_term::im_cb ()
… …
1592 int i; 1555 int i;
1593 const char *p; 1556 const char *p;
1594 char **s; 1557 char **s;
1595 char buf[IMBUFSIZ]; 1558 char buf[IMBUFSIZ];
1596 1559
1597 SET_R (this); 1560 make_current ();
1598 1561
1599 im_destroy (); 1562 im_destroy ();
1600 1563
1601 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1602 if (Input_Context) 1564 if (Input_Context)
1603 return; 1565 return;
1604 1566
1605#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1567#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1606 if (rs[Rs_imLocale]) 1568 if (rs[Rs_imLocale])
… …
1648 SET_LOCALE (locale); 1610 SET_LOCALE (locale);
1649#endif 1611#endif
1650} 1612}
1651 1613
1652void 1614void
1653rxvt_term::IMSetStatusPosition () 1615rxvt_term::IMSetPosition ()
1654{ 1616{
1655 XRectangle preedit_rect, status_rect, *needed_rect; 1617 XRectangle preedit_rect, status_rect, *needed_rect;
1656 XVaNestedList preedit_attr, status_attr; 1618 XVaNestedList preedit_attr, status_attr;
1657 1619
1658 if (!Input_Context 1620 if (!Input_Context
1659 || !focus 1621 || !focus
1660 || !(input_style & XIMPreeditArea) 1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1661 || !IMisRunning ()) 1623 || !IMisRunning ())
1662 return; 1624 return;
1663 1625
1626 if (input_style & XIMPreeditPosition)
1627 {
1628 im_set_size (preedit_rect);
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630
1631 XSetICValues (Input_Context,
1632 XNPreeditAttributes, preedit_attr, NULL);
1633 }
1634 else
1635 {
1664 /* Getting the necessary width of preedit area */ 1636 /* Getting the necessary width of preedit area */
1665 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1637 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1666 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1638 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1667 XFree (status_attr); 1639 XFree (status_attr);
1668 1640
1669 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1641 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1670 XFree (needed_rect); 1642 XFree (needed_rect);
1671 1643
1672 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1644 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1673 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1645 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1674 1646
1675 XSetICValues (Input_Context, 1647 XSetICValues (Input_Context,
1676 XNPreeditAttributes, preedit_attr, 1648 XNPreeditAttributes, preedit_attr,
1677 XNStatusAttributes, status_attr, NULL); 1649 XNStatusAttributes, status_attr,
1650 NULL);
1678 1651
1652 XFree (status_attr);
1653 }
1654
1679 XFree (preedit_attr); 1655 XFree (preedit_attr);
1680 XFree (status_attr);
1681} 1656}
1682#endif /* USE_XIM */ 1657#endif /* USE_XIM */
1683 1658
1684/*----------------------------------------------------------------------*/
1685rxvt_t rxvt_current_term;
1686
1687/*----------------------- end-of-file (C source) -----------------------*/ 1659/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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