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

Diff Legend

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