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.187 by root, Tue Jan 17 16:22:41 2006 UTC vs.
Revision 1.232 by root, Tue May 1 21:30:01 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
66void 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),
147#endif 155#endif
148#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 157 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 158#endif
… …
167 pointer_ev (this, &rxvt_term::pointer_cb), 175 pointer_ev (this, &rxvt_term::pointer_cb),
168#endif 176#endif
169#ifdef USE_XIM 177#ifdef USE_XIM
170 im_ev (this, &rxvt_term::im_cb), 178 im_ev (this, &rxvt_term::im_cb),
171#endif 179#endif
180#ifndef NO_BELL
181 bell_ev (this, &rxvt_term::bell_cb),
182#endif
172 termwin_ev (this, &rxvt_term::x_cb), 183 termwin_ev (this, &rxvt_term::x_cb),
173 vt_ev (this, &rxvt_term::x_cb), 184 vt_ev (this, &rxvt_term::x_cb),
185 child_ev (this, &rxvt_term::child_cb),
174 check_ev (this, &rxvt_term::check_cb), 186 check_ev (this, &rxvt_term::check_cb),
175 flush_ev (this, &rxvt_term::flush_cb), 187 flush_ev (this, &rxvt_term::flush_cb),
176 destroy_ev (this, &rxvt_term::destroy_cb), 188 destroy_ev (this, &rxvt_term::destroy_cb),
177 pty_ev (this, &rxvt_term::pty_cb), 189 pty_ev (this, &rxvt_term::pty_cb),
178 incr_ev (this, &rxvt_term::incr_cb) 190 incr_ev (this, &rxvt_term::incr_cb)
… …
181 193
182 termlist.push_back (this); 194 termlist.push_back (this);
183 195
184#ifdef KEYSYM_RESOURCE 196#ifdef KEYSYM_RESOURCE
185 keyboard = new keyboard_manager; 197 keyboard = new keyboard_manager;
186
187 if (!keyboard)
188 rxvt_fatal ("out of memory, aborting.\n");
189#endif 198#endif
190} 199}
191 200
192// clean up the most important stuff, do *not* call x or free mem etc. 201// clean up the most important stuff, do *not* call x or free mem etc.
193// for use before an emergency exit 202// for use before an emergency exit
194void rxvt_term::emergency_cleanup () 203void rxvt_term::emergency_cleanup ()
195{ 204{
196 if (cmd_pid) 205 if (cmd_pid)
197 kill (-cmd_pid, SIGHUP); 206 kill (-cmd_pid, SIGHUP);
198 207
208 pty_ev.stop ();
199 delete pty; pty = 0; 209 delete pty; pty = 0;
200} 210}
201 211
202rxvt_term::~rxvt_term () 212rxvt_term::~rxvt_term ()
203{ 213{
204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
206 termlist.erase (find (termlist.begin (), termlist.end(), this)); 214 termlist.erase (find (termlist.begin (), termlist.end(), this));
207 215
208 emergency_cleanup (); 216 emergency_cleanup ();
209 217
210#if ENABLE_STYLES 218#if ENABLE_STYLES
… …
214#endif 222#endif
215 delete fontset[0]; 223 delete fontset[0];
216 224
217 if (display) 225 if (display)
218 { 226 {
219 dDisp;
220
221 selection_clear (); 227 selection_clear ();
222 228
223#ifdef USE_XIM 229#ifdef USE_XIM
224 im_destroy (); 230 im_destroy ();
225#endif 231#endif
226#ifdef XTERM_SCROLLBAR 232#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 233 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (disp, ShadowGC); 234 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 235#endif
230#ifdef PLAIN_SCROLLBAR 236#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 237 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 238#endif
233#ifdef NEXT_SCROLLBAR 239#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (disp, blackGC); 240 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (disp, whiteGC); 241 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (disp, grayGC); 242 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (disp, darkGC); 243 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (disp, stippleGC); 244 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (disp, dimple); 245 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (disp, upArrow); 246 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (disp, downArrow); 247 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (disp, upArrowHi); 248 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (disp, downArrowHi); 249 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 250#endif
245#ifdef RXVT_SCROLLBAR 251#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (disp, topShadowGC); 252 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (disp, botShadowGC); 253 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 254 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 255#endif
250 if (gc) XFreeGC (disp, gc); 256 if (gc) XFreeGC (dpy, gc);
251 257
252 delete drawable; 258 delete drawable;
253 // destroy all windows 259 // destroy all windows
254 if (parent[0]) 260 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 261 XDestroyWindow (dpy, parent[0]);
256 }
257 262
258 // TODO: free pixcolours, colours should become part of rxvt_display 263 for (int i = 0; i < TOTAL_COLORS; i++)
259 delete pix_colors_focused; 264 if (ISSET_PIXCOLOR (i))
265 {
266 pix_colors_focused [i].free (this);
260#if OFF_FOCUS_FADING 267#if OFF_FOCUS_FADING
268 pix_colors_unfocused [i].free (this);
269#endif
270 }
271
272 clear ();
273 }
274
275 delete [] pix_colors_focused;
276#if OFF_FOCUS_FADING
261 delete pix_colors_unfocused; 277 delete [] pix_colors_unfocused;
262#endif 278#endif
263 279
264 displays.put (display); 280 displays.put (display);
265 281
266 scr_release (); 282 scr_release ();
… …
269 for (int i = 0; i < allocated.size (); i++) 285 for (int i = 0; i < allocated.size (); i++)
270 free (allocated [i]); 286 free (allocated [i]);
271 287
272 free (selection.text); 288 free (selection.text);
273 // TODO: manage env vars in child only(!) 289 // TODO: manage env vars in child only(!)
274 free (env_windowid);
275 free (env_display); 290 free (env_display);
276 free (env_term); 291 free (env_term);
277 free (env_colorfgbg);
278 free (locale); 292 free (locale);
279 free (v_buffer); 293 free (v_buffer);
280 free (incr_buf); 294 free (incr_buf);
281 295
282 delete envv; 296 delete envv;
… …
285#ifdef KEYSYM_RESOURCE 299#ifdef KEYSYM_RESOURCE
286 delete keyboard; 300 delete keyboard;
287#endif 301#endif
288} 302}
289 303
304// child has exited, usually destroys
290void 305void
291rxvt_term::child_exit () 306rxvt_term::child_cb (child_watcher &w, int status)
292{ 307{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309
293 cmd_pid = 0; 310 cmd_pid = 0;
294 311
295 if (!OPTION (Opt_hold)) 312 if (!option (Opt_hold))
296 destroy (); 313 destroy ();
297} 314}
298 315
299void 316void
300rxvt_term::destroy () 317rxvt_term::destroy ()
301{ 318{
302 if (destroy_ev.active) 319 if (destroy_ev.active)
303 return; 320 return;
304 321
322 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323
305#if ENABLE_OVERLAY 324#if ENABLE_OVERLAY
306 scr_overlay_off (); 325 scr_overlay_off ();
307#endif 326#endif
308 327
309 if (display) 328 if (display)
… …
312 im_ev.stop (display); 331 im_ev.stop (display);
313#endif 332#endif
314#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
315 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
316#endif 335#endif
317#if TRANSPARENT 336#if TRANSPARENT || ENABLE_PERL
318 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
319#endif 338#endif
320 incr_ev.stop (); 339 incr_ev.stop ();
321 termwin_ev.stop (display); 340 termwin_ev.stop (display);
322 vt_ev.stop (display); 341 vt_ev.stop (display);
… …
363{ 382{
364 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
365 (*t)->emergency_cleanup (); 384 (*t)->emergency_cleanup ();
366} 385}
367 386
368#if ENABLE_FRILLS 387#if !ENABLE_MINIMAL
369static void 388static void
370print_x_error (Display *dpy, XErrorEvent *event) 389print_x_error (Display *dpy, XErrorEvent *event)
371{ 390{
372 char buffer[BUFSIZ]; 391 char buffer[BUFSIZ];
373 char mesg[BUFSIZ]; 392 char mesg[BUFSIZ];
… …
421 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
422 else 441 else
423 { 442 {
424 // GET_R is most likely not the terminal which caused the error, 443 // GET_R is most likely not the terminal which caused the error,
425 // so just output the error and continue 444 // so just output the error and continue
426#if ENABLE_FRILLS 445#if ENABLE_MINIMAL
446 old_xerror_handler (display, event);
447#else
427 print_x_error (display, event); 448 print_x_error (display, event);
428#else
429 old_xerror_handler (display, event);
430#endif 449#endif
431 } 450 }
432 451
433 return 0; 452 return 0;
434} 453}
… …
442 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
443} 462}
444 463
445/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
446bool 465bool
447rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
448{ 467{
468 this->envv = envv;
469
449 SET_R (this); 470 SET_R (this);
450 set_locale (""); 471 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :( 472 set_environ (envv); // few things in X do not call setlocale :(
452 473
453 if (!init_vars ()) 474 if (!init_vars ())
… …
460#ifdef KEYSYM_RESOURCE 481#ifdef KEYSYM_RESOURCE
461 keyboard->register_done (); 482 keyboard->register_done ();
462#endif 483#endif
463 484
464#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
465 if (OPTION (Opt_scrollBar)) 486 if (option (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
467#endif 488#endif
468 489
469#if ENABLE_PERL 490 pty = ptytty::create ();
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482 pty = rxvt_new_ptytty ();
483 491
484 create_windows (argc, argv); 492 create_windows (argc, argv);
485 493
486 dDisp;
487
488 init_xlocale (); 494 init_xlocale ();
489 495
490 scr_reset (); // initialize screen 496 scr_reset (); // initialize screen
491 497
492#if 0 498#if 0
493 XSynchronize (disp, True); 499 XSynchronize (dpy, True);
494#endif 500#endif
495 501
496#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 503 if (option (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
499#endif 505#endif
500#ifdef TRANSPARENT 506#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent)) 507 if (option (Opt_transparent))
502 { 508 {
503 XSelectInput (disp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents (); 510 check_our_parents ();
505 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
506 } 512 }
507#endif 513#endif
508 514#if ENABLE_PERL
509 XMapWindow (disp, vt); 515 rootwin_ev.start (display, display->root);
510 XMapWindow (disp, parent[0]); 516#endif
511 517
512 set_colorfgbg (); 518 set_colorfgbg ();
513 519
514 init_command (cmd_argv); 520 init_command (cmd_argv);
515 521
… …
520 526
521 check_ev.start (); 527 check_ev.start ();
522 528
523 HOOK_INVOKE ((this, HOOK_START, DT_END)); 529 HOOK_INVOKE ((this, HOOK_START, DT_END));
524 530
531#if ENABLE_XEMBED
532 if (rs[Rs_embed])
533 {
534 long info[2] = { 0, XEMBED_MAPPED };
535
536 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
537 32, PropModeReplace, (unsigned char *)&info, 2);
538 }
539#endif
540
541 XMapWindow (dpy, vt);
542 XMapWindow (dpy, parent[0]);
543
525 return true; 544 return true;
526} 545}
527 546
528static struct sig_handlers 547static struct sig_handlers
529{ 548{
530 sig_watcher sw_chld, sw_term, sw_int; 549 sig_watcher sw_term, sw_int;
531 550
532 void sig_chld (sig_watcher &w)
533 {
534 // we are being called for every SIGCHLD, find the corresponding term
535 int pid;
536
537 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
538 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
539 if (pid == (*t)->cmd_pid)
540 {
541 (*t)->child_exit ();
542 break;
543 }
544 }
545
546 /* 551 /*
547 * Catch a fatal signal and tidy up before quitting 552 * Catch a fatal signal and tidy up before quitting
548 */ 553 */
549 void 554 void
550 sig_term (sig_watcher &w) 555 sig_term (sig_watcher &w)
551 { 556 {
552#ifdef DEBUG_CMD
553 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
554#endif
555 rxvt_emergency_cleanup (); 557 rxvt_emergency_cleanup ();
556 signal (w.signum, SIG_DFL); 558 signal (w.signum, SIG_DFL);
557 kill (getpid (), w.signum); 559 kill (getpid (), w.signum);
558 } 560 }
559 561
560 sig_handlers () 562 sig_handlers ()
561 : sw_chld (this, &sig_handlers::sig_chld),
562 sw_term (this, &sig_handlers::sig_term), 563 : sw_term (this, &sig_handlers::sig_term),
563 sw_int (this, &sig_handlers::sig_term) 564 sw_int (this, &sig_handlers::sig_term)
564 { 565 {
565 } 566 }
566} sig_handlers; 567} sig_handlers;
567 568
568char **rxvt_environ; // startup environment 569char **rxvt_environ; // startup environment
569 570
570void 571void
571rxvt_init () 572rxvt_init ()
572{ 573{
573 uid_t uid = getuid (); 574 ptytty::init ();
574 gid_t gid = getgid ();
575
576 // before doing anything else, check for setuid/setgid operation,
577 // start the helper process and drop privileges
578 if (uid != geteuid ()
579 || 1 //D
580 || gid != getegid ())
581 {
582#if PTYTTY_HELPER
583 rxvt_ptytty_server ();
584#else
585 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
586#endif
587
588 // drop privileges
589#if HAVE_SETRESUID
590 setresgid (gid, gid, gid);
591 setresuid (uid, uid, uid);
592#elif HAVE_SETREUID
593 setregid (gid, gid);
594 setreuid (uid, uid);
595#elif HAVE_SETUID
596 setgid (gid);
597 setuid (uid);
598#endif
599
600 if (uid != geteuid ()
601 || gid != getegid ())
602 rxvt_fatal ("unable to drop privileges, aborting.\n");
603 }
604 575
605 rxvt_environ = environ; 576 rxvt_environ = environ;
606 577
607 signal (SIGHUP, SIG_IGN); 578 signal (SIGHUP, SIG_IGN);
608 signal (SIGPIPE, SIG_IGN); 579 signal (SIGPIPE, SIG_IGN);
609 580
610 sig_handlers.sw_chld.start (SIGCHLD);
611 sig_handlers.sw_term.start (SIGTERM); 581 sig_handlers.sw_term.start (SIGTERM);
612 sig_handlers.sw_int.start (SIGINT); 582 sig_handlers.sw_int.start (SIGINT);
613 583
614 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
615 /* signal (SIGURG, SIG_DFL); */ 585 /* signal (SIGURG, SIG_DFL); */
… …
644 rxvt_fatal ("memory allocation failure. aborting.\n"); 614 rxvt_fatal ("memory allocation failure. aborting.\n");
645 615
646 return p; 616 return p;
647} 617}
648 618
649void * 619void *
650rxvt_realloc (void *ptr, size_t size) 620rxvt_realloc (void *ptr, size_t size)
651{ 621{
652 void *p = realloc (ptr, size); 622 void *p = realloc (ptr, size);
653 623
654 if (!p) 624 if (!p)
… …
667{ 637{
668 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
669 int x, y, sb_w, flags; 639 int x, y, sb_w, flags;
670 unsigned int w, h; 640 unsigned int w, h;
671 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
672 dDisp;
673
674 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
675 ncol, nrow, szHint.width, szHint.height));
676 642
677 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
678 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
679 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
680 646
… …
742 708
743 if (scrollBar.state) 709 if (scrollBar.state)
744 { 710 {
745 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
746 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
747 if (!OPTION (Opt_scrollBar_right)) 714 if (!option (Opt_scrollBar_right))
748 window_vt_x += sb_w; 715 window_vt_x += sb_w;
749 } 716 }
750 717
751 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
752 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
753 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
754 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
755 722
756 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
757 { 724 {
758 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
773 { 740 {
774 min_it (height, max_height); 741 min_it (height, max_height);
775 szHint.height = szHint.base_height + height; 742 szHint.height = szHint.base_height + height;
776 } 743 }
777 744
778 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && option (Opt_scrollBar_right))
779 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
780 747
781 if (recalc_x) 748 if (recalc_x)
782 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750
783 if (recalc_y) 751 if (recalc_y)
784 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
785 753
786 ncol = width / fwidth; 754 ncol = width / fwidth;
787 nrow = height / fheight; 755 nrow = height / fheight;
788 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
789 ncol, nrow, szHint.width,
790 szHint.height));
791 return;
792} 756}
793 757
794/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
795/* 759/*
796 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
… …
848 delete fontset[0]; 812 delete fontset[0];
849 fontset[0] = fs; 813 fontset[0] = fs;
850 814
851 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
852 prop.height += lineSpace; 816 prop.height += lineSpace;
817
853 fs->set_prop (prop); 818 fs->set_prop (prop, false);
854 819
855 fwidth = prop.width; 820 fwidth = prop.width;
856 fheight = prop.height; 821 fheight = prop.height;
857 fbase = prop.ascent; 822 fbase = prop.ascent;
858 823
… …
867 { 832 {
868 fontset[style] = fs = new rxvt_fontset (this); 833 fontset[style] = fs = new rxvt_fontset (this);
869 rxvt_fontprop prop2 = prop; 834 rxvt_fontprop prop2 = prop;
870 835
871 if (res) 836 if (res)
872 prop2.weight = prop2.slant = rxvt_fontprop::unset; 837 {
838 fs->populate (res);
839 fs->set_prop (prop2, false);
840 }
873 else 841 else
874 { 842 {
875 res = fontset[0]->fontdesc; 843 fs->populate (fontset[0]->fontdesc);
876 844
877 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 845 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
878 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 846 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
847
848 fs->set_prop (prop2, true);
879 } 849 }
880 850
881 fs->populate (res);
882 fs->set_prop (prop2);
883 } 851 }
884#else 852#else
885 fontset[style] = fontset[0]; 853 fontset[style] = fontset[0];
886#endif 854#endif
887 } 855 }
… …
896 return true; 864 return true;
897} 865}
898 866
899void rxvt_term::set_string_property (Atom prop, const char *str, int len) 867void rxvt_term::set_string_property (Atom prop, const char *str, int len)
900{ 868{
901 XChangeProperty (display->display, parent[0], 869 XChangeProperty (dpy, parent[0],
902 prop, XA_STRING, 8, PropModeReplace, 870 prop, XA_STRING, 8, PropModeReplace,
903 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 871 (const unsigned char *)str, len >= 0 ? len : strlen (str));
904} 872}
905 873
906void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 874void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
907{ 875{
908 wchar_t *ws = rxvt_mbstowcs (str, len); 876 wchar_t *ws = rxvt_mbstowcs (str, len);
909 char *s = rxvt_wcstoutf8 (ws); 877 char *s = rxvt_wcstoutf8 (ws);
910 878
911 XChangeProperty (display->display, parent[0], 879 XChangeProperty (dpy, parent[0],
912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 880 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
913 (const unsigned char *)s, strlen (s)); 881 (const unsigned char *)s, strlen (s));
914 882
915 free (s); 883 free (s);
916 free (ws); 884 free (ws);
… …
941void 909void
942rxvt_term::set_window_color (int idx, const char *color) 910rxvt_term::set_window_color (int idx, const char *color)
943{ 911{
944 rxvt_color xcol; 912 rxvt_color xcol;
945 int i; 913 int i;
946 914
947 if (color == NULL || *color == '\0') 915 if (color == NULL || *color == '\0')
948 return; 916 return;
917
918 color = strdup (color);
919 allocated.push_back ((void *)color);
920 rs[Rs_color + idx] = color;
949 921
950 /* handle color aliases */ 922 /* handle color aliases */
951 if (isdigit (*color)) 923 if (isdigit (*color))
952 { 924 {
953 i = atoi (color); 925 i = atoi (color);
954 926
955 if (i >= 8 && i <= 15) 927 if (i >= 8 && i <= 15)
956 { /* bright colors */ 928 { /* bright colors */
957 i -= 8; 929 i -= 8;
958 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 930 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
959 SET_PIXCOLOR (idx);
960 goto done; 931 goto done;
961 } 932 }
962 933
963 if (i >= 0 && i <= 7) 934 if (i >= 0 && i <= 7)
964 { /* normal colors */ 935 { /* normal colors */
965 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 936 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
966 SET_PIXCOLOR (idx);
967 goto done; 937 goto done;
968 } 938 }
969 } 939 }
970 940
971 if (!rXParseAllocColor (&xcol, color)) 941 set_color (xcol, color);
972 return;
973
974 /* XStoreColor (display->display, display->cmap, XColor*); */
975 942
976 /* 943 /*
977 * FIXME: should free colors here, but no idea how to do it so instead, 944 * FIXME: should free colors here, but no idea how to do it so instead,
978 * so just keep gobbling up the colormap 945 * so just keep gobbling up the colormap
979 */ 946 */
980# if 0
981 for (i = Color_Black; i <= Color_White; i++)
982 if (pix_colors[idx] == pix_colors[i])
983 break;
984 if (i > Color_White)
985 {
986 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
987 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
988 DisplayPlanes (display->display, display->screen));
989 }
990# endif
991 947
992 pix_colors_focused[idx] = xcol; 948 pix_colors_focused[idx] = xcol;
993 SET_PIXCOLOR (idx);
994 949
995 /* XSetWindowAttributes attr; */ 950 /* XSetWindowAttributes attr; */
996 /* Cursor cursor; */ 951 /* Cursor cursor; */
997done: 952done:
998
999#if OFF_FOCUS_FADING
1000 if (rs[Rs_fade])
1001 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1002#endif
1003
1004 /*TODO: handle Color_BD, scrollbar background, etc. */ 953 /*TODO: handle Color_BD, scrollbar background, etc. */
1005 954
955 update_fade_color (idx);
1006 recolour_cursor (); 956 recolour_cursor ();
1007 scr_recolour (); 957 scr_recolour ();
1008} 958}
1009 959
1010#else 960#else
… …
1012#endif /* XTERM_COLOR_CHANGE */ 962#endif /* XTERM_COLOR_CHANGE */
1013 963
1014void 964void
1015rxvt_term::recolour_cursor () 965rxvt_term::recolour_cursor ()
1016{ 966{
1017 XColor xcol[2]; 967 XColor fg, bg;
1018 968
1019 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 969 (ISSET_PIXCOLOR (Color_pointer_fg)
1020 ? pix_colors_focused[Color_pointer_fg] 970 ? pix_colors_focused[Color_pointer_fg]
1021 : pix_colors_focused[Color_fg]; 971 : pix_colors_focused[Color_fg]).get (fg);
972
1022 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 973 (ISSET_PIXCOLOR (Color_pointer_bg)
1023 ? pix_colors_focused[Color_pointer_bg] 974 ? pix_colors_focused[Color_pointer_bg]
1024 : pix_colors_focused[Color_bg]; 975 : pix_colors_focused[Color_bg]).get (bg);
1025 976
1026 XQueryColors (display->display, display->cmap, xcol, 2); 977 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1027 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1028} 978}
1029 979
1030/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
1031/* 981/*
1032 * find if fg/bg matches any of the normal (low-intensity) colors 982 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1036{ 986{
1037 unsigned int i; 987 unsigned int i;
1038 const char *xpmb = "\0"; 988 const char *xpmb = "\0";
1039 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1040 990
1041 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1042 strcpy (fstr, "default"); 991 strcpy (fstr, "default");
1043 strcpy (bstr, "default"); 992 strcpy (bstr, "default");
1044 for (i = Color_Black; i <= Color_White; i++) 993 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_fg] == pix_colors[i]) 994 if (pix_colors[Color_fg] == pix_colors[i])
1046 { 995 {
… …
1061 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1062} 1011}
1063 1012
1064/*----------------------------------------------------------------------*/ 1013/*----------------------------------------------------------------------*/
1065 1014
1066int 1015bool
1067rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1016rxvt_term::set_color (rxvt_color &color, const char *name)
1068{ 1017{
1069 if (!screen_in_out->set (display, colour)) 1018 if (color.set (this, name))
1070 {
1071 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1072 return false;
1073 }
1074
1075 return true; 1019 return true;
1020
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1022 return false;
1023}
1024
1025void
1026rxvt_term::alias_color (int dst, int src)
1027{
1028 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1076} 1029}
1077 1030
1078/* -------------------------------------------------------------------- * 1031/* -------------------------------------------------------------------- *
1079 * - WINDOW RESIZING - * 1032 * - WINDOW RESIZING - *
1080 * -------------------------------------------------------------------- */ 1033 * -------------------------------------------------------------------- */
1081void 1034void
1082rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1035rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1083{ 1036{
1084 int fix_screen; 1037 int fix_screen;
1085 int old_width = szHint.width, old_height = szHint.height; 1038 int old_width = szHint.width;
1086 dDisp; 1039 int old_height = szHint.height;
1087 1040
1088 window_calc (newwidth, newheight); 1041 window_calc (newwidth, newheight);
1042
1043 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1089 XSetWMNormalHints (disp, parent[0], &szHint); 1044 XSetWMNormalHints (dpy, parent[0], &szHint);
1090 1045
1091 if (!ignoreparent) 1046 if (!ignoreparent)
1092 { 1047 {
1093#ifdef SMART_RESIZE 1048#ifdef SMART_RESIZE
1094 /* 1049 /*
… …
1098 int x, y, x1, y1; 1053 int x, y, x1, y1;
1099 int dx, dy; 1054 int dx, dy;
1100 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1055 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1101 Window unused_cr; 1056 Window unused_cr;
1102 1057
1103 XTranslateCoordinates (disp, parent[0], display->root, 1058 XTranslateCoordinates (dpy, parent[0], display->root,
1104 0, 0, &x, &y, &unused_cr); 1059 0, 0, &x, &y, &unused_cr);
1105 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1060 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1106 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1061 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1107 /* 1062 /*
1108 * if display->root isn't the parent window, a WM will probably have offset 1063 * if display->root isn't the parent window, a WM will probably have offset
1109 * our position for handles and decorations. Counter it 1064 * our position for handles and decorations. Counter it
1110 */ 1065 */
… …
1112 { 1067 {
1113 x -= x1; 1068 x -= x1;
1114 y -= y1; 1069 y -= y1;
1115 } 1070 }
1116 1071
1117 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1072 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1118 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1073 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1119 dx = old_width - szHint.width; 1074 dx = old_width - szHint.width;
1120 dy = old_height - szHint.height; 1075 dy = old_height - szHint.height;
1121 1076
1122 /* Check position of the center of the window */ 1077 /* Check position of the center of the window */
1123 if (x < x1) /* left half */ 1078 if (x < x1) /* left half */
1124 dx = 0; 1079 dx = 0;
… …
1127 if (y < y1) /* top half */ 1082 if (y < y1) /* top half */
1128 dy = 0; 1083 dy = 0;
1129 else if (y == y1) /* exact center */ 1084 else if (y == y1) /* exact center */
1130 dy /= 2; 1085 dy /= 2;
1131 1086
1132 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1087 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1133 szHint.width, szHint.height); 1088 szHint.width, szHint.height);
1134#else 1089#else
1135 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1090 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1136#endif 1091#endif
1137 } 1092 }
1138 1093
1139 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1094 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1140 1095
1141 if (fix_screen || newwidth != old_width || newheight != old_height) 1096 if (fix_screen || newwidth != old_width || newheight != old_height)
1142 { 1097 {
1143 if (scrollBar.state) 1098 if (scrollBar.state)
1144 { 1099 {
1145 XMoveResizeWindow (disp, scrollBar.win, 1100 XMoveResizeWindow (dpy, scrollBar.win,
1146 window_sb_x, 0, 1101 window_sb_x, 0,
1147 scrollbar_TotalWidth (), szHint.height); 1102 scrollbar_TotalWidth (), szHint.height);
1148 resize_scrollbar (); 1103 resize_scrollbar ();
1149 } 1104 }
1150 1105
1151 XMoveResizeWindow (disp, vt, 1106 XMoveResizeWindow (dpy, vt,
1152 window_vt_x, window_vt_y, 1107 window_vt_x, window_vt_y,
1153 width, height); 1108 width, height);
1154 1109
1155 scr_clear (); 1110 scr_clear ();
1156#ifdef XPM_BACKGROUND 1111#ifdef XPM_BACKGROUND
1157 resize_pixmap (); 1112 resize_pixmap ();
1158#endif 1113#endif
1159 } 1114 }
1160 1115
1161 if (fix_screen || old_height == 0) 1116 if (fix_screen || old_height == 0)
1162 {
1163 int curr_screen = -1;
1164 int old_ncol = prev_ncol;
1165
1166 /* scr_reset only works on the primary screen */
1167 if (old_height) /* this is not the first time through */
1168 {
1169 unsigned int ocol = ncol;
1170 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1171 curr_screen = scr_change_screen (PRIMARY);
1172 ncol = ocol;
1173 }
1174
1175 scr_reset (); 1117 scr_reset ();
1176 1118
1177 if (curr_screen >= 0) /* this is not the first time through */ 1119 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1178 { 1120 //scr_touch (false);
1179 scr_change_screen (curr_screen);
1180 selection_check (old_ncol != ncol ? 4 : 0);
1181 }
1182 }
1183
1184 old_width = szHint.width;
1185 old_height = szHint.height;
1186 1121
1187#ifdef XPM_BACKGROUND 1122#ifdef XPM_BACKGROUND
1188 if (pixmap) 1123 if (pixmap)
1189 scr_touch (false); 1124 scr_touch (false);
1190#endif 1125#endif
1191 1126
1192#ifdef USE_XIM 1127#ifdef USE_XIM
1193 IMSetStatusPosition (); 1128 IMSetPosition ();
1194#endif 1129#endif
1195} 1130}
1196 1131
1197/* 1132/*
1198 * Set the width/height of the vt window in characters. Units are pixels. 1133 * Set the width/height of the vt window in characters. Units are pixels.
… …
1203{ 1138{
1204 XWindowAttributes wattr; 1139 XWindowAttributes wattr;
1205 1140
1206 if (newwidth == 0 || newheight == 0) 1141 if (newwidth == 0 || newheight == 0)
1207 { 1142 {
1208 XGetWindowAttributes (display->display, display->root, &wattr); 1143 XGetWindowAttributes (dpy, display->root, &wattr);
1209 1144
1210 if (newwidth == 0) 1145 if (newwidth == 0)
1211 newwidth = wattr.width - szHint.base_width; 1146 newwidth = wattr.width - szHint.base_width;
1212 if (newheight == 0) 1147 if (newheight == 0)
1213 newheight = wattr.height - szHint.base_height; 1148 newheight = wattr.height - szHint.base_height;
… …
1227#ifdef USE_XIM 1162#ifdef USE_XIM
1228 1163
1229void 1164void
1230rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1165rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1231{ 1166{
1232 fg = pix_colors[Color_fg]; 1167 fg = pix_colors [Color_fg];
1233 bg = pix_colors[Color_bg]; 1168 bg = pix_colors [Color_bg];
1234} 1169}
1235 1170
1236void 1171void
1237rxvt_term::im_set_size (XRectangle &size) 1172rxvt_term::im_set_size (XRectangle &size)
1238{ 1173{
… …
1275 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1210 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1276 1211
1277 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1212 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1278 *p = '\0'; 1213 *p = '\0';
1279 1214
1280 atom = XInternAtom (display->display, server, False); 1215 atom = XInternAtom (dpy, server, False);
1281 win = XGetSelectionOwner (display->display, atom); 1216 win = XGetSelectionOwner (dpy, atom);
1282 1217
1283 if (win != None) 1218 if (win != None)
1284 return True; 1219 return True;
1285 } 1220 }
1286 1221
… …
1293 XPoint nspot; 1228 XPoint nspot;
1294 XVaNestedList preedit_attr; 1229 XVaNestedList preedit_attr;
1295 1230
1296 if (!Input_Context 1231 if (!Input_Context
1297 || !focus 1232 || !focus
1298 || !(input_style & XIMPreeditPosition)) 1233 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1299 return; 1234 return;
1300 1235
1301 im_set_position (nspot); 1236 im_set_position (nspot);
1302 1237
1303 if (nspot.x == spot.x && nspot.y == spot.y) 1238 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1322 input_method = 0; 1257 input_method = 0;
1323 } 1258 }
1324 1259
1325 Input_Context = 0; 1260 Input_Context = 0;
1326} 1261}
1262
1263#ifdef ENABLE_XIM_ONTHESPOT
1264
1265static void
1266xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1267{
1268 ((rxvt_term *)client_data)->make_current ();
1269 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1270}
1271
1272static void
1273xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1274{
1275 ((rxvt_term *)client_data)->make_current ();
1276 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1277}
1278
1279static void
1280xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1281{
1282 rxvt_term *term = (rxvt_term *)client_data;
1283 XIMText *text = call_data->text;
1284
1285 term->make_current ();
1286
1287 if (text)
1288 {
1289 void *str;
1290
1291 if (!text->encoding_is_wchar && text->string.multi_byte)
1292 {
1293 // of course, X makes it ugly again
1294 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->rs[Rs_imLocale]);
1296
1297 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1298 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1299
1300 if (term->rs[Rs_imLocale])
1301 SET_LOCALE (term->locale);
1302 }
1303 else
1304 str = (void *)text->string.wide_char;
1305
1306 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1307 DT_INT, call_data->caret,
1308 DT_INT, call_data->chg_first,
1309 DT_INT, call_data->chg_length,
1310 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1311 DT_WCS_LEN, str, str ? (int)text->length : 0,
1312 DT_END));
1313 }
1314 else
1315 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1316 DT_INT, call_data->caret,
1317 DT_INT, call_data->chg_first,
1318 DT_INT, call_data->chg_length,
1319 DT_END));
1320}
1321
1322#if 0
1323static void
1324xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1325{
1326 ((rxvt_term *)client_data)->make_current ();
1327 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1328 DT_INT, call_data->position,
1329 DT_INT, call_data->direction,
1330 DT_INT, call_data->style,
1331 DT_END));
1332}
1333#endif
1334
1335#endif
1327 1336
1328/* 1337/*
1329 * Try to open a XIM with the current modifiers, then see if we can 1338 * Try to open a XIM with the current modifiers, then see if we can
1330 * open a suitable preedit type 1339 * open a suitable preedit type
1331 */ 1340 */
… …
1338 XRectangle rect, status_rect, needed_rect; 1347 XRectangle rect, status_rect, needed_rect;
1339 unsigned long fg, bg; 1348 unsigned long fg, bg;
1340 const char *p; 1349 const char *p;
1341 char **s; 1350 char **s;
1342 XIMStyles *xim_styles; 1351 XIMStyles *xim_styles;
1352#ifdef ENABLE_XIM_ONTHESPOT
1353 XIMCallback xcb[4];
1354#endif
1343 1355
1344 set_environ (envv); 1356 set_environ (envv);
1345 1357
1346 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1358 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1347 return false; 1359 return false;
1348 1360
1349 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1350 input_method = display->get_xim (locale, modifiers); 1361 input_method = display->get_xim (locale, modifiers);
1351 if (input_method == NULL) 1362 if (input_method == NULL)
1352 return false; 1363 return false;
1353 1364
1354 xim = input_method->xim; 1365 xim = input_method->xim;
… …
1374 s = rxvt_splitcommastring (p); 1385 s = rxvt_splitcommastring (p);
1375 1386
1376 for (i = found = 0; !found && s[i]; i++) 1387 for (i = found = 0; !found && s[i]; i++)
1377 { 1388 {
1378 if (!strcmp (s[i], "OverTheSpot")) 1389 if (!strcmp (s[i], "OverTheSpot"))
1379 input_style = (XIMPreeditPosition | XIMStatusNothing); 1390 input_style = XIMPreeditPosition | XIMStatusNothing;
1380 else if (!strcmp (s[i], "OffTheSpot")) 1391 else if (!strcmp (s[i], "OffTheSpot"))
1381 input_style = (XIMPreeditArea | XIMStatusArea); 1392 input_style = XIMPreeditArea | XIMStatusArea;
1382 else if (!strcmp (s[i], "Root")) 1393 else if (!strcmp (s[i], "Root"))
1383 input_style = (XIMPreeditNothing | XIMStatusNothing); 1394 input_style = XIMPreeditNothing | XIMStatusNothing;
1384 else if (!strcmp (s[i], "None")) 1395 else if (!strcmp (s[i], "None"))
1385 input_style = (XIMPreeditNone | XIMStatusNone); 1396 input_style = XIMPreeditNone | XIMStatusNone;
1397#ifdef ENABLE_XIM_ONTHESPOT
1398 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1399 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1400#endif
1401 else
1402 input_style = XIMPreeditNothing | XIMStatusNothing;
1386 1403
1387 for (j = 0; j < xim_styles->count_styles; j++) 1404 for (j = 0; j < xim_styles->count_styles; j++)
1388 if (input_style == xim_styles->supported_styles[j]) 1405 if (input_style == xim_styles->supported_styles[j])
1389 { 1406 {
1390 rxvt_freecommastring (s); 1407 rxvt_freecommastring (s);
… …
1428 "*", 1445 "*",
1429 fheight, 1446 fheight,
1430 fheight + 1, fheight - 1, 1447 fheight + 1, fheight - 1,
1431 fheight - 2, fheight + 2); 1448 fheight - 2, fheight + 2);
1432 1449
1433 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1450 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1434 &missing_charset_list, &missing_charset_count, &def_string); 1451 &missing_charset_list, &missing_charset_count, &def_string);
1435 1452
1436 if (missing_charset_list) 1453 if (missing_charset_list)
1437 XFreeStringList (missing_charset_list); 1454 XFreeStringList (missing_charset_list);
1438 1455
… …
1479 XNBackground, bg, 1496 XNBackground, bg,
1480 XNArea, &status_rect, 1497 XNArea, &status_rect,
1481 XNFontSet, fs, 1498 XNFontSet, fs,
1482 NULL); 1499 NULL);
1483 } 1500 }
1501#if ENABLE_XIM_ONTHESPOT
1502 else if (input_style & XIMPreeditCallbacks)
1503 {
1504 im_set_position (spot);
1505
1506 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1507 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1508 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1509# if 0
1510 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1511# endif
1512
1513 preedit_attr = XVaCreateNestedList (0,
1514 XNSpotLocation, &spot,
1515 XNPreeditStartCallback, &xcb[0],
1516 XNPreeditDoneCallback , &xcb[1],
1517 XNPreeditDrawCallback , &xcb[2],
1518# if 0
1519 XNPreeditCaretCallback, &xcb[3],
1520# endif
1521 NULL);
1522 }
1523#endif
1484 1524
1485 Input_Context = XCreateIC (xim, 1525 Input_Context = XCreateIC (xim,
1486 XNInputStyle, input_style, 1526 XNInputStyle, input_style,
1487 XNClientWindow, vt, 1527 XNClientWindow, vt,
1488 XNFocusWindow, parent[0], 1528 XNFocusWindow, parent[0],
… …
1490 preedit_attr, 1530 preedit_attr,
1491 status_attr ? XNStatusAttributes : NULL, 1531 status_attr ? XNStatusAttributes : NULL,
1492 status_attr, NULL); 1532 status_attr, NULL);
1493 1533
1494 if (preedit_attr) XFree (preedit_attr); 1534 if (preedit_attr) XFree (preedit_attr);
1495 if (status_attr) XFree (status_attr); 1535 if (status_attr) XFree (status_attr);
1496 if (fs) XFreeFontSet (display->display, fs); 1536 if (fs) XFreeFontSet (dpy, fs);
1497 1537
1498 if (Input_Context == NULL) 1538 if (Input_Context == NULL)
1499 { 1539 {
1500 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1540 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1501 im_destroy (); 1541 im_destroy ();
1502 return false; 1542 return false;
1503 } 1543 }
1504 1544
1505 if (input_style & XIMPreeditArea) 1545#if 0
1546 // unfortunately, only the focus window is used by XIM, hard to fix
1547 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1548 vt_select_input ();
1549#endif
1550
1506 IMSetStatusPosition (); 1551 IMSetPosition ();
1507 1552
1508 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1509 return true; 1553 return true;
1510} 1554}
1511 1555
1512void 1556void
1513rxvt_term::im_cb () 1557rxvt_term::im_cb ()
… …
1519 1563
1520 make_current (); 1564 make_current ();
1521 1565
1522 im_destroy (); 1566 im_destroy ();
1523 1567
1524 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1525 if (Input_Context) 1568 if (Input_Context)
1526 return; 1569 return;
1527 1570
1528#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1529 if (rs[Rs_imLocale]) 1572 if (rs[Rs_imLocale])
… …
1571 SET_LOCALE (locale); 1614 SET_LOCALE (locale);
1572#endif 1615#endif
1573} 1616}
1574 1617
1575void 1618void
1576rxvt_term::IMSetStatusPosition () 1619rxvt_term::IMSetPosition ()
1577{ 1620{
1578 XRectangle preedit_rect, status_rect, *needed_rect; 1621 XRectangle preedit_rect, status_rect, *needed_rect;
1579 XVaNestedList preedit_attr, status_attr; 1622 XVaNestedList preedit_attr, status_attr;
1580 1623
1581 if (!Input_Context 1624 if (!Input_Context
1582 || !focus 1625 || !focus
1583 || !(input_style & XIMPreeditArea) 1626 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1584 || !IMisRunning ()) 1627 || !IMisRunning ())
1585 return; 1628 return;
1586 1629
1630 if (input_style & XIMPreeditPosition)
1631 {
1632 im_set_size (preedit_rect);
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634
1635 XSetICValues (Input_Context,
1636 XNPreeditAttributes, preedit_attr, NULL);
1637 }
1638 else
1639 {
1587 /* Getting the necessary width of preedit area */ 1640 /* Getting the necessary width of preedit area */
1588 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1641 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1589 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1642 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1590 XFree (status_attr); 1643 XFree (status_attr);
1591 1644
1592 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1645 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1593 XFree (needed_rect); 1646 XFree (needed_rect);
1594 1647
1595 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1648 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1596 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1649 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1597 1650
1598 XSetICValues (Input_Context, 1651 XSetICValues (Input_Context,
1599 XNPreeditAttributes, preedit_attr, 1652 XNPreeditAttributes, preedit_attr,
1600 XNStatusAttributes, status_attr, NULL); 1653 XNStatusAttributes, status_attr,
1654 NULL);
1601 1655
1656 XFree (status_attr);
1657 }
1658
1602 XFree (preedit_attr); 1659 XFree (preedit_attr);
1603 XFree (status_attr);
1604} 1660}
1605#endif /* USE_XIM */ 1661#endif /* USE_XIM */
1606 1662
1607/*----------------------------------------------------------------------*/
1608rxvt_t rxvt_current_term;
1609
1610/*----------------------- end-of-file (C source) -----------------------*/ 1663/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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