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

Diff Legend

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