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

Diff Legend

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