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

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

Diff Legend

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