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

Diff Legend

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