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

Diff Legend

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