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.171 by root, Wed Jan 11 03:13:26 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} 85}
93 86
94#if ENABLE_COMBINING 87#if ENABLE_COMBINING
… …
155} 148}
156#endif 149#endif
157 150
158rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
159 : 152 :
160#if TRANSPARENT 153#if TRANSPARENT || ENABLE_PERL
161 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),
162#endif 156#endif
163#ifdef HAVE_SCROLLBARS 157#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 158 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 159#endif
166#ifdef MENUBAR
167 menubar_ev (this, &rxvt_term::x_cb),
168#endif
169#ifdef CURSOR_BLINK 160#ifdef CURSOR_BLINK
170 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 161 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
171#endif 162#endif
172#ifdef TEXT_BLINK 163#ifdef TEXT_BLINK
173 text_blink_ev (this, &rxvt_term::text_blink_cb), 164 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
185 pointer_ev (this, &rxvt_term::pointer_cb), 176 pointer_ev (this, &rxvt_term::pointer_cb),
186#endif 177#endif
187#ifdef USE_XIM 178#ifdef USE_XIM
188 im_ev (this, &rxvt_term::im_cb), 179 im_ev (this, &rxvt_term::im_cb),
189#endif 180#endif
181#ifndef NO_BELL
182 bell_ev (this, &rxvt_term::bell_cb),
183#endif
190 termwin_ev (this, &rxvt_term::x_cb), 184 termwin_ev (this, &rxvt_term::x_cb),
191 vt_ev (this, &rxvt_term::x_cb), 185 vt_ev (this, &rxvt_term::x_cb),
186 child_ev (this, &rxvt_term::child_cb),
192 check_ev (this, &rxvt_term::check_cb), 187 check_ev (this, &rxvt_term::check_cb),
193 flush_ev (this, &rxvt_term::flush_cb), 188 flush_ev (this, &rxvt_term::flush_cb),
194 destroy_ev (this, &rxvt_term::destroy_cb), 189 destroy_ev (this, &rxvt_term::destroy_cb),
195 pty_ev (this, &rxvt_term::pty_cb), 190 pty_ev (this, &rxvt_term::pty_cb),
196 incr_ev (this, &rxvt_term::incr_cb) 191 incr_ev (this, &rxvt_term::incr_cb)
… …
199 194
200 termlist.push_back (this); 195 termlist.push_back (this);
201 196
202#ifdef KEYSYM_RESOURCE 197#ifdef KEYSYM_RESOURCE
203 keyboard = new keyboard_manager; 198 keyboard = new keyboard_manager;
204
205 if (!keyboard)
206 rxvt_fatal ("out of memory, aborting.\n");
207#endif 199#endif
208} 200}
209 201
210// 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.
211// for use before an emergency exit 203// for use before an emergency exit
212void rxvt_term::emergency_cleanup () 204void rxvt_term::emergency_cleanup ()
213{ 205{
214 if (cmd_pid) 206 if (cmd_pid)
215 kill (-cmd_pid, SIGHUP); 207 kill (-cmd_pid, SIGHUP);
216 208
217#ifdef UTMP_SUPPORT 209 pty_ev.stop ();
218 privileged_utmp (RESTORE); 210 delete pty; pty = 0;
219#endif
220
221 pty.put ();
222} 211}
223 212
224rxvt_term::~rxvt_term () 213rxvt_term::~rxvt_term ()
225{ 214{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
228 termlist.erase (find (termlist.begin (), termlist.end(), this)); 215 termlist.erase (find (termlist.begin (), termlist.end(), this));
229 216
230 emergency_cleanup (); 217 emergency_cleanup ();
231 218
232#if ENABLE_STYLES 219#if ENABLE_STYLES
… …
236#endif 223#endif
237 delete fontset[0]; 224 delete fontset[0];
238 225
239 if (display) 226 if (display)
240 { 227 {
241 dDisp;
242
243 selection_clear (); 228 selection_clear ();
244 229
245#ifdef USE_XIM 230#ifdef USE_XIM
246 im_destroy (); 231 im_destroy ();
247#endif 232#endif
248#ifdef MENUBAR
249 if (menubarGC) XFreeGC (disp, menubarGC);
250#endif
251#ifdef XTERM_SCROLLBAR 233#ifdef XTERM_SCROLLBAR
252 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 234 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
253 if (ShadowGC) XFreeGC (disp, ShadowGC); 235 if (ShadowGC) XFreeGC (dpy, ShadowGC);
254#endif 236#endif
255#ifdef PLAIN_SCROLLBAR 237#ifdef PLAIN_SCROLLBAR
256 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 238 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
257#endif 239#endif
258#ifdef NEXT_SCROLLBAR 240#ifdef NEXT_SCROLLBAR
259 if (blackGC) XFreeGC (disp, blackGC); 241 if (blackGC) XFreeGC (dpy, blackGC);
260 if (whiteGC) XFreeGC (disp, whiteGC); 242 if (whiteGC) XFreeGC (dpy, whiteGC);
261 if (grayGC) XFreeGC (disp, grayGC); 243 if (grayGC) XFreeGC (dpy, grayGC);
262 if (darkGC) XFreeGC (disp, darkGC); 244 if (darkGC) XFreeGC (dpy, darkGC);
263 if (stippleGC) XFreeGC (disp, stippleGC); 245 if (stippleGC) XFreeGC (dpy, stippleGC);
264 if (dimple) XFreePixmap (disp, dimple); 246 if (dimple) XFreePixmap (dpy, dimple);
265 if (upArrow) XFreePixmap (disp, upArrow); 247 if (upArrow) XFreePixmap (dpy, upArrow);
266 if (downArrow) XFreePixmap (disp, downArrow); 248 if (downArrow) XFreePixmap (dpy, downArrow);
267 if (upArrowHi) XFreePixmap (disp, upArrowHi); 249 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
268 if (downArrowHi) XFreePixmap (disp, downArrowHi); 250 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
269#endif 251#endif
270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 252#ifdef RXVT_SCROLLBAR
271 if (topShadowGC) XFreeGC (disp, topShadowGC); 253 if (topShadowGC) XFreeGC (dpy, topShadowGC);
272 if (botShadowGC) XFreeGC (disp, botShadowGC); 254 if (botShadowGC) XFreeGC (dpy, botShadowGC);
273 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 255 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
274#endif 256#endif
275 if (gc) XFreeGC (disp, gc); 257 if (gc) XFreeGC (dpy, gc);
276 258
277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
278 delete menuBar.drawable;
279 //if (menuBar.win)
280 // XDestroyWindow (disp, menuBar.win);
281#endif
282 delete drawable; 259 delete drawable;
283 // destroy all windows 260 // destroy all windows
284 if (parent[0]) 261 if (parent[0])
285 XDestroyWindow (disp, parent[0]); 262 XDestroyWindow (dpy, parent[0]);
286 }
287 263
288 // TODO: free pixcolours, colours should become part of rxvt_display 264 for (int i = 0; i < TOTAL_COLORS; i++)
289 265 if (ISSET_PIXCOLOR (i))
290 delete pix_colors_focused; 266 {
267 pix_colors_focused [i].free (this);
291#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
292 delete pix_colors_unfocused; 278 delete [] pix_colors_unfocused;
293#endif 279#endif
294 280
295 displays.put (display); 281 displays.put (display);
296 282
297 scr_release (); 283 scr_release ();
… …
300 for (int i = 0; i < allocated.size (); i++) 286 for (int i = 0; i < allocated.size (); i++)
301 free (allocated [i]); 287 free (allocated [i]);
302 288
303 free (selection.text); 289 free (selection.text);
304 // TODO: manage env vars in child only(!) 290 // TODO: manage env vars in child only(!)
305 free (env_windowid);
306 free (env_display); 291 free (env_display);
307 free (env_term); 292 free (env_term);
308 free (env_colorfgbg);
309 free (locale); 293 free (locale);
310 free (v_buffer); 294 free (v_buffer);
311 free (incr_buf); 295 free (incr_buf);
312 296
313 delete envv; 297 delete envv;
… …
316#ifdef KEYSYM_RESOURCE 300#ifdef KEYSYM_RESOURCE
317 delete keyboard; 301 delete keyboard;
318#endif 302#endif
319} 303}
320 304
305// child has exited, usually destroys
321void 306void
322rxvt_term::child_exit () 307rxvt_term::child_cb (child_watcher &w, int status)
323{ 308{
309 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
310
324 cmd_pid = 0; 311 cmd_pid = 0;
325 312
326 if (!OPTION (Opt_hold)) 313 if (!option (Opt_hold))
327 destroy (); 314 destroy ();
328} 315}
329 316
330void 317void
331rxvt_term::destroy () 318rxvt_term::destroy ()
332{ 319{
333 if (destroy_ev.active) 320 if (destroy_ev.active)
334 return; 321 return;
335 322
323 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
324
336#if ENABLE_OVERLAY 325#if ENABLE_OVERLAY
337 scr_overlay_off (); 326 scr_overlay_off ();
338#endif 327#endif
339 328
340 if (display) 329 if (display)
… …
343 im_ev.stop (display); 332 im_ev.stop (display);
344#endif 333#endif
345#if HAVE_SCROLLBARS 334#if HAVE_SCROLLBARS
346 scrollbar_ev.stop (display); 335 scrollbar_ev.stop (display);
347#endif 336#endif
348#if MENUBAR 337#if TRANSPARENT || ENABLE_PERL
349 menubar_ev.stop (display);
350#endif
351#if TRANSPARENT
352 rootwin_ev.stop (display); 338 rootwin_ev.stop (display);
353#endif 339#endif
354 incr_ev.stop (); 340 incr_ev.stop ();
355 termwin_ev.stop (display); 341 termwin_ev.stop (display);
356 vt_ev.stop (display); 342 vt_ev.stop (display);
… …
378} 364}
379 365
380void 366void
381rxvt_term::destroy_cb (time_watcher &w) 367rxvt_term::destroy_cb (time_watcher &w)
382{ 368{
383 SET_R (this); 369 make_current ();
384 370
385 delete this; 371 delete this;
386} 372}
387 373
388/*----------------------------------------------------------------------*/ 374/*----------------------------------------------------------------------*/
… …
397{ 383{
398 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++)
399 (*t)->emergency_cleanup (); 385 (*t)->emergency_cleanup ();
400} 386}
401 387
402#if ENABLE_FRILLS 388#if !ENABLE_MINIMAL
403static void 389static void
404print_x_error (Display *dpy, XErrorEvent *event) 390print_x_error (Display *dpy, XErrorEvent *event)
405{ 391{
406 char buffer[BUFSIZ]; 392 char buffer[BUFSIZ];
407 char mesg[BUFSIZ]; 393 char mesg[BUFSIZ];
… …
455 GET_R->allowedxerror = event->error_code; 441 GET_R->allowedxerror = event->error_code;
456 else 442 else
457 { 443 {
458 // 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,
459 // so just output the error and continue 445 // so just output the error and continue
460#if ENABLE_FRILLS 446#if ENABLE_MINIMAL
447 old_xerror_handler (display, event);
448#else
461 print_x_error (display, event); 449 print_x_error (display, event);
462#else
463 old_xerror_handler (display, event);
464#endif 450#endif
465 } 451 }
466 452
467 return 0; 453 return 0;
468} 454}
… …
476 _exit (EXIT_FAILURE); 462 _exit (EXIT_FAILURE);
477} 463}
478 464
479/*----------------------------------------------------------------------*/ 465/*----------------------------------------------------------------------*/
480bool 466bool
481rxvt_term::init (int argc, const char *const *argv) 467rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
482{ 468{
469 this->envv = envv;
470
483 SET_R (this); 471 SET_R (this);
484 TEMP_ENV; // few things in X do not call setlocale :(
485
486 set_locale (""); 472 set_locale ("");
473 set_environ (envv); // few things in X do not call setlocale :(
487 474
488 if (!init_vars ()) 475 if (!init_vars ())
489 return false; 476 return false;
490 477
491 init_secondary (); 478 init_secondary ();
… …
494 481
495#ifdef KEYSYM_RESOURCE 482#ifdef KEYSYM_RESOURCE
496 keyboard->register_done (); 483 keyboard->register_done ();
497#endif 484#endif
498 485
499#if MENUBAR_MAX
500 menubar_read (rs[Rs_menu]);
501#endif
502#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
503 if (OPTION (Opt_scrollBar)) 487 if (option (Opt_scrollBar))
504 scrollBar.setIdle (); /* set existence for size calculations */ 488 scrollBar.setIdle (); /* set existence for size calculations */
505#endif 489#endif
506 490
507#if ENABLE_PERL 491 pty = ptytty::create ();
508 if (!rs[Rs_perl_ext_1])
509 rs[Rs_perl_ext_1] = "default";
510
511 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
512 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
513 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
514 {
515#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
516 // ignore some perl-related arguments if some bozo installed us set[ug]id
517 if (rxvt_tainted ())
518 {
519 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
520 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
521 {
522 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
523 rs[Rs_perl_lib] = 0;
524 rs[Rs_perl_eval] = 0;
525 }
526 }
527#endif
528 rxvt_perl.init ();
529 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
530 }
531#endif
532 492
533 create_windows (argc, argv); 493 create_windows (argc, argv);
534 494
535 dDisp;
536
537 init_xlocale (); 495 init_xlocale ();
538 496
539 scr_reset (); // initialize screen 497 scr_reset (); // initialize screen
540 498
541#if 0 499#if 0
542 XSynchronize (disp, True); 500 XSynchronize (dpy, True);
543#endif 501#endif
544 502
545#ifdef HAVE_SCROLLBARS 503#ifdef HAVE_SCROLLBARS
546 if (OPTION (Opt_scrollBar)) 504 if (option (Opt_scrollBar))
547 resize_scrollbar (); /* create and map scrollbar */ 505 resize_scrollbar (); /* create and map scrollbar */
548#endif 506#endif
549#if (MENUBAR_MAX)
550 if (menubar_visible ())
551 XMapWindow (disp, menuBar.win);
552#endif
553#ifdef TRANSPARENT 507#ifdef TRANSPARENT
554 if (OPTION (Opt_transparent)) 508 if (option (Opt_transparent))
555 { 509 {
556 XSelectInput (disp, display->root, PropertyChangeMask); 510 XSelectInput (dpy, display->root, PropertyChangeMask);
557 check_our_parents (); 511 check_our_parents ();
558 rootwin_ev.start (display, display->root); 512 rootwin_ev.start (display, display->root);
559 } 513 }
560#endif 514#endif
561 515#if ENABLE_PERL
562 XMapWindow (disp, vt); 516 rootwin_ev.start (display, display->root);
563 XMapWindow (disp, parent[0]); 517#endif
564 518
565 set_colorfgbg (); 519 set_colorfgbg ();
566 520
567 init_command (cmd_argv); 521 init_command (cmd_argv);
568 522
569 free (cmd_argv); 523 free (cmd_argv);
570 524
571 if (pty.pty >= 0) 525 if (pty->pty >= 0)
572 pty_ev.start (pty.pty, EVENT_READ); 526 pty_ev.start (pty->pty, EVENT_READ);
573 527
574 check_ev.start (); 528 check_ev.start ();
575 529
576 HOOK_INVOKE ((this, HOOK_START, DT_END)); 530 HOOK_INVOKE ((this, HOOK_START, DT_END));
577 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
578 return true; 545 return true;
579} 546}
580 547
581static struct sig_handlers 548static struct sig_handlers
582{ 549{
583 sig_watcher sw_chld, sw_term, sw_int; 550 sig_watcher sw_term, sw_int;
584 551
585 void sig_chld (sig_watcher &w)
586 {
587 // we are being called for every SIGCHLD, find the corresponding term
588 int pid;
589
590 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
591 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
592 if (pid == (*t)->cmd_pid)
593 {
594 (*t)->child_exit ();
595 break;
596 }
597 }
598
599 /* 552 /*
600 * Catch a fatal signal and tidy up before quitting 553 * Catch a fatal signal and tidy up before quitting
601 */ 554 */
602 void 555 void
603 sig_term (sig_watcher &w) 556 sig_term (sig_watcher &w)
604 { 557 {
605#ifdef DEBUG_CMD
606 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
607#endif
608 rxvt_emergency_cleanup (); 558 rxvt_emergency_cleanup ();
609 signal (w.signum, SIG_DFL); 559 signal (w.signum, SIG_DFL);
610 kill (getpid (), w.signum); 560 kill (getpid (), w.signum);
611 } 561 }
612 562
613 sig_handlers () 563 sig_handlers ()
614 : sw_chld (this, &sig_handlers::sig_chld),
615 sw_term (this, &sig_handlers::sig_term), 564 : sw_term (this, &sig_handlers::sig_term),
616 sw_int (this, &sig_handlers::sig_term) 565 sw_int (this, &sig_handlers::sig_term)
617 { 566 {
618 } 567 }
619} sig_handlers; 568} sig_handlers;
620 569
570char **rxvt_environ; // startup environment
571
621void 572void
622rxvt_init () 573rxvt_init ()
623{ 574{
624 /* 575 ptytty::init ();
625 * Save and then give up any super-user privileges 576
626 * If we need privileges in any area then we must specifically request it. 577 rxvt_environ = environ;
627 * We should only need to be root in these cases:
628 * 1. write utmp entries on some systems
629 * 2. chown tty on some systems
630 */
631 rxvt_privileges (SAVE);
632 rxvt_privileges (IGNORE);
633 578
634 signal (SIGHUP, SIG_IGN); 579 signal (SIGHUP, SIG_IGN);
635 signal (SIGPIPE, SIG_IGN); 580 signal (SIGPIPE, SIG_IGN);
636 581
637 sig_handlers.sw_chld.start (SIGCHLD);
638 sig_handlers.sw_term.start (SIGTERM); 582 sig_handlers.sw_term.start (SIGTERM);
639 sig_handlers.sw_int.start (SIGINT); 583 sig_handlers.sw_int.start (SIGINT);
640 584
641 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 585 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
642 /* signal (SIGURG, SIG_DFL); */ 586 /* signal (SIGURG, SIG_DFL); */
… …
671 rxvt_fatal ("memory allocation failure. aborting.\n"); 615 rxvt_fatal ("memory allocation failure. aborting.\n");
672 616
673 return p; 617 return p;
674} 618}
675 619
676void * 620void *
677rxvt_realloc (void *ptr, size_t size) 621rxvt_realloc (void *ptr, size_t size)
678{ 622{
679 void *p = realloc (ptr, size); 623 void *p = realloc (ptr, size);
680 624
681 if (!p) 625 if (!p)
682 rxvt_fatal ("memory allocation failure. aborting.\n"); 626 rxvt_fatal ("memory allocation failure. aborting.\n");
683 627
684 return p; 628 return p;
685} 629}
686
687/* ------------------------------------------------------------------------- *
688 * PRIVILEGED OPERATIONS *
689 * ------------------------------------------------------------------------- */
690/* take care of suid/sgid super-user (root) privileges */
691void
692rxvt_privileges (rxvt_privaction action)
693{
694#if ! defined(__CYGWIN32__)
695# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
696 /* setreuid () is the poor man's setuid (), seteuid () */
697# define seteuid(a) setreuid(-1, (a))
698# define setegid(a) setregid(-1, (a))
699# define HAVE_SETEUID
700# endif
701# ifdef HAVE_SETEUID
702 switch (action)
703 {
704 case IGNORE:
705 /*
706 * change effective uid/gid - not real uid/gid - so we can switch
707 * back to root later, as required
708 */
709 seteuid (getuid ());
710 setegid (getgid ());
711 break;
712 case SAVE:
713 saved_euid = geteuid ();
714 saved_egid = getegid ();
715 break;
716 case RESTORE:
717 seteuid (saved_euid);
718 setegid (saved_egid);
719 break;
720 }
721# else
722 switch (action)
723 {
724 case IGNORE:
725 setuid (getuid ());
726 setgid (getgid ());
727 /* FALLTHROUGH */
728 case SAVE:
729 /* FALLTHROUGH */
730 case RESTORE:
731 break;
732 }
733# endif
734#endif
735}
736
737#ifdef UTMP_SUPPORT
738void
739rxvt_term::privileged_utmp (rxvt_privaction action)
740{
741 if (OPTION (Opt_utmpInhibit)
742 || !pty.name || !*pty.name)
743 return;
744
745 rxvt_privileges (RESTORE);
746
747 if (action == SAVE)
748 makeutent (pty.name, rs[Rs_display_name]);
749 else
750 cleanutent ();
751
752 rxvt_privileges (IGNORE);
753}
754#endif
755 630
756/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
757/* 632/*
758 * window size/position calculcations for XSizeHint and other storage. 633 * window size/position calculcations for XSizeHint and other storage.
759 * if width/height are non-zero then override calculated width/height 634 * if width/height are non-zero then override calculated width/height
760 */ 635 */
761void 636void
762rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 637rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
763{ 638{
764 short recalc_x, recalc_y; 639 short recalc_x, recalc_y;
765 int x, y, sb_w, mb_h, flags; 640 int x, y, sb_w, flags;
766 unsigned int w, h; 641 unsigned int w, h;
767 unsigned int max_width, max_height; 642 unsigned int max_width, max_height;
768 dDisp;
769
770 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
771 ncol, nrow, szHint.width, szHint.height));
772 643
773 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 644 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
774 szHint.win_gravity = NorthWestGravity; 645 szHint.win_gravity = NorthWestGravity;
775 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 646 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
776 647
… …
831 max_width = MAX_COLS * fwidth; 702 max_width = MAX_COLS * fwidth;
832 max_height = MAX_ROWS * fheight; 703 max_height = MAX_ROWS * fheight;
833 704
834 szHint.base_width = szHint.base_height = 2 * int_bwidth; 705 szHint.base_width = szHint.base_height = 2 * int_bwidth;
835 706
836 sb_w = mb_h = 0; 707 sb_w = 0;
837 window_vt_x = window_vt_y = int_bwidth; 708 window_vt_x = window_vt_y = int_bwidth;
838 709
839 if (scrollbar_visible ()) 710 if (scrollBar.state)
840 { 711 {
841 sb_w = scrollbar_TotalWidth (); 712 sb_w = scrollbar_TotalWidth ();
842 szHint.base_width += sb_w; 713 szHint.base_width += sb_w;
714
843 if (!OPTION (Opt_scrollBar_right)) 715 if (!option (Opt_scrollBar_right))
844 window_vt_x += sb_w; 716 window_vt_x += sb_w;
845 } 717 }
846 718
847 if (menubar_visible ())
848 {
849 mb_h = menuBar_TotalHeight ();
850 szHint.base_height += mb_h;
851 window_vt_y += mb_h;
852 }
853
854 szHint.width_inc = fwidth; 719 szHint.width_inc = fwidth;
855 szHint.height_inc = fheight; 720 szHint.height_inc = fheight;
856 szHint.min_width = szHint.base_width + szHint.width_inc; 721 szHint.min_width = szHint.base_width + szHint.width_inc;
857 szHint.min_height = szHint.base_height + szHint.height_inc; 722 szHint.min_height = szHint.base_height + szHint.height_inc;
858 723
859 if (newwidth && newwidth - szHint.base_width < max_width) 724 if (newwidth && newwidth - szHint.base_width < max_width)
860 { 725 {
861 szHint.width = newwidth; 726 szHint.width = newwidth;
… …
876 { 741 {
877 min_it (height, max_height); 742 min_it (height, max_height);
878 szHint.height = szHint.base_height + height; 743 szHint.height = szHint.base_height + height;
879 } 744 }
880 745
881 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 746 if (scrollBar.state && option (Opt_scrollBar_right))
882 window_sb_x = szHint.width - sb_w; 747 window_sb_x = szHint.width - sb_w;
883 748
884 if (recalc_x) 749 if (recalc_x)
885 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 750 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
751
886 if (recalc_y) 752 if (recalc_y)
887 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 753 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
888 754
889 ncol = width / fwidth; 755 ncol = width / fwidth;
890 nrow = height / fheight; 756 nrow = height / fheight;
891 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
892 ncol, nrow, szHint.width,
893 szHint.height));
894 return;
895} 757}
896 758
897/*----------------------------------------------------------------------*/ 759/*----------------------------------------------------------------------*/
898/* 760/*
899 * Tell the teletype handler what size the window is. 761 * Tell the teletype handler what size the window is.
900 * Called after a window size change. 762 * Called after a window size change.
901 */ 763 */
902void 764void
903rxvt_term::tt_winch () 765rxvt_term::tt_winch ()
904{ 766{
905 if (pty.pty < 0) 767 if (pty->pty < 0)
906 return; 768 return;
907 769
908 struct winsize ws; 770 struct winsize ws;
909 771
910 ws.ws_col = ncol; 772 ws.ws_col = ncol;
911 ws.ws_row = nrow; 773 ws.ws_row = nrow;
912 ws.ws_xpixel = width; 774 ws.ws_xpixel = width;
913 ws.ws_ypixel = height; 775 ws.ws_ypixel = height;
914 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 776 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
915 777
916#if 0 778#if 0
917 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 779 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
918 if (cmd_pid) /* force through to the command */ 780 if (cmd_pid) /* force through to the command */
919 kill (-cmd_pid, SIGWINCH); 781 kill (-cmd_pid, SIGWINCH);
… …
951 delete fontset[0]; 813 delete fontset[0];
952 fontset[0] = fs; 814 fontset[0] = fs;
953 815
954 prop = (*fs)[1]->properties (); 816 prop = (*fs)[1]->properties ();
955 prop.height += lineSpace; 817 prop.height += lineSpace;
818
956 fs->set_prop (prop); 819 fs->set_prop (prop, false);
957 820
958 fwidth = prop.width; 821 fwidth = prop.width;
959 fheight = prop.height; 822 fheight = prop.height;
960 fbase = prop.ascent; 823 fbase = prop.ascent;
961 824
… …
970 { 833 {
971 fontset[style] = fs = new rxvt_fontset (this); 834 fontset[style] = fs = new rxvt_fontset (this);
972 rxvt_fontprop prop2 = prop; 835 rxvt_fontprop prop2 = prop;
973 836
974 if (res) 837 if (res)
975 prop2.weight = prop2.slant = rxvt_fontprop::unset; 838 {
839 fs->populate (res);
840 fs->set_prop (prop2, false);
841 }
976 else 842 else
977 { 843 {
978 res = fontset[0]->fontdesc; 844 fs->populate (fontset[0]->fontdesc);
979 845
980 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;
981 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);
982 } 850 }
983 851
984 fs->populate (res);
985 fs->set_prop (prop2);
986 } 852 }
987#else 853#else
988 fontset[style] = fontset[0]; 854 fontset[style] = fontset[0];
989#endif 855#endif
990 } 856 }
… …
999 return true; 865 return true;
1000} 866}
1001 867
1002void 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)
1003{ 869{
1004 XChangeProperty (display->display, parent[0], 870 XChangeProperty (dpy, parent[0],
1005 prop, XA_STRING, 8, PropModeReplace, 871 prop, XA_STRING, 8, PropModeReplace,
1006 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 872 (const unsigned char *)str, len >= 0 ? len : strlen (str));
1007} 873}
1008 874
1009void 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)
1010{ 876{
1011 wchar_t *ws = rxvt_mbstowcs (str, len); 877 wchar_t *ws = rxvt_mbstowcs (str, len);
1012 char *s = rxvt_wcstoutf8 (ws); 878 char *s = rxvt_wcstoutf8 (ws);
1013 879
1014 XChangeProperty (display->display, parent[0], 880 XChangeProperty (dpy, parent[0],
1015 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 881 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1016 (const unsigned char *)s, strlen (s)); 882 (const unsigned char *)s, strlen (s));
1017 883
1018 free (s); 884 free (s);
1019 free (ws); 885 free (ws);
… …
1044void 910void
1045rxvt_term::set_window_color (int idx, const char *color) 911rxvt_term::set_window_color (int idx, const char *color)
1046{ 912{
1047 rxvt_color xcol; 913 rxvt_color xcol;
1048 int i; 914 int i;
1049 915
1050 if (color == NULL || *color == '\0') 916 if (color == NULL || *color == '\0')
1051 return; 917 return;
918
919 color = strdup (color);
920 allocated.push_back ((void *)color);
921 rs[Rs_color + idx] = color;
1052 922
1053 /* handle color aliases */ 923 /* handle color aliases */
1054 if (isdigit (*color)) 924 if (isdigit (*color))
1055 { 925 {
1056 i = atoi (color); 926 i = atoi (color);
1057 927
1058 if (i >= 8 && i <= 15) 928 if (i >= 8 && i <= 15)
1059 { /* bright colors */ 929 { /* bright colors */
1060 i -= 8; 930 i -= 8;
1061 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 931 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1062 SET_PIXCOLOR (idx);
1063 goto done; 932 goto done;
1064 } 933 }
1065 934
1066 if (i >= 0 && i <= 7) 935 if (i >= 0 && i <= 7)
1067 { /* normal colors */ 936 { /* normal colors */
1068 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 937 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1069 SET_PIXCOLOR (idx);
1070 goto done; 938 goto done;
1071 } 939 }
1072 } 940 }
1073 941
1074 if (!rXParseAllocColor (&xcol, color)) 942 set_color (xcol, color);
1075 return;
1076
1077 /* XStoreColor (display->display, display->cmap, XColor*); */
1078 943
1079 /* 944 /*
1080 * 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,
1081 * so just keep gobbling up the colormap 946 * so just keep gobbling up the colormap
1082 */ 947 */
1083# if 0
1084 for (i = Color_Black; i <= Color_White; i++)
1085 if (pix_colors[idx] == pix_colors[i])
1086 break;
1087 if (i > Color_White)
1088 {
1089 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1090 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1091 DisplayPlanes (display->display, display->screen));
1092 }
1093# endif
1094 948
1095 pix_colors_focused[idx] = xcol; 949 pix_colors_focused[idx] = xcol;
1096 SET_PIXCOLOR (idx);
1097 950
1098 /* XSetWindowAttributes attr; */ 951 /* XSetWindowAttributes attr; */
1099 /* Cursor cursor; */ 952 /* Cursor cursor; */
1100done: 953done:
1101
1102#if OFF_FOCUS_FADING
1103 if (rs[Rs_fade])
1104 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1105#endif
1106
1107 /*TODO: handle Color_BD, scrollbar background, etc. */ 954 /*TODO: handle Color_BD, scrollbar background, etc. */
1108 955
956 update_fade_color (idx);
1109 recolour_cursor (); 957 recolour_cursor ();
1110 scr_recolour (); 958 scr_recolour ();
1111} 959}
1112 960
1113#else 961#else
… …
1115#endif /* XTERM_COLOR_CHANGE */ 963#endif /* XTERM_COLOR_CHANGE */
1116 964
1117void 965void
1118rxvt_term::recolour_cursor () 966rxvt_term::recolour_cursor ()
1119{ 967{
1120 XColor xcol[2]; 968 XColor fg, bg;
1121 969
1122 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 970 (ISSET_PIXCOLOR (Color_pointer_fg)
1123 ? pix_colors_focused[Color_pointer_fg] 971 ? pix_colors_focused[Color_pointer_fg]
1124 : pix_colors_focused[Color_fg]; 972 : pix_colors_focused[Color_fg]).get (fg);
973
1125 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 974 (ISSET_PIXCOLOR (Color_pointer_bg)
1126 ? pix_colors_focused[Color_pointer_bg] 975 ? pix_colors_focused[Color_pointer_bg]
1127 : pix_colors_focused[Color_bg]; 976 : pix_colors_focused[Color_bg]).get (bg);
1128 977
1129 XQueryColors (display->display, display->cmap, xcol, 2); 978 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1130 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1131} 979}
1132 980
1133/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
1134/* 982/*
1135 * 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
… …
1139{ 987{
1140 unsigned int i; 988 unsigned int i;
1141 const char *xpmb = "\0"; 989 const char *xpmb = "\0";
1142 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 990 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1143 991
1144 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1145 strcpy (fstr, "default"); 992 strcpy (fstr, "default");
1146 strcpy (bstr, "default"); 993 strcpy (bstr, "default");
1147 for (i = Color_Black; i <= Color_White; i++) 994 for (i = Color_Black; i <= Color_White; i++)
1148 if (pix_colors[Color_fg] == pix_colors[i]) 995 if (pix_colors[Color_fg] == pix_colors[i])
1149 { 996 {
… …
1164 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1011 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1165} 1012}
1166 1013
1167/*----------------------------------------------------------------------*/ 1014/*----------------------------------------------------------------------*/
1168 1015
1169int 1016bool
1170rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1017rxvt_term::set_color (rxvt_color &color, const char *name)
1171{ 1018{
1172 if (!screen_in_out->set (display, colour)) 1019 if (color.set (this, name))
1173 {
1174 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1175 return false;
1176 }
1177
1178 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]);
1179} 1030}
1180 1031
1181/* -------------------------------------------------------------------- * 1032/* -------------------------------------------------------------------- *
1182 * - WINDOW RESIZING - * 1033 * - WINDOW RESIZING - *
1183 * -------------------------------------------------------------------- */ 1034 * -------------------------------------------------------------------- */
1184void 1035void
1185rxvt_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)
1186{ 1037{
1187 int fix_screen; 1038 int fix_screen;
1188 int old_width = szHint.width, old_height = szHint.height; 1039 int old_width = szHint.width;
1189 dDisp; 1040 int old_height = szHint.height;
1190 1041
1191 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)))
1192 XSetWMNormalHints (disp, parent[0], &szHint); 1045 XSetWMNormalHints (dpy, parent[0], &szHint);
1193 1046
1194 if (!ignoreparent) 1047 if (!ignoreparent)
1195 { 1048 {
1196#ifdef SMART_RESIZE 1049#ifdef SMART_RESIZE
1197 /* 1050 /*
… …
1201 int x, y, x1, y1; 1054 int x, y, x1, y1;
1202 int dx, dy; 1055 int dx, dy;
1203 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1056 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1204 Window unused_cr; 1057 Window unused_cr;
1205 1058
1206 XTranslateCoordinates (disp, parent[0], display->root, 1059 XTranslateCoordinates (dpy, parent[0], display->root,
1207 0, 0, &x, &y, &unused_cr); 1060 0, 0, &x, &y, &unused_cr);
1208 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1061 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1209 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1062 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1210 /* 1063 /*
1211 * 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
1212 * our position for handles and decorations. Counter it 1065 * our position for handles and decorations. Counter it
1213 */ 1066 */
… …
1215 { 1068 {
1216 x -= x1; 1069 x -= x1;
1217 y -= y1; 1070 y -= y1;
1218 } 1071 }
1219 1072
1220 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1073 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1221 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1074 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1222 dx = old_width - szHint.width; 1075 dx = old_width - szHint.width;
1223 dy = old_height - szHint.height; 1076 dy = old_height - szHint.height;
1224 1077
1225 /* Check position of the center of the window */ 1078 /* Check position of the center of the window */
1226 if (x < x1) /* left half */ 1079 if (x < x1) /* left half */
1227 dx = 0; 1080 dx = 0;
… …
1230 if (y < y1) /* top half */ 1083 if (y < y1) /* top half */
1231 dy = 0; 1084 dy = 0;
1232 else if (y == y1) /* exact center */ 1085 else if (y == y1) /* exact center */
1233 dy /= 2; 1086 dy /= 2;
1234 1087
1235 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1088 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1236 szHint.width, szHint.height); 1089 szHint.width, szHint.height);
1237#else 1090#else
1238 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1091 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1239#endif 1092#endif
1240 } 1093 }
1241 1094
1242 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1095 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1243 1096
1244 if (fix_screen || newwidth != old_width || newheight != old_height) 1097 if (fix_screen || newwidth != old_width || newheight != old_height)
1245 { 1098 {
1246 if (scrollbar_visible ()) 1099 if (scrollBar.state)
1247 { 1100 {
1248 XMoveResizeWindow (disp, scrollBar.win, 1101 XMoveResizeWindow (dpy, scrollBar.win,
1249 window_sb_x, 0, 1102 window_sb_x, 0,
1250 scrollbar_TotalWidth (), szHint.height); 1103 scrollbar_TotalWidth (), szHint.height);
1251 resize_scrollbar (); 1104 resize_scrollbar ();
1252 } 1105 }
1253 1106
1254 if (menubar_visible ())
1255 XMoveResizeWindow (disp, menuBar.win,
1256 window_vt_x, 0,
1257 width, menuBar_TotalHeight ());
1258
1259 XMoveResizeWindow (disp, vt, 1107 XMoveResizeWindow (dpy, vt,
1260 window_vt_x, window_vt_y, 1108 window_vt_x, window_vt_y,
1261 width, height); 1109 width, height);
1262 1110
1263 scr_clear (); 1111 scr_clear ();
1264#ifdef XPM_BACKGROUND 1112#ifdef XPM_BACKGROUND
1265 resize_pixmap (); 1113 resize_pixmap ();
1266#endif 1114#endif
1267 } 1115 }
1268 1116
1269 if (fix_screen || old_height == 0) 1117 if (fix_screen || old_height == 0)
1270 {
1271 int curr_screen = -1;
1272 int old_ncol = prev_ncol;
1273
1274 /* scr_reset only works on the primary screen */
1275 if (old_height) /* this is not the first time through */
1276 {
1277 unsigned int ocol = ncol;
1278 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1279 curr_screen = scr_change_screen (PRIMARY);
1280 ncol = ocol;
1281 }
1282
1283 scr_reset (); 1118 scr_reset ();
1284 1119
1285 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
1286 { 1121 //scr_touch (false);
1287 scr_change_screen (curr_screen);
1288 selection_check (old_ncol != ncol ? 4 : 0);
1289 }
1290 }
1291
1292 old_width = szHint.width;
1293 old_height = szHint.height;
1294 1122
1295#ifdef XPM_BACKGROUND 1123#ifdef XPM_BACKGROUND
1296 if (pixmap) 1124 if (pixmap)
1297 scr_touch (false); 1125 scr_touch (false);
1298#endif 1126#endif
1299 1127
1300#ifdef USE_XIM 1128#ifdef USE_XIM
1301 IMSetStatusPosition (); 1129 IMSetPosition ();
1302#endif 1130#endif
1303} 1131}
1304 1132
1305/* 1133/*
1306 * 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.
… …
1311{ 1139{
1312 XWindowAttributes wattr; 1140 XWindowAttributes wattr;
1313 1141
1314 if (newwidth == 0 || newheight == 0) 1142 if (newwidth == 0 || newheight == 0)
1315 { 1143 {
1316 XGetWindowAttributes (display->display, display->root, &wattr); 1144 XGetWindowAttributes (dpy, display->root, &wattr);
1317 1145
1318 if (newwidth == 0) 1146 if (newwidth == 0)
1319 newwidth = wattr.width - szHint.base_width; 1147 newwidth = wattr.width - szHint.base_width;
1320 if (newheight == 0) 1148 if (newheight == 0)
1321 newheight = wattr.height - szHint.base_height; 1149 newheight = wattr.height - szHint.base_height;
… …
1335#ifdef USE_XIM 1163#ifdef USE_XIM
1336 1164
1337void 1165void
1338rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1166rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1339{ 1167{
1340 fg = pix_colors[Color_fg]; 1168 fg = pix_colors [Color_fg];
1341 bg = pix_colors[Color_bg]; 1169 bg = pix_colors [Color_bg];
1342} 1170}
1343 1171
1344void 1172void
1345rxvt_term::im_set_size (XRectangle &size) 1173rxvt_term::im_set_size (XRectangle &size)
1346{ 1174{
… …
1383 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1211 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1384 1212
1385 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1213 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1386 *p = '\0'; 1214 *p = '\0';
1387 1215
1388 atom = XInternAtom (display->display, server, False); 1216 atom = XInternAtom (dpy, server, False);
1389 win = XGetSelectionOwner (display->display, atom); 1217 win = XGetSelectionOwner (dpy, atom);
1390 1218
1391 if (win != None) 1219 if (win != None)
1392 return True; 1220 return True;
1393 } 1221 }
1394 1222
… …
1401 XPoint nspot; 1229 XPoint nspot;
1402 XVaNestedList preedit_attr; 1230 XVaNestedList preedit_attr;
1403 1231
1404 if (!Input_Context 1232 if (!Input_Context
1405 || !focus 1233 || !focus
1406 || !(input_style & XIMPreeditPosition)) 1234 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1407 return; 1235 return;
1408 1236
1409 im_set_position (nspot); 1237 im_set_position (nspot);
1410 1238
1411 if (nspot.x == spot.x && nspot.y == spot.y) 1239 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1430 input_method = 0; 1258 input_method = 0;
1431 } 1259 }
1432 1260
1433 Input_Context = 0; 1261 Input_Context = 0;
1434} 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
1435 1337
1436/* 1338/*
1437 * 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
1438 * open a suitable preedit type 1340 * open a suitable preedit type
1439 */ 1341 */
… …
1446 XRectangle rect, status_rect, needed_rect; 1348 XRectangle rect, status_rect, needed_rect;
1447 unsigned long fg, bg; 1349 unsigned long fg, bg;
1448 const char *p; 1350 const char *p;
1449 char **s; 1351 char **s;
1450 XIMStyles *xim_styles; 1352 XIMStyles *xim_styles;
1353#ifdef ENABLE_XIM_ONTHESPOT
1354 XIMCallback xcb[4];
1355#endif
1451 1356
1452 TEMP_ENV; 1357 set_environ (envv);
1453 1358
1454 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1359 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1455 return false; 1360 return false;
1456 1361
1457 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1458 input_method = display->get_xim (locale, modifiers); 1362 input_method = display->get_xim (locale, modifiers);
1459 if (input_method == NULL) 1363 if (input_method == NULL)
1460 return false; 1364 return false;
1461 1365
1462 xim = input_method->xim; 1366 xim = input_method->xim;
… …
1482 s = rxvt_splitcommastring (p); 1386 s = rxvt_splitcommastring (p);
1483 1387
1484 for (i = found = 0; !found && s[i]; i++) 1388 for (i = found = 0; !found && s[i]; i++)
1485 { 1389 {
1486 if (!strcmp (s[i], "OverTheSpot")) 1390 if (!strcmp (s[i], "OverTheSpot"))
1487 input_style = (XIMPreeditPosition | XIMStatusNothing); 1391 input_style = XIMPreeditPosition | XIMStatusNothing;
1488 else if (!strcmp (s[i], "OffTheSpot")) 1392 else if (!strcmp (s[i], "OffTheSpot"))
1489 input_style = (XIMPreeditArea | XIMStatusArea); 1393 input_style = XIMPreeditArea | XIMStatusArea;
1490 else if (!strcmp (s[i], "Root")) 1394 else if (!strcmp (s[i], "Root"))
1491 input_style = (XIMPreeditNothing | XIMStatusNothing); 1395 input_style = XIMPreeditNothing | XIMStatusNothing;
1492 else if (!strcmp (s[i], "None")) 1396 else if (!strcmp (s[i], "None"))
1493 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;
1494 1404
1495 for (j = 0; j < xim_styles->count_styles; j++) 1405 for (j = 0; j < xim_styles->count_styles; j++)
1496 if (input_style == xim_styles->supported_styles[j]) 1406 if (input_style == xim_styles->supported_styles[j])
1497 { 1407 {
1498 rxvt_freecommastring (s); 1408 rxvt_freecommastring (s);
… …
1536 "*", 1446 "*",
1537 fheight, 1447 fheight,
1538 fheight + 1, fheight - 1, 1448 fheight + 1, fheight - 1,
1539 fheight - 2, fheight + 2); 1449 fheight - 2, fheight + 2);
1540 1450
1541 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1451 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1542 &missing_charset_list, &missing_charset_count, &def_string); 1452 &missing_charset_list, &missing_charset_count, &def_string);
1543 1453
1544 if (missing_charset_list) 1454 if (missing_charset_list)
1545 XFreeStringList (missing_charset_list); 1455 XFreeStringList (missing_charset_list);
1546 1456
… …
1587 XNBackground, bg, 1497 XNBackground, bg,
1588 XNArea, &status_rect, 1498 XNArea, &status_rect,
1589 XNFontSet, fs, 1499 XNFontSet, fs,
1590 NULL); 1500 NULL);
1591 } 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
1592 1525
1593 Input_Context = XCreateIC (xim, 1526 Input_Context = XCreateIC (xim,
1594 XNInputStyle, input_style, 1527 XNInputStyle, input_style,
1595 XNClientWindow, vt, 1528 XNClientWindow, vt,
1596 XNFocusWindow, parent[0], 1529 XNFocusWindow, parent[0],
… …
1598 preedit_attr, 1531 preedit_attr,
1599 status_attr ? XNStatusAttributes : NULL, 1532 status_attr ? XNStatusAttributes : NULL,
1600 status_attr, NULL); 1533 status_attr, NULL);
1601 1534
1602 if (preedit_attr) XFree (preedit_attr); 1535 if (preedit_attr) XFree (preedit_attr);
1603 if (status_attr) XFree (status_attr); 1536 if (status_attr) XFree (status_attr);
1604 if (fs) XFreeFontSet (display->display, fs); 1537 if (fs) XFreeFontSet (dpy, fs);
1605 1538
1606 if (Input_Context == NULL) 1539 if (Input_Context == NULL)
1607 { 1540 {
1608 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1541 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1609 im_destroy (); 1542 im_destroy ();
1610 return false; 1543 return false;
1611 } 1544 }
1612 1545
1613 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
1614 IMSetStatusPosition (); 1552 IMSetPosition ();
1615 1553
1616 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1617 return true; 1554 return true;
1618} 1555}
1619 1556
1620void 1557void
1621rxvt_term::im_cb () 1558rxvt_term::im_cb ()
… …
1623 int i; 1560 int i;
1624 const char *p; 1561 const char *p;
1625 char **s; 1562 char **s;
1626 char buf[IMBUFSIZ]; 1563 char buf[IMBUFSIZ];
1627 1564
1628 SET_R (this); 1565 make_current ();
1629 1566
1630 im_destroy (); 1567 im_destroy ();
1631 1568
1632 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1633 if (Input_Context) 1569 if (Input_Context)
1634 return; 1570 return;
1635 1571
1636#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1572#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1637 if (rs[Rs_imLocale]) 1573 if (rs[Rs_imLocale])
… …
1679 SET_LOCALE (locale); 1615 SET_LOCALE (locale);
1680#endif 1616#endif
1681} 1617}
1682 1618
1683void 1619void
1684rxvt_term::IMSetStatusPosition () 1620rxvt_term::IMSetPosition ()
1685{ 1621{
1686 XRectangle preedit_rect, status_rect, *needed_rect; 1622 XRectangle preedit_rect, status_rect, *needed_rect;
1687 XVaNestedList preedit_attr, status_attr; 1623 XVaNestedList preedit_attr, status_attr;
1688 1624
1689 if (!Input_Context 1625 if (!Input_Context
1690 || !focus 1626 || !focus
1691 || !(input_style & XIMPreeditArea) 1627 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1692 || !IMisRunning ()) 1628 || !IMisRunning ())
1693 return; 1629 return;
1694 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 {
1695 /* Getting the necessary width of preedit area */ 1641 /* Getting the necessary width of preedit area */
1696 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1642 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1697 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1643 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1698 XFree (status_attr); 1644 XFree (status_attr);
1699 1645
1700 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1646 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1701 XFree (needed_rect); 1647 XFree (needed_rect);
1702 1648
1703 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1649 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1704 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1650 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1705 1651
1706 XSetICValues (Input_Context, 1652 XSetICValues (Input_Context,
1707 XNPreeditAttributes, preedit_attr, 1653 XNPreeditAttributes, preedit_attr,
1708 XNStatusAttributes, status_attr, NULL); 1654 XNStatusAttributes, status_attr,
1655 NULL);
1709 1656
1657 XFree (status_attr);
1658 }
1659
1710 XFree (preedit_attr); 1660 XFree (preedit_attr);
1711 XFree (status_attr);
1712} 1661}
1713#endif /* USE_XIM */ 1662#endif /* USE_XIM */
1714 1663
1715/*----------------------------------------------------------------------*/
1716rxvt_t rxvt_current_term;
1717
1718/*----------------------- end-of-file (C source) -----------------------*/ 1664/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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