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.162 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.231 by root, Sun Aug 27 10:14:47 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++)
274 264 if (ISSET_PIXCOLOR (i))
275 delete pix_colors_focused; 265 {
266 pix_colors_focused [i].free (this);
276#if OFF_FOCUS_FADING 267#if OFF_FOCUS_FADING
268 pix_colors_unfocused [i].free (this);
269#endif
270 }
271
272 clear ();
273 }
274
275 delete [] pix_colors_focused;
276#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 277 delete [] pix_colors_unfocused;
278#endif 278#endif
279 279
280 displays.put (display); 280 displays.put (display);
281 281
282 scr_release (); 282 scr_release ();
… …
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
524 if (pty->pty >= 0)
539 pty_ev.start (pty.pty, EVENT_READ); 525 pty_ev.start (pty->pty, EVENT_READ);
540 526
541 check_ev.start (); 527 check_ev.start ();
542 528
543 HOOK_INVOKE ((this, HOOK_START, DT_END)); 529 HOOK_INVOKE ((this, HOOK_START, DT_END));
544 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
545 return true; 544 return true;
546} 545}
547 546
548static struct sig_handlers 547static struct sig_handlers
549{ 548{
550 sig_watcher sw_chld, sw_term, sw_int; 549 sig_watcher sw_term, sw_int;
551 550
552 void sig_chld (sig_watcher &w)
553 {
554 // we are being called for every SIGCHLD, find the corresponding term
555 int pid;
556
557 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
558 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
559 if (pid == (*t)->cmd_pid)
560 {
561 (*t)->child_exit ();
562 break;
563 }
564 }
565
566 /* 551 /*
567 * Catch a fatal signal and tidy up before quitting 552 * Catch a fatal signal and tidy up before quitting
568 */ 553 */
569 void 554 void
570 sig_term (sig_watcher &w) 555 sig_term (sig_watcher &w)
571 { 556 {
572#ifdef DEBUG_CMD
573 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
574#endif
575 rxvt_emergency_cleanup (); 557 rxvt_emergency_cleanup ();
576 signal (w.signum, SIG_DFL); 558 signal (w.signum, SIG_DFL);
577 kill (getpid (), w.signum); 559 kill (getpid (), w.signum);
578 } 560 }
579 561
580 sig_handlers () 562 sig_handlers ()
581 : sw_chld (this, &sig_handlers::sig_chld),
582 sw_term (this, &sig_handlers::sig_term), 563 : sw_term (this, &sig_handlers::sig_term),
583 sw_int (this, &sig_handlers::sig_term) 564 sw_int (this, &sig_handlers::sig_term)
584 { 565 {
585 } 566 }
586} sig_handlers; 567} sig_handlers;
587 568
569char **rxvt_environ; // startup environment
570
588void 571void
589rxvt_init () 572rxvt_init ()
590{ 573{
591 /* 574 ptytty::init ();
592 * Save and then give up any super-user privileges 575
593 * If we need privileges in any area then we must specifically request it. 576 rxvt_environ = environ;
594 * We should only need to be root in these cases:
595 * 1. write utmp entries on some systems
596 * 2. chown tty on some systems
597 */
598 rxvt_privileges (SAVE);
599 rxvt_privileges (IGNORE);
600 577
601 signal (SIGHUP, SIG_IGN); 578 signal (SIGHUP, SIG_IGN);
602 signal (SIGPIPE, SIG_IGN); 579 signal (SIGPIPE, SIG_IGN);
603 580
604 sig_handlers.sw_chld.start (SIGCHLD);
605 sig_handlers.sw_term.start (SIGTERM); 581 sig_handlers.sw_term.start (SIGTERM);
606 sig_handlers.sw_int.start (SIGINT); 582 sig_handlers.sw_int.start (SIGINT);
607 583
608 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
609 /* signal (SIGURG, SIG_DFL); */ 585 /* signal (SIGURG, SIG_DFL); */
610 586
611 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 587 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
612 // TODO: handle this with exceptions and tolerate the memory loss 588 // TODO: handle this with exceptions and tolerate the memory loss
613 XSetIOErrorHandler (rxvt_xioerror_handler); 589 XSetIOErrorHandler (rxvt_xioerror_handler);
590
591 XrmInitialize ();
614} 592}
615 593
616/* ------------------------------------------------------------------------- * 594/* ------------------------------------------------------------------------- *
617 * MEMORY ALLOCATION WRAPPERS * 595 * MEMORY ALLOCATION WRAPPERS *
618 * ------------------------------------------------------------------------- */ 596 * ------------------------------------------------------------------------- */
… …
636 rxvt_fatal ("memory allocation failure. aborting.\n"); 614 rxvt_fatal ("memory allocation failure. aborting.\n");
637 615
638 return p; 616 return p;
639} 617}
640 618
641void * 619void *
642rxvt_realloc (void *ptr, size_t size) 620rxvt_realloc (void *ptr, size_t size)
643{ 621{
644 void *p = realloc (ptr, size); 622 void *p = realloc (ptr, size);
645 623
646 if (!p) 624 if (!p)
647 rxvt_fatal ("memory allocation failure. aborting.\n"); 625 rxvt_fatal ("memory allocation failure. aborting.\n");
648 626
649 return p; 627 return p;
650} 628}
651
652/* ------------------------------------------------------------------------- *
653 * PRIVILEGED OPERATIONS *
654 * ------------------------------------------------------------------------- */
655/* take care of suid/sgid super-user (root) privileges */
656void
657rxvt_privileges (rxvt_privaction action)
658{
659#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
660 static uid_t euid;
661 static gid_t egid;
662#endif
663
664#if ! defined(__CYGWIN32__)
665# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
666 /* setreuid () is the poor man's setuid (), seteuid () */
667# define seteuid(a) setreuid(-1, (a))
668# define setegid(a) setregid(-1, (a))
669# define HAVE_SETEUID
670# endif
671# ifdef HAVE_SETEUID
672 switch (action)
673 {
674 case IGNORE:
675 /*
676 * change effective uid/gid - not real uid/gid - so we can switch
677 * back to root later, as required
678 */
679 seteuid (getuid ());
680 setegid (getgid ());
681 break;
682 case SAVE:
683 euid = geteuid ();
684 egid = getegid ();
685 break;
686 case RESTORE:
687 seteuid (euid);
688 setegid (egid);
689 break;
690 }
691# else
692 switch (action)
693 {
694 case IGNORE:
695 setuid (getuid ());
696 setgid (getgid ());
697 /* FALLTHROUGH */
698 case SAVE:
699 /* FALLTHROUGH */
700 case RESTORE:
701 break;
702 }
703# endif
704#endif
705}
706
707#ifdef UTMP_SUPPORT
708void
709rxvt_term::privileged_utmp (rxvt_privaction action)
710{
711 if (OPTION (Opt_utmpInhibit)
712 || !pty.name || !*pty.name)
713 return;
714
715 rxvt_privileges (RESTORE);
716
717 if (action == SAVE)
718 makeutent (pty.name, rs[Rs_display_name]);
719 else
720 cleanutent ();
721
722 rxvt_privileges (IGNORE);
723}
724#endif
725 629
726/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
727/* 631/*
728 * window size/position calculcations for XSizeHint and other storage. 632 * window size/position calculcations for XSizeHint and other storage.
729 * if width/height are non-zero then override calculated width/height 633 * if width/height are non-zero then override calculated width/height
730 */ 634 */
731void 635void
732rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 636rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
733{ 637{
734 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
735 int x, y, sb_w, mb_h, flags; 639 int x, y, sb_w, flags;
736 unsigned int w, h; 640 unsigned int w, h;
737 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
738 dDisp;
739
740 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
741 ncol, nrow, szHint.width, szHint.height));
742 642
743 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
744 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
745 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
746 646
… …
801 max_width = MAX_COLS * fwidth; 701 max_width = MAX_COLS * fwidth;
802 max_height = MAX_ROWS * fheight; 702 max_height = MAX_ROWS * fheight;
803 703
804 szHint.base_width = szHint.base_height = 2 * int_bwidth; 704 szHint.base_width = szHint.base_height = 2 * int_bwidth;
805 705
806 sb_w = mb_h = 0; 706 sb_w = 0;
807 window_vt_x = window_vt_y = int_bwidth; 707 window_vt_x = window_vt_y = int_bwidth;
808 708
809 if (scrollbar_visible ()) 709 if (scrollBar.state)
810 { 710 {
811 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
812 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
813 if (!OPTION (Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
814 window_vt_x += sb_w; 715 window_vt_x += sb_w;
815 } 716 }
816 717
817 if (menubar_visible ())
818 {
819 mb_h = menuBar_TotalHeight ();
820 szHint.base_height += mb_h;
821 window_vt_y += mb_h;
822 }
823
824 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
825 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
826 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
827 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
828 722
829 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
830 { 724 {
831 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
846 { 740 {
847 min_it (height, max_height); 741 min_it (height, max_height);
848 szHint.height = szHint.base_height + height; 742 szHint.height = szHint.base_height + height;
849 } 743 }
850 744
851 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
852 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
853 747
854 if (recalc_x) 748 if (recalc_x)
855 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750
856 if (recalc_y) 751 if (recalc_y)
857 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
858 753
859 ncol = width / fwidth; 754 ncol = width / fwidth;
860 nrow = height / fheight; 755 nrow = height / fheight;
861 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
862 ncol, nrow, szHint.width,
863 szHint.height));
864 return;
865} 756}
866 757
867/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
868/* 759/*
869 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
870 * Called after a window size change. 761 * Called after a window size change.
871 */ 762 */
872void 763void
873rxvt_term::tt_winch () 764rxvt_term::tt_winch ()
874{ 765{
875 if (pty.pty < 0) 766 if (pty->pty < 0)
876 return; 767 return;
877 768
878 struct winsize ws; 769 struct winsize ws;
879 770
880 ws.ws_col = ncol; 771 ws.ws_col = ncol;
881 ws.ws_row = nrow; 772 ws.ws_row = nrow;
882 ws.ws_xpixel = width; 773 ws.ws_xpixel = width;
883 ws.ws_ypixel = height; 774 ws.ws_ypixel = height;
884 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 775 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
885 776
886#if 0 777#if 0
887 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 778 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
888 if (cmd_pid) /* force through to the command */ 779 if (cmd_pid) /* force through to the command */
889 kill (-cmd_pid, SIGWINCH); 780 kill (-cmd_pid, SIGWINCH);
… …
921 delete fontset[0]; 812 delete fontset[0];
922 fontset[0] = fs; 813 fontset[0] = fs;
923 814
924 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
925 prop.height += lineSpace; 816 prop.height += lineSpace;
817
926 fs->set_prop (prop); 818 fs->set_prop (prop, false);
927 819
928 fwidth = prop.width; 820 fwidth = prop.width;
929 fheight = prop.height; 821 fheight = prop.height;
930 fbase = prop.ascent; 822 fbase = prop.ascent;
931 823
… …
940 { 832 {
941 fontset[style] = fs = new rxvt_fontset (this); 833 fontset[style] = fs = new rxvt_fontset (this);
942 rxvt_fontprop prop2 = prop; 834 rxvt_fontprop prop2 = prop;
943 835
944 if (res) 836 if (res)
945 prop2.weight = prop2.slant = rxvt_fontprop::unset; 837 {
838 fs->populate (res);
839 fs->set_prop (prop2, false);
840 }
946 else 841 else
947 { 842 {
948 res = fontset[0]->fontdesc; 843 fs->populate (fontset[0]->fontdesc);
949 844
950 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 845 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
951 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 846 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
847
848 fs->set_prop (prop2, true);
952 } 849 }
953 850
954 fs->populate (res);
955 fs->set_prop (prop2);
956 } 851 }
957#else 852#else
958 fontset[style] = fontset[0]; 853 fontset[style] = fontset[0];
959#endif 854#endif
960 } 855 }
… …
969 return true; 864 return true;
970} 865}
971 866
972void rxvt_term::set_string_property (Atom prop, const char *str, int len) 867void rxvt_term::set_string_property (Atom prop, const char *str, int len)
973{ 868{
974 XChangeProperty (display->display, parent[0], 869 XChangeProperty (dpy, parent[0],
975 prop, XA_STRING, 8, PropModeReplace, 870 prop, XA_STRING, 8, PropModeReplace,
976 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 871 (const unsigned char *)str, len >= 0 ? len : strlen (str));
977} 872}
978 873
979void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 874void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
980{ 875{
981 wchar_t *ws = rxvt_mbstowcs (str, len); 876 wchar_t *ws = rxvt_mbstowcs (str, len);
982 char *s = rxvt_wcstoutf8 (ws); 877 char *s = rxvt_wcstoutf8 (ws);
983 878
984 XChangeProperty (display->display, parent[0], 879 XChangeProperty (dpy, parent[0],
985 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 880 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
986 (const unsigned char *)s, strlen (s)); 881 (const unsigned char *)s, strlen (s));
987 882
988 free (s); 883 free (s);
989 free (ws); 884 free (ws);
… …
1014void 909void
1015rxvt_term::set_window_color (int idx, const char *color) 910rxvt_term::set_window_color (int idx, const char *color)
1016{ 911{
1017 rxvt_color xcol; 912 rxvt_color xcol;
1018 int i; 913 int i;
1019 914
1020 if (color == NULL || *color == '\0') 915 if (color == NULL || *color == '\0')
1021 return; 916 return;
917
918 color = strdup (color);
919 allocated.push_back ((void *)color);
920 rs[Rs_color + idx] = color;
1022 921
1023 /* handle color aliases */ 922 /* handle color aliases */
1024 if (isdigit (*color)) 923 if (isdigit (*color))
1025 { 924 {
1026 i = atoi (color); 925 i = atoi (color);
1027 926
1028 if (i >= 8 && i <= 15) 927 if (i >= 8 && i <= 15)
1029 { /* bright colors */ 928 { /* bright colors */
1030 i -= 8; 929 i -= 8;
1031 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 930 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1032 SET_PIXCOLOR (idx);
1033 goto done; 931 goto done;
1034 } 932 }
1035 933
1036 if (i >= 0 && i <= 7) 934 if (i >= 0 && i <= 7)
1037 { /* normal colors */ 935 { /* normal colors */
1038 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 936 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1039 SET_PIXCOLOR (idx);
1040 goto done; 937 goto done;
1041 } 938 }
1042 } 939 }
1043 940
1044 if (!rXParseAllocColor (&xcol, color)) 941 set_color (xcol, color);
1045 return;
1046
1047 /* XStoreColor (display->display, display->cmap, XColor*); */
1048 942
1049 /* 943 /*
1050 * FIXME: should free colors here, but no idea how to do it so instead, 944 * FIXME: should free colors here, but no idea how to do it so instead,
1051 * so just keep gobbling up the colormap 945 * so just keep gobbling up the colormap
1052 */ 946 */
1053# if 0
1054 for (i = Color_Black; i <= Color_White; i++)
1055 if (pix_colors[idx] == pix_colors[i])
1056 break;
1057 if (i > Color_White)
1058 {
1059 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1060 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1061 DisplayPlanes (display->display, display->screen));
1062 }
1063# endif
1064 947
1065 pix_colors_focused[idx] = xcol; 948 pix_colors_focused[idx] = xcol;
1066 SET_PIXCOLOR (idx);
1067 949
1068 /* XSetWindowAttributes attr; */ 950 /* XSetWindowAttributes attr; */
1069 /* Cursor cursor; */ 951 /* Cursor cursor; */
1070done: 952done:
1071
1072#if OFF_FOCUS_FADING
1073 if (rs[Rs_fade])
1074 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1075#endif
1076
1077 /*TODO: handle Color_BD, scrollbar background, etc. */ 953 /*TODO: handle Color_BD, scrollbar background, etc. */
1078 954
955 update_fade_color (idx);
1079 recolour_cursor (); 956 recolour_cursor ();
1080 scr_recolour (); 957 scr_recolour ();
1081} 958}
1082 959
1083#else 960#else
… …
1085#endif /* XTERM_COLOR_CHANGE */ 962#endif /* XTERM_COLOR_CHANGE */
1086 963
1087void 964void
1088rxvt_term::recolour_cursor () 965rxvt_term::recolour_cursor ()
1089{ 966{
1090 XColor xcol[2]; 967 XColor fg, bg;
1091 968
1092 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 969 (ISSET_PIXCOLOR (Color_pointer_fg)
1093 ? pix_colors_focused[Color_pointer_fg] 970 ? pix_colors_focused[Color_pointer_fg]
1094 : pix_colors_focused[Color_fg]; 971 : pix_colors_focused[Color_fg]).get (fg);
972
1095 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 973 (ISSET_PIXCOLOR (Color_pointer_bg)
1096 ? pix_colors_focused[Color_pointer_bg] 974 ? pix_colors_focused[Color_pointer_bg]
1097 : pix_colors_focused[Color_bg]; 975 : pix_colors_focused[Color_bg]).get (bg);
1098 976
1099 XQueryColors (display->display, display->cmap, xcol, 2); 977 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1100 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1101} 978}
1102 979
1103/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
1104/* 981/*
1105 * find if fg/bg matches any of the normal (low-intensity) colors 982 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1109{ 986{
1110 unsigned int i; 987 unsigned int i;
1111 const char *xpmb = "\0"; 988 const char *xpmb = "\0";
1112 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1113 990
1114 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1115 strcpy (fstr, "default"); 991 strcpy (fstr, "default");
1116 strcpy (bstr, "default"); 992 strcpy (bstr, "default");
1117 for (i = Color_Black; i <= Color_White; i++) 993 for (i = Color_Black; i <= Color_White; i++)
1118 if (pix_colors[Color_fg] == pix_colors[i]) 994 if (pix_colors[Color_fg] == pix_colors[i])
1119 { 995 {
… …
1134 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1135} 1011}
1136 1012
1137/*----------------------------------------------------------------------*/ 1013/*----------------------------------------------------------------------*/
1138 1014
1139int 1015bool
1140rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1016rxvt_term::set_color (rxvt_color &color, const char *name)
1141{ 1017{
1142 if (!screen_in_out->set (display, colour)) 1018 if (color.set (this, name))
1143 {
1144 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1145 return false;
1146 }
1147
1148 return true; 1019 return true;
1020
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1022 return false;
1023}
1024
1025void
1026rxvt_term::alias_color (int dst, int src)
1027{
1028 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1149} 1029}
1150 1030
1151/* -------------------------------------------------------------------- * 1031/* -------------------------------------------------------------------- *
1152 * - WINDOW RESIZING - * 1032 * - WINDOW RESIZING - *
1153 * -------------------------------------------------------------------- */ 1033 * -------------------------------------------------------------------- */
1154void 1034void
1155rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1035rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1156{ 1036{
1157 int fix_screen; 1037 int fix_screen;
1158 int old_width = szHint.width, old_height = szHint.height; 1038 int old_width = szHint.width;
1159 dDisp; 1039 int old_height = szHint.height;
1160 1040
1161 window_calc (newwidth, newheight); 1041 window_calc (newwidth, newheight);
1042
1043 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1162 XSetWMNormalHints (disp, parent[0], &szHint); 1044 XSetWMNormalHints (dpy, parent[0], &szHint);
1163 1045
1164 if (!ignoreparent) 1046 if (!ignoreparent)
1165 { 1047 {
1166#ifdef SMART_RESIZE 1048#ifdef SMART_RESIZE
1167 /* 1049 /*
… …
1171 int x, y, x1, y1; 1053 int x, y, x1, y1;
1172 int dx, dy; 1054 int dx, dy;
1173 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1055 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1174 Window unused_cr; 1056 Window unused_cr;
1175 1057
1176 XTranslateCoordinates (disp, parent[0], display->root, 1058 XTranslateCoordinates (dpy, parent[0], display->root,
1177 0, 0, &x, &y, &unused_cr); 1059 0, 0, &x, &y, &unused_cr);
1178 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1060 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1179 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1061 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1180 /* 1062 /*
1181 * if display->root isn't the parent window, a WM will probably have offset 1063 * if display->root isn't the parent window, a WM will probably have offset
1182 * our position for handles and decorations. Counter it 1064 * our position for handles and decorations. Counter it
1183 */ 1065 */
… …
1185 { 1067 {
1186 x -= x1; 1068 x -= x1;
1187 y -= y1; 1069 y -= y1;
1188 } 1070 }
1189 1071
1190 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1072 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1191 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1073 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1192 dx = old_width - szHint.width; 1074 dx = old_width - szHint.width;
1193 dy = old_height - szHint.height; 1075 dy = old_height - szHint.height;
1194 1076
1195 /* Check position of the center of the window */ 1077 /* Check position of the center of the window */
1196 if (x < x1) /* left half */ 1078 if (x < x1) /* left half */
1197 dx = 0; 1079 dx = 0;
… …
1200 if (y < y1) /* top half */ 1082 if (y < y1) /* top half */
1201 dy = 0; 1083 dy = 0;
1202 else if (y == y1) /* exact center */ 1084 else if (y == y1) /* exact center */
1203 dy /= 2; 1085 dy /= 2;
1204 1086
1205 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1087 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1206 szHint.width, szHint.height); 1088 szHint.width, szHint.height);
1207#else 1089#else
1208 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1090 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1209#endif 1091#endif
1210 } 1092 }
1211 1093
1212 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1094 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1213 1095
1214 if (fix_screen || newwidth != old_width || newheight != old_height) 1096 if (fix_screen || newwidth != old_width || newheight != old_height)
1215 { 1097 {
1216 if (scrollbar_visible ()) 1098 if (scrollBar.state)
1217 { 1099 {
1218 XMoveResizeWindow (disp, scrollBar.win, 1100 XMoveResizeWindow (dpy, scrollBar.win,
1219 window_sb_x, 0, 1101 window_sb_x, 0,
1220 scrollbar_TotalWidth (), szHint.height); 1102 scrollbar_TotalWidth (), szHint.height);
1221 resize_scrollbar (); 1103 resize_scrollbar ();
1222 } 1104 }
1223 1105
1224 if (menubar_visible ())
1225 XMoveResizeWindow (disp, menuBar.win,
1226 window_vt_x, 0,
1227 width, menuBar_TotalHeight ());
1228
1229 XMoveResizeWindow (disp, vt, 1106 XMoveResizeWindow (dpy, vt,
1230 window_vt_x, window_vt_y, 1107 window_vt_x, window_vt_y,
1231 width, height); 1108 width, height);
1232 1109
1233 scr_clear (); 1110 scr_clear ();
1234#ifdef XPM_BACKGROUND 1111#ifdef XPM_BACKGROUND
1235 resize_pixmap (); 1112 resize_pixmap ();
1236#endif 1113#endif
1237 } 1114 }
1238 1115
1239 if (fix_screen || old_height == 0) 1116 if (fix_screen || old_height == 0)
1240 {
1241 int curr_screen = -1;
1242 int old_ncol = prev_ncol;
1243
1244 /* scr_reset only works on the primary screen */
1245 if (old_height) /* this is not the first time through */
1246 {
1247 unsigned int ocol = ncol;
1248 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1249 curr_screen = scr_change_screen (PRIMARY);
1250 ncol = ocol;
1251 }
1252
1253 scr_reset (); 1117 scr_reset ();
1254 1118
1255 if (curr_screen >= 0) /* this is not the first time through */ 1119 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1256 { 1120 //scr_touch (false);
1257 scr_change_screen (curr_screen);
1258 selection_check (old_ncol != ncol ? 4 : 0);
1259 }
1260 }
1261
1262 old_width = szHint.width;
1263 old_height = szHint.height;
1264 1121
1265#ifdef XPM_BACKGROUND 1122#ifdef XPM_BACKGROUND
1266 if (pixmap) 1123 if (pixmap)
1267 scr_touch (false); 1124 scr_touch (false);
1268#endif 1125#endif
1269 1126
1270#ifdef USE_XIM 1127#ifdef USE_XIM
1271 IMSetStatusPosition (); 1128 IMSetPosition ();
1272#endif 1129#endif
1273} 1130}
1274 1131
1275/* 1132/*
1276 * Set the width/height of the vt window in characters. Units are pixels. 1133 * Set the width/height of the vt window in characters. Units are pixels.
… …
1281{ 1138{
1282 XWindowAttributes wattr; 1139 XWindowAttributes wattr;
1283 1140
1284 if (newwidth == 0 || newheight == 0) 1141 if (newwidth == 0 || newheight == 0)
1285 { 1142 {
1286 XGetWindowAttributes (display->display, display->root, &wattr); 1143 XGetWindowAttributes (dpy, display->root, &wattr);
1287 1144
1288 if (newwidth == 0) 1145 if (newwidth == 0)
1289 newwidth = wattr.width - szHint.base_width; 1146 newwidth = wattr.width - szHint.base_width;
1290 if (newheight == 0) 1147 if (newheight == 0)
1291 newheight = wattr.height - szHint.base_height; 1148 newheight = wattr.height - szHint.base_height;
… …
1305#ifdef USE_XIM 1162#ifdef USE_XIM
1306 1163
1307void 1164void
1308rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1165rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1309{ 1166{
1310 fg = pix_colors[Color_fg]; 1167 fg = pix_colors [Color_fg];
1311 bg = pix_colors[Color_bg]; 1168 bg = pix_colors [Color_bg];
1312} 1169}
1313 1170
1314void 1171void
1315rxvt_term::im_set_size (XRectangle &size) 1172rxvt_term::im_set_size (XRectangle &size)
1316{ 1173{
… …
1353 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1210 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1354 1211
1355 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1212 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1356 *p = '\0'; 1213 *p = '\0';
1357 1214
1358 atom = XInternAtom (display->display, server, False); 1215 atom = XInternAtom (dpy, server, False);
1359 win = XGetSelectionOwner (display->display, atom); 1216 win = XGetSelectionOwner (dpy, atom);
1360 1217
1361 if (win != None) 1218 if (win != None)
1362 return True; 1219 return True;
1363 } 1220 }
1364 1221
… …
1371 XPoint nspot; 1228 XPoint nspot;
1372 XVaNestedList preedit_attr; 1229 XVaNestedList preedit_attr;
1373 1230
1374 if (!Input_Context 1231 if (!Input_Context
1375 || !focus 1232 || !focus
1376 || !(input_style & XIMPreeditPosition)) 1233 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1377 return; 1234 return;
1378 1235
1379 im_set_position (nspot); 1236 im_set_position (nspot);
1380 1237
1381 if (nspot.x == spot.x && nspot.y == spot.y) 1238 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1400 input_method = 0; 1257 input_method = 0;
1401 } 1258 }
1402 1259
1403 Input_Context = 0; 1260 Input_Context = 0;
1404} 1261}
1262
1263#ifdef ENABLE_XIM_ONTHESPOT
1264
1265static void
1266xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1267{
1268 ((rxvt_term *)client_data)->make_current ();
1269 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1270}
1271
1272static void
1273xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1274{
1275 ((rxvt_term *)client_data)->make_current ();
1276 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1277}
1278
1279static void
1280xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1281{
1282 rxvt_term *term = (rxvt_term *)client_data;
1283 XIMText *text = call_data->text;
1284
1285 term->make_current ();
1286
1287 if (text)
1288 {
1289 void *str;
1290
1291 if (!text->encoding_is_wchar && text->string.multi_byte)
1292 {
1293 // of course, X makes it ugly again
1294 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->rs[Rs_imLocale]);
1296
1297 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1298 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1299
1300 if (term->rs[Rs_imLocale])
1301 SET_LOCALE (term->locale);
1302 }
1303 else
1304 str = (void *)text->string.wide_char;
1305
1306 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1307 DT_INT, call_data->caret,
1308 DT_INT, call_data->chg_first,
1309 DT_INT, call_data->chg_length,
1310 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1311 DT_WCS_LEN, str, str ? (int)text->length : 0,
1312 DT_END));
1313 }
1314 else
1315 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1316 DT_INT, call_data->caret,
1317 DT_INT, call_data->chg_first,
1318 DT_INT, call_data->chg_length,
1319 DT_END));
1320}
1321
1322#if 0
1323static void
1324xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1325{
1326 ((rxvt_term *)client_data)->make_current ();
1327 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1328 DT_INT, call_data->position,
1329 DT_INT, call_data->direction,
1330 DT_INT, call_data->style,
1331 DT_END));
1332}
1333#endif
1334
1335#endif
1405 1336
1406/* 1337/*
1407 * Try to open a XIM with the current modifiers, then see if we can 1338 * Try to open a XIM with the current modifiers, then see if we can
1408 * open a suitable preedit type 1339 * open a suitable preedit type
1409 */ 1340 */
… …
1416 XRectangle rect, status_rect, needed_rect; 1347 XRectangle rect, status_rect, needed_rect;
1417 unsigned long fg, bg; 1348 unsigned long fg, bg;
1418 const char *p; 1349 const char *p;
1419 char **s; 1350 char **s;
1420 XIMStyles *xim_styles; 1351 XIMStyles *xim_styles;
1352#ifdef ENABLE_XIM_ONTHESPOT
1353 XIMCallback xcb[4];
1354#endif
1355
1356 set_environ (envv);
1421 1357
1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1358 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423 return false; 1359 return false;
1424 1360
1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1426 input_method = display->get_xim (locale, modifiers); 1361 input_method = display->get_xim (locale, modifiers);
1427 if (input_method == NULL) 1362 if (input_method == NULL)
1428 return false; 1363 return false;
1429 1364
1430 xim = input_method->xim; 1365 xim = input_method->xim;
… …
1450 s = rxvt_splitcommastring (p); 1385 s = rxvt_splitcommastring (p);
1451 1386
1452 for (i = found = 0; !found && s[i]; i++) 1387 for (i = found = 0; !found && s[i]; i++)
1453 { 1388 {
1454 if (!strcmp (s[i], "OverTheSpot")) 1389 if (!strcmp (s[i], "OverTheSpot"))
1455 input_style = (XIMPreeditPosition | XIMStatusNothing); 1390 input_style = XIMPreeditPosition | XIMStatusNothing;
1456 else if (!strcmp (s[i], "OffTheSpot")) 1391 else if (!strcmp (s[i], "OffTheSpot"))
1457 input_style = (XIMPreeditArea | XIMStatusArea); 1392 input_style = XIMPreeditArea | XIMStatusArea;
1458 else if (!strcmp (s[i], "Root")) 1393 else if (!strcmp (s[i], "Root"))
1459 input_style = (XIMPreeditNothing | XIMStatusNothing); 1394 input_style = XIMPreeditNothing | XIMStatusNothing;
1460 else if (!strcmp (s[i], "None")) 1395 else if (!strcmp (s[i], "None"))
1461 input_style = (XIMPreeditNone | XIMStatusNone); 1396 input_style = XIMPreeditNone | XIMStatusNone;
1397#ifdef ENABLE_XIM_ONTHESPOT
1398 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1399 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1400#endif
1401 else
1402 input_style = XIMPreeditNothing | XIMStatusNothing;
1462 1403
1463 for (j = 0; j < xim_styles->count_styles; j++) 1404 for (j = 0; j < xim_styles->count_styles; j++)
1464 if (input_style == xim_styles->supported_styles[j]) 1405 if (input_style == xim_styles->supported_styles[j])
1465 { 1406 {
1466 rxvt_freecommastring (s); 1407 rxvt_freecommastring (s);
… …
1504 "*", 1445 "*",
1505 fheight, 1446 fheight,
1506 fheight + 1, fheight - 1, 1447 fheight + 1, fheight - 1,
1507 fheight - 2, fheight + 2); 1448 fheight - 2, fheight + 2);
1508 1449
1509 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1450 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1510 &missing_charset_list, &missing_charset_count, &def_string); 1451 &missing_charset_list, &missing_charset_count, &def_string);
1511 1452
1512 if (missing_charset_list) 1453 if (missing_charset_list)
1513 XFreeStringList (missing_charset_list); 1454 XFreeStringList (missing_charset_list);
1514 1455
… …
1555 XNBackground, bg, 1496 XNBackground, bg,
1556 XNArea, &status_rect, 1497 XNArea, &status_rect,
1557 XNFontSet, fs, 1498 XNFontSet, fs,
1558 NULL); 1499 NULL);
1559 } 1500 }
1501#if ENABLE_XIM_ONTHESPOT
1502 else if (input_style & XIMPreeditCallbacks)
1503 {
1504 im_set_position (spot);
1505
1506 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1507 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1508 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1509# if 0
1510 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1511# endif
1512
1513 preedit_attr = XVaCreateNestedList (0,
1514 XNSpotLocation, &spot,
1515 XNPreeditStartCallback, &xcb[0],
1516 XNPreeditDoneCallback , &xcb[1],
1517 XNPreeditDrawCallback , &xcb[2],
1518# if 0
1519 XNPreeditCaretCallback, &xcb[3],
1520# endif
1521 NULL);
1522 }
1523#endif
1560 1524
1561 Input_Context = XCreateIC (xim, 1525 Input_Context = XCreateIC (xim,
1562 XNInputStyle, input_style, 1526 XNInputStyle, input_style,
1563 XNClientWindow, vt, 1527 XNClientWindow, vt,
1564 XNFocusWindow, parent[0], 1528 XNFocusWindow, parent[0],
… …
1566 preedit_attr, 1530 preedit_attr,
1567 status_attr ? XNStatusAttributes : NULL, 1531 status_attr ? XNStatusAttributes : NULL,
1568 status_attr, NULL); 1532 status_attr, NULL);
1569 1533
1570 if (preedit_attr) XFree (preedit_attr); 1534 if (preedit_attr) XFree (preedit_attr);
1571 if (status_attr) XFree (status_attr); 1535 if (status_attr) XFree (status_attr);
1572 if (fs) XFreeFontSet (display->display, fs); 1536 if (fs) XFreeFontSet (dpy, fs);
1573 1537
1574 if (Input_Context == NULL) 1538 if (Input_Context == NULL)
1575 { 1539 {
1576 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1540 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1577 im_destroy (); 1541 im_destroy ();
1578 return false; 1542 return false;
1579 } 1543 }
1580 1544
1581 if (input_style & XIMPreeditArea) 1545#if 0
1546 // unfortunately, only the focus window is used by XIM, hard to fix
1547 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1548 vt_select_input ();
1549#endif
1550
1582 IMSetStatusPosition (); 1551 IMSetPosition ();
1583 1552
1584 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1585 return true; 1553 return true;
1586} 1554}
1587 1555
1588void 1556void
1589rxvt_term::im_cb () 1557rxvt_term::im_cb ()
… …
1591 int i; 1559 int i;
1592 const char *p; 1560 const char *p;
1593 char **s; 1561 char **s;
1594 char buf[IMBUFSIZ]; 1562 char buf[IMBUFSIZ];
1595 1563
1596 SET_R (this); 1564 make_current ();
1597 1565
1598 im_destroy (); 1566 im_destroy ();
1599 1567
1600 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1601 if (Input_Context) 1568 if (Input_Context)
1602 return; 1569 return;
1603 1570
1604#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1605 if (rs[Rs_imLocale]) 1572 if (rs[Rs_imLocale])
… …
1647 SET_LOCALE (locale); 1614 SET_LOCALE (locale);
1648#endif 1615#endif
1649} 1616}
1650 1617
1651void 1618void
1652rxvt_term::IMSetStatusPosition () 1619rxvt_term::IMSetPosition ()
1653{ 1620{
1654 XRectangle preedit_rect, status_rect, *needed_rect; 1621 XRectangle preedit_rect, status_rect, *needed_rect;
1655 XVaNestedList preedit_attr, status_attr; 1622 XVaNestedList preedit_attr, status_attr;
1656 1623
1657 if (!Input_Context 1624 if (!Input_Context
1658 || !focus 1625 || !focus
1659 || !(input_style & XIMPreeditArea) 1626 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1660 || !IMisRunning ()) 1627 || !IMisRunning ())
1661 return; 1628 return;
1662 1629
1630 if (input_style & XIMPreeditPosition)
1631 {
1632 im_set_size (preedit_rect);
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634
1635 XSetICValues (Input_Context,
1636 XNPreeditAttributes, preedit_attr, NULL);
1637 }
1638 else
1639 {
1663 /* Getting the necessary width of preedit area */ 1640 /* Getting the necessary width of preedit area */
1664 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1641 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1665 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1642 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1666 XFree (status_attr); 1643 XFree (status_attr);
1667 1644
1668 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1645 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1669 XFree (needed_rect); 1646 XFree (needed_rect);
1670 1647
1671 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1648 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1672 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1649 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1673 1650
1674 XSetICValues (Input_Context, 1651 XSetICValues (Input_Context,
1675 XNPreeditAttributes, preedit_attr, 1652 XNPreeditAttributes, preedit_attr,
1676 XNStatusAttributes, status_attr, NULL); 1653 XNStatusAttributes, status_attr,
1654 NULL);
1677 1655
1656 XFree (status_attr);
1657 }
1658
1678 XFree (preedit_attr); 1659 XFree (preedit_attr);
1679 XFree (status_attr);
1680} 1660}
1681#endif /* USE_XIM */ 1661#endif /* USE_XIM */
1682 1662
1683/*----------------------------------------------------------------------*/
1684rxvt_t rxvt_current_term;
1685
1686/*----------------------- end-of-file (C source) -----------------------*/ 1663/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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