ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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