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.190 by root, Thu Jan 19 20:30:36 2006 UTC vs.
Revision 1.245 by sasha, Fri Aug 17 22:02:14 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 ENABLE_TRANSPARENCY || ENABLE_PERL
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_cb),
147#endif 158#endif
148#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 161#endif
151#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
166#ifdef POINTER_BLANK 177#ifdef POINTER_BLANK
167 pointer_ev (this, &rxvt_term::pointer_cb), 178 pointer_ev (this, &rxvt_term::pointer_cb),
168#endif 179#endif
169#ifdef USE_XIM 180#ifdef USE_XIM
170 im_ev (this, &rxvt_term::im_cb), 181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb),
171#endif 185#endif
172 termwin_ev (this, &rxvt_term::x_cb), 186 termwin_ev (this, &rxvt_term::x_cb),
173 vt_ev (this, &rxvt_term::x_cb), 187 vt_ev (this, &rxvt_term::x_cb),
174 child_ev (this, &rxvt_term::child_cb), 188 child_ev (this, &rxvt_term::child_cb),
175 check_ev (this, &rxvt_term::check_cb), 189 check_ev (this, &rxvt_term::check_cb),
… …
182 196
183 termlist.push_back (this); 197 termlist.push_back (this);
184 198
185#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
186 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
187
188 if (!keyboard)
189 rxvt_fatal ("out of memory, aborting.\n");
190#endif 201#endif
191} 202}
192 203
193// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
194// for use before an emergency exit 205// for use before an emergency exit
195void rxvt_term::emergency_cleanup () 206void rxvt_term::emergency_cleanup ()
196{ 207{
197 if (cmd_pid) 208 if (cmd_pid)
198 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
199 210
211 pty_ev.stop ();
200 delete pty; pty = 0; 212 delete pty; pty = 0;
201} 213}
202 214
203rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
204{ 216{
205 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
206
207 termlist.erase (find (termlist.begin (), termlist.end(), this)); 217 termlist.erase (find (termlist.begin (), termlist.end(), this));
208 218
209 emergency_cleanup (); 219 emergency_cleanup ();
210 220
211#if ENABLE_STYLES 221#if ENABLE_STYLES
… …
215#endif 225#endif
216 delete fontset[0]; 226 delete fontset[0];
217 227
218 if (display) 228 if (display)
219 { 229 {
220 dDisp;
221
222 selection_clear (); 230 selection_clear ();
223 231
224#ifdef USE_XIM 232#ifdef USE_XIM
225 im_destroy (); 233 im_destroy ();
226#endif 234#endif
227#ifdef XTERM_SCROLLBAR 235#ifdef XTERM_SCROLLBAR
228 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
229 if (ShadowGC) XFreeGC (disp, ShadowGC); 237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
230#endif 238#endif
231#ifdef PLAIN_SCROLLBAR 239#ifdef PLAIN_SCROLLBAR
232 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
233#endif 241#endif
234#ifdef NEXT_SCROLLBAR 242#ifdef NEXT_SCROLLBAR
235 if (blackGC) XFreeGC (disp, blackGC); 243 if (blackGC) XFreeGC (dpy, blackGC);
236 if (whiteGC) XFreeGC (disp, whiteGC); 244 if (whiteGC) XFreeGC (dpy, whiteGC);
237 if (grayGC) XFreeGC (disp, grayGC); 245 if (grayGC) XFreeGC (dpy, grayGC);
238 if (darkGC) XFreeGC (disp, darkGC); 246 if (darkGC) XFreeGC (dpy, darkGC);
239 if (stippleGC) XFreeGC (disp, stippleGC); 247 if (stippleGC) XFreeGC (dpy, stippleGC);
240 if (dimple) XFreePixmap (disp, dimple); 248 if (dimple) XFreePixmap (dpy, dimple);
241 if (upArrow) XFreePixmap (disp, upArrow); 249 if (upArrow) XFreePixmap (dpy, upArrow);
242 if (downArrow) XFreePixmap (disp, downArrow); 250 if (downArrow) XFreePixmap (dpy, downArrow);
243 if (upArrowHi) XFreePixmap (disp, upArrowHi); 251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
244 if (downArrowHi) XFreePixmap (disp, downArrowHi); 252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
245#endif 253#endif
246#ifdef RXVT_SCROLLBAR 254#ifdef RXVT_SCROLLBAR
247 if (topShadowGC) XFreeGC (disp, topShadowGC); 255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
248 if (botShadowGC) XFreeGC (disp, botShadowGC); 256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
249 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
250#endif 258#endif
251 if (gc) XFreeGC (disp, gc); 259 if (gc) XFreeGC (dpy, gc);
252 260
253 delete drawable; 261 delete drawable;
254 // destroy all windows 262 // destroy all windows
255 if (parent[0]) 263 if (parent[0])
256 XDestroyWindow (disp, parent[0]); 264 XDestroyWindow (dpy, parent[0]);
257 }
258 265
259 // TODO: free pixcolours, colours should become part of rxvt_display 266 for (int i = 0; i < TOTAL_COLORS; i++)
260 delete pix_colors_focused; 267 if (ISSET_PIXCOLOR (i))
268 {
269 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
271 pix_colors_unfocused [i].free (this);
272#endif
273 }
274
275 clear ();
276 }
277
278 delete [] pix_colors_focused;
279#if OFF_FOCUS_FADING
262 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
263#endif 281#endif
264 282
265 displays.put (display); 283 displays.put (display);
266 284
267 scr_release (); 285 scr_release ();
… …
270 for (int i = 0; i < allocated.size (); i++) 288 for (int i = 0; i < allocated.size (); i++)
271 free (allocated [i]); 289 free (allocated [i]);
272 290
273 free (selection.text); 291 free (selection.text);
274 // TODO: manage env vars in child only(!) 292 // TODO: manage env vars in child only(!)
275 free (env_windowid);
276 free (env_display); 293 free (env_display);
277 free (env_term); 294 free (env_term);
278 free (env_colorfgbg);
279 free (locale); 295 free (locale);
280 free (v_buffer); 296 free (v_buffer);
281 free (incr_buf); 297 free (incr_buf);
282 298
283 delete envv; 299 delete envv;
… …
294{ 310{
295 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
296 312
297 cmd_pid = 0; 313 cmd_pid = 0;
298 314
299 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
300 destroy (); 316 destroy ();
301} 317}
302 318
303void 319void
304rxvt_term::destroy () 320rxvt_term::destroy ()
305{ 321{
306 if (destroy_ev.active) 322 if (destroy_ev.active)
307 return; 323 return;
308 324
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326
309#if ENABLE_OVERLAY 327#if ENABLE_OVERLAY
310 scr_overlay_off (); 328 scr_overlay_off ();
311#endif 329#endif
312 330
313 if (display) 331 if (display)
… …
316 im_ev.stop (display); 334 im_ev.stop (display);
317#endif 335#endif
318#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
319 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
320#endif 338#endif
321#if TRANSPARENT 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
322 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
323#endif 341#endif
324 incr_ev.stop (); 342 incr_ev.stop ();
325 termwin_ev.stop (display); 343 termwin_ev.stop (display);
326 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
367{ 385{
368 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
369 (*t)->emergency_cleanup (); 387 (*t)->emergency_cleanup ();
370} 388}
371 389
372#if ENABLE_FRILLS 390#if !ENABLE_MINIMAL
373static void 391static void
374print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
375{ 393{
376 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
377 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
… …
425 GET_R->allowedxerror = event->error_code; 443 GET_R->allowedxerror = event->error_code;
426 else 444 else
427 { 445 {
428 // GET_R is most likely not the terminal which caused the error, 446 // GET_R is most likely not the terminal which caused the error,
429 // so just output the error and continue 447 // so just output the error and continue
430#if ENABLE_FRILLS 448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
431 print_x_error (display, event); 451 print_x_error (display, event);
432#else
433 old_xerror_handler (display, event);
434#endif 452#endif
435 } 453 }
436 454
437 return 0; 455 return 0;
438} 456}
… …
446 _exit (EXIT_FAILURE); 464 _exit (EXIT_FAILURE);
447} 465}
448 466
449/*----------------------------------------------------------------------*/ 467/*----------------------------------------------------------------------*/
450bool 468bool
451rxvt_term::init (int argc, const char *const *argv) 469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
452{ 470{
471 this->envv = envv;
472
453 SET_R (this); 473 SET_R (this);
454 set_locale (""); 474 set_locale ("");
455 set_environ (envv); // few things in X do not call setlocale :( 475 set_environ (envv); // few things in X do not call setlocale :(
456 476
457 if (!init_vars ()) 477 if (!init_vars ())
… …
463 483
464#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
465 keyboard->register_done (); 485 keyboard->register_done ();
466#endif 486#endif
467 487
488#ifdef HAVE_SCROLLBARS
489 if (option (Opt_scrollBar))
490 scrollBar.setIdle (); /* set existence for size calculations */
491#endif
492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
513#ifdef ENABLE_TRANSPARENCY
514 if (option (Opt_transparent))
515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
527 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root);
529 }
530#endif
531
532#ifdef XPM_BACKGROUND
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 bgPixmap.set_file (rs[Rs_backgroundPixmap]);
546 }
547 /* do not want to render Pixmap yet if we are size/position dependant -
548 * wait for ConfigureNotify at least
549 * TODO: this does not work for some reason when transparency is disabled !!!!
550 */
551 if (!bgPixmap.window_size_sensitive ())
552 update_background ();
553#endif
554 }
555#endif
556
468#if ENABLE_PERL 557#if ENABLE_PERL
469 if (!rs[Rs_perl_ext_1])
470 rs[Rs_perl_ext_1] = "default";
471
472 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
473 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
474 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
475 {
476 rxvt_perl.init (this);
477 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
478 }
479#endif
480
481#ifdef HAVE_SCROLLBARS
482 if (OPTION (Opt_scrollBar))
483 scrollBar.setIdle (); /* set existence for size calculations */
484#endif
485
486 pty = rxvt_new_ptytty ();
487
488 create_windows (argc, argv);
489
490 dDisp;
491
492 init_xlocale ();
493
494 scr_reset (); // initialize screen
495
496#if 0
497 XSynchronize (disp, True);
498#endif
499
500#ifdef HAVE_SCROLLBARS
501 if (OPTION (Opt_scrollBar))
502 resize_scrollbar (); /* create and map scrollbar */
503#endif
504#ifdef TRANSPARENT
505 if (OPTION (Opt_transparent))
506 {
507 XSelectInput (disp, display->root, PropertyChangeMask);
508 check_our_parents ();
509 rootwin_ev.start (display, display->root); 558 rootwin_ev.start (display, display->root);
510 }
511#endif 559#endif
512
513 XMapWindow (disp, vt);
514 XMapWindow (disp, parent[0]);
515 560
516 set_colorfgbg (); 561 set_colorfgbg ();
517 562
518 init_command (cmd_argv); 563 init_command (cmd_argv);
519 564
… …
523 pty_ev.start (pty->pty, EVENT_READ); 568 pty_ev.start (pty->pty, EVENT_READ);
524 569
525 check_ev.start (); 570 check_ev.start ();
526 571
527 HOOK_INVOKE ((this, HOOK_START, DT_END)); 572 HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
584 XMapWindow (dpy, vt);
585 XMapWindow (dpy, parent[0]);
528 586
529 return true; 587 return true;
530} 588}
531 589
532static struct sig_handlers 590static struct sig_handlers
… …
537 * Catch a fatal signal and tidy up before quitting 595 * Catch a fatal signal and tidy up before quitting
538 */ 596 */
539 void 597 void
540 sig_term (sig_watcher &w) 598 sig_term (sig_watcher &w)
541 { 599 {
542#ifdef DEBUG_CMD
543 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
544#endif
545 rxvt_emergency_cleanup (); 600 rxvt_emergency_cleanup ();
546 signal (w.signum, SIG_DFL); 601 signal (w.signum, SIG_DFL);
547 kill (getpid (), w.signum); 602 kill (getpid (), w.signum);
548 } 603 }
549 604
… …
557char **rxvt_environ; // startup environment 612char **rxvt_environ; // startup environment
558 613
559void 614void
560rxvt_init () 615rxvt_init ()
561{ 616{
562 uid_t uid = getuid (); 617 ptytty::init ();
563 gid_t gid = getgid ();
564
565 // before doing anything else, check for setuid/setgid operation,
566 // start the helper process and drop privileges
567 if (uid != geteuid ()
568 || gid != getegid ())
569 {
570#if PTYTTY_HELPER
571 rxvt_ptytty_server ();
572#else
573 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
574#endif
575
576 // drop privileges
577#if HAVE_SETRESUID
578 setresgid (gid, gid, gid);
579 setresuid (uid, uid, uid);
580#elif HAVE_SETREUID
581 setregid (gid, gid);
582 setreuid (uid, uid);
583#elif HAVE_SETUID
584 setgid (gid);
585 setuid (uid);
586#endif
587
588 if (uid != geteuid ()
589 || gid != getegid ())
590 rxvt_fatal ("unable to drop privileges, aborting.\n");
591 }
592 618
593 rxvt_environ = environ; 619 rxvt_environ = environ;
594 620
595 signal (SIGHUP, SIG_IGN); 621 signal (SIGHUP, SIG_IGN);
596 signal (SIGPIPE, SIG_IGN); 622 signal (SIGPIPE, SIG_IGN);
… …
631 rxvt_fatal ("memory allocation failure. aborting.\n"); 657 rxvt_fatal ("memory allocation failure. aborting.\n");
632 658
633 return p; 659 return p;
634} 660}
635 661
636void * 662void *
637rxvt_realloc (void *ptr, size_t size) 663rxvt_realloc (void *ptr, size_t size)
638{ 664{
639 void *p = realloc (ptr, size); 665 void *p = realloc (ptr, size);
640 666
641 if (!p) 667 if (!p)
… …
644 return p; 670 return p;
645} 671}
646 672
647/*----------------------------------------------------------------------*/ 673/*----------------------------------------------------------------------*/
648/* 674/*
649 * window size/position calculcations for XSizeHint and other storage. 675 * window size/position calculations for XSizeHint and other storage.
650 * if width/height are non-zero then override calculated width/height 676 * if width/height are non-zero then override calculated width/height
651 */ 677 */
652void 678void
653rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 679rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
654{ 680{
655 short recalc_x, recalc_y; 681 short recalc_x, recalc_y;
656 int x, y, sb_w, flags; 682 int x, y, sb_w, flags;
657 unsigned int w, h; 683 unsigned int w, h;
658 unsigned int max_width, max_height; 684 unsigned int max_width, max_height;
659 dDisp;
660
661 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
662 ncol, nrow, szHint.width, szHint.height));
663 685
664 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 686 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
665 szHint.win_gravity = NorthWestGravity; 687 szHint.win_gravity = NorthWestGravity;
666 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 688 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
667 689
… …
729 751
730 if (scrollBar.state) 752 if (scrollBar.state)
731 { 753 {
732 sb_w = scrollbar_TotalWidth (); 754 sb_w = scrollbar_TotalWidth ();
733 szHint.base_width += sb_w; 755 szHint.base_width += sb_w;
756
734 if (!OPTION (Opt_scrollBar_right)) 757 if (!option (Opt_scrollBar_right))
735 window_vt_x += sb_w; 758 window_vt_x += sb_w;
736 } 759 }
737 760
738 szHint.width_inc = fwidth; 761 szHint.width_inc = fwidth;
739 szHint.height_inc = fheight; 762 szHint.height_inc = fheight;
740 szHint.min_width = szHint.base_width + szHint.width_inc; 763 szHint.min_width = szHint.base_width + szHint.width_inc;
741 szHint.min_height = szHint.base_height + szHint.height_inc; 764 szHint.min_height = szHint.base_height + szHint.height_inc;
742 765
743 if (newwidth && newwidth - szHint.base_width < max_width) 766 if (newwidth && newwidth - szHint.base_width < max_width)
744 { 767 {
745 szHint.width = newwidth; 768 szHint.width = newwidth;
… …
760 { 783 {
761 min_it (height, max_height); 784 min_it (height, max_height);
762 szHint.height = szHint.base_height + height; 785 szHint.height = szHint.base_height + height;
763 } 786 }
764 787
765 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 788 if (scrollBar.state && option (Opt_scrollBar_right))
766 window_sb_x = szHint.width - sb_w; 789 window_sb_x = szHint.width - sb_w;
767 790
768 if (recalc_x) 791 if (recalc_x)
769 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 792 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
793
770 if (recalc_y) 794 if (recalc_y)
771 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 795 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
772 796
773 ncol = width / fwidth; 797 ncol = width / fwidth;
774 nrow = height / fheight; 798 nrow = height / fheight;
775 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
776 ncol, nrow, szHint.width,
777 szHint.height));
778 return;
779} 799}
780 800
781/*----------------------------------------------------------------------*/ 801/*----------------------------------------------------------------------*/
782/* 802/*
783 * Tell the teletype handler what size the window is. 803 * Tell the teletype handler what size the window is.
… …
835 delete fontset[0]; 855 delete fontset[0];
836 fontset[0] = fs; 856 fontset[0] = fs;
837 857
838 prop = (*fs)[1]->properties (); 858 prop = (*fs)[1]->properties ();
839 prop.height += lineSpace; 859 prop.height += lineSpace;
860
840 fs->set_prop (prop); 861 fs->set_prop (prop, false);
841 862
842 fwidth = prop.width; 863 fwidth = prop.width;
843 fheight = prop.height; 864 fheight = prop.height;
844 fbase = prop.ascent; 865 fbase = prop.ascent;
845 866
… …
854 { 875 {
855 fontset[style] = fs = new rxvt_fontset (this); 876 fontset[style] = fs = new rxvt_fontset (this);
856 rxvt_fontprop prop2 = prop; 877 rxvt_fontprop prop2 = prop;
857 878
858 if (res) 879 if (res)
859 prop2.weight = prop2.slant = rxvt_fontprop::unset; 880 {
881 fs->populate (res);
882 fs->set_prop (prop2, false);
883 }
860 else 884 else
861 { 885 {
862 res = fontset[0]->fontdesc; 886 fs->populate (fontset[0]->fontdesc);
863 887
864 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 888 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
865 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 889 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
890
891 fs->set_prop (prop2, true);
866 } 892 }
867 893
868 fs->populate (res);
869 fs->set_prop (prop2);
870 } 894 }
871#else 895#else
872 fontset[style] = fontset[0]; 896 fontset[style] = fontset[0];
873#endif 897#endif
874 } 898 }
… …
883 return true; 907 return true;
884} 908}
885 909
886void rxvt_term::set_string_property (Atom prop, const char *str, int len) 910void rxvt_term::set_string_property (Atom prop, const char *str, int len)
887{ 911{
888 XChangeProperty (display->display, parent[0], 912 XChangeProperty (dpy, parent[0],
889 prop, XA_STRING, 8, PropModeReplace, 913 prop, XA_STRING, 8, PropModeReplace,
890 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 914 (const unsigned char *)str, len >= 0 ? len : strlen (str));
891} 915}
892 916
893void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 917void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
894{ 918{
895 wchar_t *ws = rxvt_mbstowcs (str, len); 919 wchar_t *ws = rxvt_mbstowcs (str, len);
896 char *s = rxvt_wcstoutf8 (ws); 920 char *s = rxvt_wcstoutf8 (ws);
897 921
898 XChangeProperty (display->display, parent[0], 922 XChangeProperty (dpy, parent[0],
899 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 923 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
900 (const unsigned char *)s, strlen (s)); 924 (const unsigned char *)s, strlen (s));
901 925
902 free (s); 926 free (s);
903 free (ws); 927 free (ws);
… …
928void 952void
929rxvt_term::set_window_color (int idx, const char *color) 953rxvt_term::set_window_color (int idx, const char *color)
930{ 954{
931 rxvt_color xcol; 955 rxvt_color xcol;
932 int i; 956 int i;
933 957
934 if (color == NULL || *color == '\0') 958 if (color == NULL || *color == '\0')
935 return; 959 return;
960
961 color = strdup (color);
962 allocated.push_back ((void *)color);
963 rs[Rs_color + idx] = color;
936 964
937 /* handle color aliases */ 965 /* handle color aliases */
938 if (isdigit (*color)) 966 if (isdigit (*color))
939 { 967 {
940 i = atoi (color); 968 i = atoi (color);
941 969
942 if (i >= 8 && i <= 15) 970 if (i >= 8 && i <= 15)
943 { /* bright colors */ 971 { /* bright colors */
944 i -= 8; 972 i -= 8;
945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 973 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
946 SET_PIXCOLOR (idx);
947 goto done; 974 goto done;
948 } 975 }
949 976
950 if (i >= 0 && i <= 7) 977 if (i >= 0 && i <= 7)
951 { /* normal colors */ 978 { /* normal colors */
952 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 979 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
953 SET_PIXCOLOR (idx);
954 goto done; 980 goto done;
955 } 981 }
956 } 982 }
957 983
958 if (!rXParseAllocColor (&xcol, color)) 984 set_color (xcol, color);
959 return;
960
961 /* XStoreColor (display->display, display->cmap, XColor*); */
962 985
963 /* 986 /*
964 * FIXME: should free colors here, but no idea how to do it so instead, 987 * FIXME: should free colors here, but no idea how to do it so instead,
965 * so just keep gobbling up the colormap 988 * so just keep gobbling up the colormap
966 */ 989 */
967# if 0
968 for (i = Color_Black; i <= Color_White; i++)
969 if (pix_colors[idx] == pix_colors[i])
970 break;
971 if (i > Color_White)
972 {
973 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
974 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
975 DisplayPlanes (display->display, display->screen));
976 }
977# endif
978 990
979 pix_colors_focused[idx] = xcol; 991 pix_colors_focused[idx] = xcol;
980 SET_PIXCOLOR (idx);
981 992
982 /* XSetWindowAttributes attr; */ 993 /* XSetWindowAttributes attr; */
983 /* Cursor cursor; */ 994 /* Cursor cursor; */
984done: 995done:
985
986#if OFF_FOCUS_FADING
987 if (rs[Rs_fade])
988 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
989#endif
990
991 /*TODO: handle Color_BD, scrollbar background, etc. */ 996 /*TODO: handle Color_BD, scrollbar background, etc. */
992 997
998 update_fade_color (idx);
993 recolour_cursor (); 999 recolour_cursor ();
994 scr_recolour (); 1000 scr_recolour ();
995} 1001}
996 1002
997#else 1003#else
… …
999#endif /* XTERM_COLOR_CHANGE */ 1005#endif /* XTERM_COLOR_CHANGE */
1000 1006
1001void 1007void
1002rxvt_term::recolour_cursor () 1008rxvt_term::recolour_cursor ()
1003{ 1009{
1004 XColor xcol[2]; 1010 XColor fg, bg;
1005 1011
1006 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1012 (ISSET_PIXCOLOR (Color_pointer_fg)
1007 ? pix_colors_focused[Color_pointer_fg] 1013 ? pix_colors_focused[Color_pointer_fg]
1008 : pix_colors_focused[Color_fg]; 1014 : pix_colors_focused[Color_fg]).get (fg);
1015
1009 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1016 (ISSET_PIXCOLOR (Color_pointer_bg)
1010 ? pix_colors_focused[Color_pointer_bg] 1017 ? pix_colors_focused[Color_pointer_bg]
1011 : pix_colors_focused[Color_bg]; 1018 : pix_colors_focused[Color_bg]).get (bg);
1012 1019
1013 XQueryColors (display->display, display->cmap, xcol, 2); 1020 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1014 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1015} 1021}
1016 1022
1017/*----------------------------------------------------------------------*/ 1023/*----------------------------------------------------------------------*/
1018/* 1024/*
1019 * find if fg/bg matches any of the normal (low-intensity) colors 1025 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1023{ 1029{
1024 unsigned int i; 1030 unsigned int i;
1025 const char *xpmb = "\0"; 1031 const char *xpmb = "\0";
1026 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1032 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1027 1033
1028 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1029 strcpy (fstr, "default"); 1034 strcpy (fstr, "default");
1030 strcpy (bstr, "default"); 1035 strcpy (bstr, "default");
1031 for (i = Color_Black; i <= Color_White; i++) 1036 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[Color_fg] == pix_colors[i]) 1037 if (pix_colors[Color_fg] == pix_colors[i])
1033 { 1038 {
… …
1048 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1053 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1049} 1054}
1050 1055
1051/*----------------------------------------------------------------------*/ 1056/*----------------------------------------------------------------------*/
1052 1057
1053int 1058bool
1054rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1059rxvt_term::set_color (rxvt_color &color, const char *name)
1055{ 1060{
1056 if (!screen_in_out->set (display, colour)) 1061 if (color.set (this, name))
1057 {
1058 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1059 return false;
1060 }
1061
1062 return true; 1062 return true;
1063
1064 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1065 return false;
1066}
1067
1068void
1069rxvt_term::alias_color (int dst, int src)
1070{
1071 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1063} 1072}
1064 1073
1065/* -------------------------------------------------------------------- * 1074/* -------------------------------------------------------------------- *
1066 * - WINDOW RESIZING - * 1075 * - WINDOW RESIZING - *
1067 * -------------------------------------------------------------------- */ 1076 * -------------------------------------------------------------------- */
1068void 1077void
1069rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1078rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1070{ 1079{
1071 int fix_screen; 1080 int fix_screen;
1072 int old_width = szHint.width, old_height = szHint.height; 1081 int old_width = szHint.width;
1073 dDisp; 1082 int old_height = szHint.height;
1074 1083
1075 window_calc (newwidth, newheight); 1084 window_calc (newwidth, newheight);
1085
1086 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1076 XSetWMNormalHints (disp, parent[0], &szHint); 1087 XSetWMNormalHints (dpy, parent[0], &szHint);
1077 1088
1078 if (!ignoreparent) 1089 if (!ignoreparent)
1079 { 1090 {
1080#ifdef SMART_RESIZE 1091#ifdef SMART_RESIZE
1081 /* 1092 /*
… …
1085 int x, y, x1, y1; 1096 int x, y, x1, y1;
1086 int dx, dy; 1097 int dx, dy;
1087 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1098 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1088 Window unused_cr; 1099 Window unused_cr;
1089 1100
1090 XTranslateCoordinates (disp, parent[0], display->root, 1101 XTranslateCoordinates (dpy, parent[0], display->root,
1091 0, 0, &x, &y, &unused_cr); 1102 0, 0, &x, &y, &unused_cr);
1092 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1103 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1093 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1104 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1094 /* 1105 /*
1095 * if display->root isn't the parent window, a WM will probably have offset 1106 * if display->root isn't the parent window, a WM will probably have offset
1096 * our position for handles and decorations. Counter it 1107 * our position for handles and decorations. Counter it
1097 */ 1108 */
… …
1099 { 1110 {
1100 x -= x1; 1111 x -= x1;
1101 y -= y1; 1112 y -= y1;
1102 } 1113 }
1103 1114
1104 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1115 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1105 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1116 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1106 dx = old_width - szHint.width; 1117 dx = old_width - szHint.width;
1107 dy = old_height - szHint.height; 1118 dy = old_height - szHint.height;
1108 1119
1109 /* Check position of the center of the window */ 1120 /* Check position of the center of the window */
1110 if (x < x1) /* left half */ 1121 if (x < x1) /* left half */
1111 dx = 0; 1122 dx = 0;
… …
1114 if (y < y1) /* top half */ 1125 if (y < y1) /* top half */
1115 dy = 0; 1126 dy = 0;
1116 else if (y == y1) /* exact center */ 1127 else if (y == y1) /* exact center */
1117 dy /= 2; 1128 dy /= 2;
1118 1129
1119 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1130 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1120 szHint.width, szHint.height); 1131 szHint.width, szHint.height);
1121#else 1132#else
1122 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1133 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1123#endif 1134#endif
1124 } 1135 }
1125 1136
1126 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1137 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1127 1138
1128 if (fix_screen || newwidth != old_width || newheight != old_height) 1139 if (fix_screen || newwidth != old_width || newheight != old_height)
1129 { 1140 {
1130 if (scrollBar.state) 1141 if (scrollBar.state)
1131 { 1142 {
1132 XMoveResizeWindow (disp, scrollBar.win, 1143 XMoveResizeWindow (dpy, scrollBar.win,
1133 window_sb_x, 0, 1144 window_sb_x, 0,
1134 scrollbar_TotalWidth (), szHint.height); 1145 scrollbar_TotalWidth (), szHint.height);
1135 resize_scrollbar (); 1146 resize_scrollbar ();
1136 } 1147 }
1137 1148
1138 XMoveResizeWindow (disp, vt, 1149 XMoveResizeWindow (dpy, vt,
1139 window_vt_x, window_vt_y, 1150 window_vt_x, window_vt_y,
1140 width, height); 1151 width, height);
1141 1152
1153#ifdef XPM_BACKGROUND
1154 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155 if (bgPixmap.window_size_sensitive ())
1156 update_background ();
1157#endif
1158
1142 scr_clear (); 1159 scr_clear ();
1143#ifdef XPM_BACKGROUND
1144 resize_pixmap ();
1145#endif
1146 } 1160 }
1147 1161
1148 if (fix_screen || old_height == 0) 1162 if (fix_screen || old_height == 0)
1149 {
1150 int curr_screen = -1;
1151 int old_ncol = prev_ncol;
1152
1153 /* scr_reset only works on the primary screen */
1154 if (old_height) /* this is not the first time through */
1155 {
1156 unsigned int ocol = ncol;
1157 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1158 curr_screen = scr_change_screen (PRIMARY);
1159 ncol = ocol;
1160 }
1161
1162 scr_reset (); 1163 scr_reset ();
1163 1164
1164 if (curr_screen >= 0) /* this is not the first time through */ 1165 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1165 { 1166 //scr_touch (false);
1166 scr_change_screen (curr_screen);
1167 selection_check (old_ncol != ncol ? 4 : 0);
1168 }
1169 }
1170 1167
1171 old_width = szHint.width; 1168#ifdef HAVE_BG_PIXMAP
1172 old_height = szHint.height; 1169// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1173 1170// if (bgPixmap.pixmap)
1174#ifdef XPM_BACKGROUND
1175 if (pixmap)
1176 scr_touch (false); 1171// scr_touch (false);
1177#endif 1172#endif
1178 1173
1179#ifdef USE_XIM 1174#ifdef USE_XIM
1180 IMSetStatusPosition (); 1175 IMSetPosition ();
1181#endif 1176#endif
1182} 1177}
1183 1178
1184/* 1179/*
1185 * Set the width/height of the vt window in characters. Units are pixels. 1180 * Set the width/height of the vt window in characters. Units are pixels.
… …
1190{ 1185{
1191 XWindowAttributes wattr; 1186 XWindowAttributes wattr;
1192 1187
1193 if (newwidth == 0 || newheight == 0) 1188 if (newwidth == 0 || newheight == 0)
1194 { 1189 {
1195 XGetWindowAttributes (display->display, display->root, &wattr); 1190 XGetWindowAttributes (dpy, display->root, &wattr);
1196 1191
1197 if (newwidth == 0) 1192 if (newwidth == 0)
1198 newwidth = wattr.width - szHint.base_width; 1193 newwidth = wattr.width - szHint.base_width;
1199 if (newheight == 0) 1194 if (newheight == 0)
1200 newheight = wattr.height - szHint.base_height; 1195 newheight = wattr.height - szHint.base_height;
… …
1214#ifdef USE_XIM 1209#ifdef USE_XIM
1215 1210
1216void 1211void
1217rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1212rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1218{ 1213{
1219 fg = pix_colors[Color_fg]; 1214 fg = pix_colors [Color_fg];
1220 bg = pix_colors[Color_bg]; 1215 bg = pix_colors [Color_bg];
1221} 1216}
1222 1217
1223void 1218void
1224rxvt_term::im_set_size (XRectangle &size) 1219rxvt_term::im_set_size (XRectangle &size)
1225{ 1220{
… …
1262 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1257 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1263 1258
1264 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1259 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1265 *p = '\0'; 1260 *p = '\0';
1266 1261
1267 atom = XInternAtom (display->display, server, False); 1262 atom = XInternAtom (dpy, server, False);
1268 win = XGetSelectionOwner (display->display, atom); 1263 win = XGetSelectionOwner (dpy, atom);
1269 1264
1270 if (win != None) 1265 if (win != None)
1271 return True; 1266 return True;
1272 } 1267 }
1273 1268
… …
1280 XPoint nspot; 1275 XPoint nspot;
1281 XVaNestedList preedit_attr; 1276 XVaNestedList preedit_attr;
1282 1277
1283 if (!Input_Context 1278 if (!Input_Context
1284 || !focus 1279 || !focus
1285 || !(input_style & XIMPreeditPosition)) 1280 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1286 return; 1281 return;
1287 1282
1288 im_set_position (nspot); 1283 im_set_position (nspot);
1289 1284
1290 if (nspot.x == spot.x && nspot.y == spot.y) 1285 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1309 input_method = 0; 1304 input_method = 0;
1310 } 1305 }
1311 1306
1312 Input_Context = 0; 1307 Input_Context = 0;
1313} 1308}
1309
1310#ifdef ENABLE_XIM_ONTHESPOT
1311
1312static void
1313xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1314{
1315 ((rxvt_term *)client_data)->make_current ();
1316 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1317}
1318
1319static void
1320xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1321{
1322 ((rxvt_term *)client_data)->make_current ();
1323 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1324}
1325
1326static void
1327xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1328{
1329 rxvt_term *term = (rxvt_term *)client_data;
1330 XIMText *text = call_data->text;
1331
1332 term->make_current ();
1333
1334 if (text)
1335 {
1336 void *str;
1337
1338 if (!text->encoding_is_wchar && text->string.multi_byte)
1339 {
1340 // of course, X makes it ugly again
1341 if (term->rs[Rs_imLocale])
1342 SET_LOCALE (term->rs[Rs_imLocale]);
1343
1344 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1345 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1346
1347 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->locale);
1349 }
1350 else
1351 str = (void *)text->string.wide_char;
1352
1353 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354 DT_INT, call_data->caret,
1355 DT_INT, call_data->chg_first,
1356 DT_INT, call_data->chg_length,
1357 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1358 DT_WCS_LEN, str, str ? (int)text->length : 0,
1359 DT_END));
1360 }
1361 else
1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1363 DT_INT, call_data->caret,
1364 DT_INT, call_data->chg_first,
1365 DT_INT, call_data->chg_length,
1366 DT_END));
1367}
1368
1369#if 0
1370static void
1371xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1372{
1373 ((rxvt_term *)client_data)->make_current ();
1374 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1375 DT_INT, call_data->position,
1376 DT_INT, call_data->direction,
1377 DT_INT, call_data->style,
1378 DT_END));
1379}
1380#endif
1381
1382#endif
1314 1383
1315/* 1384/*
1316 * Try to open a XIM with the current modifiers, then see if we can 1385 * Try to open a XIM with the current modifiers, then see if we can
1317 * open a suitable preedit type 1386 * open a suitable preedit type
1318 */ 1387 */
… …
1325 XRectangle rect, status_rect, needed_rect; 1394 XRectangle rect, status_rect, needed_rect;
1326 unsigned long fg, bg; 1395 unsigned long fg, bg;
1327 const char *p; 1396 const char *p;
1328 char **s; 1397 char **s;
1329 XIMStyles *xim_styles; 1398 XIMStyles *xim_styles;
1399#ifdef ENABLE_XIM_ONTHESPOT
1400 XIMCallback xcb[4];
1401#endif
1330 1402
1331 set_environ (envv); 1403 set_environ (envv);
1332 1404
1333 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1405 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1334 return false; 1406 return false;
1335 1407
1336 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1337 input_method = display->get_xim (locale, modifiers); 1408 input_method = display->get_xim (locale, modifiers);
1338 if (input_method == NULL) 1409 if (input_method == NULL)
1339 return false; 1410 return false;
1340 1411
1341 xim = input_method->xim; 1412 xim = input_method->xim;
… …
1361 s = rxvt_splitcommastring (p); 1432 s = rxvt_splitcommastring (p);
1362 1433
1363 for (i = found = 0; !found && s[i]; i++) 1434 for (i = found = 0; !found && s[i]; i++)
1364 { 1435 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1436 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = (XIMPreeditPosition | XIMStatusNothing); 1437 input_style = XIMPreeditPosition | XIMStatusNothing;
1367 else if (!strcmp (s[i], "OffTheSpot")) 1438 else if (!strcmp (s[i], "OffTheSpot"))
1368 input_style = (XIMPreeditArea | XIMStatusArea); 1439 input_style = XIMPreeditArea | XIMStatusArea;
1369 else if (!strcmp (s[i], "Root")) 1440 else if (!strcmp (s[i], "Root"))
1370 input_style = (XIMPreeditNothing | XIMStatusNothing); 1441 input_style = XIMPreeditNothing | XIMStatusNothing;
1371 else if (!strcmp (s[i], "None")) 1442 else if (!strcmp (s[i], "None"))
1372 input_style = (XIMPreeditNone | XIMStatusNone); 1443 input_style = XIMPreeditNone | XIMStatusNone;
1444#ifdef ENABLE_XIM_ONTHESPOT
1445 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1446 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1447#endif
1448 else
1449 input_style = XIMPreeditNothing | XIMStatusNothing;
1373 1450
1374 for (j = 0; j < xim_styles->count_styles; j++) 1451 for (j = 0; j < xim_styles->count_styles; j++)
1375 if (input_style == xim_styles->supported_styles[j]) 1452 if (input_style == xim_styles->supported_styles[j])
1376 { 1453 {
1377 rxvt_freecommastring (s); 1454 rxvt_freecommastring (s);
… …
1415 "*", 1492 "*",
1416 fheight, 1493 fheight,
1417 fheight + 1, fheight - 1, 1494 fheight + 1, fheight - 1,
1418 fheight - 2, fheight + 2); 1495 fheight - 2, fheight + 2);
1419 1496
1420 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1497 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1421 &missing_charset_list, &missing_charset_count, &def_string); 1498 &missing_charset_list, &missing_charset_count, &def_string);
1422 1499
1423 if (missing_charset_list) 1500 if (missing_charset_list)
1424 XFreeStringList (missing_charset_list); 1501 XFreeStringList (missing_charset_list);
1425 1502
… …
1466 XNBackground, bg, 1543 XNBackground, bg,
1467 XNArea, &status_rect, 1544 XNArea, &status_rect,
1468 XNFontSet, fs, 1545 XNFontSet, fs,
1469 NULL); 1546 NULL);
1470 } 1547 }
1548#if ENABLE_XIM_ONTHESPOT
1549 else if (input_style & XIMPreeditCallbacks)
1550 {
1551 im_set_position (spot);
1552
1553 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1554 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1555 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1556# if 0
1557 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1558# endif
1559
1560 preedit_attr = XVaCreateNestedList (0,
1561 XNSpotLocation, &spot,
1562 XNPreeditStartCallback, &xcb[0],
1563 XNPreeditDoneCallback , &xcb[1],
1564 XNPreeditDrawCallback , &xcb[2],
1565# if 0
1566 XNPreeditCaretCallback, &xcb[3],
1567# endif
1568 NULL);
1569 }
1570#endif
1471 1571
1472 Input_Context = XCreateIC (xim, 1572 Input_Context = XCreateIC (xim,
1473 XNInputStyle, input_style, 1573 XNInputStyle, input_style,
1474 XNClientWindow, vt, 1574 XNClientWindow, vt,
1475 XNFocusWindow, parent[0], 1575 XNFocusWindow, parent[0],
… …
1477 preedit_attr, 1577 preedit_attr,
1478 status_attr ? XNStatusAttributes : NULL, 1578 status_attr ? XNStatusAttributes : NULL,
1479 status_attr, NULL); 1579 status_attr, NULL);
1480 1580
1481 if (preedit_attr) XFree (preedit_attr); 1581 if (preedit_attr) XFree (preedit_attr);
1482 if (status_attr) XFree (status_attr); 1582 if (status_attr) XFree (status_attr);
1483 if (fs) XFreeFontSet (display->display, fs); 1583 if (fs) XFreeFontSet (dpy, fs);
1484 1584
1485 if (Input_Context == NULL) 1585 if (Input_Context == NULL)
1486 { 1586 {
1487 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1587 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1488 im_destroy (); 1588 im_destroy ();
1489 return false; 1589 return false;
1490 } 1590 }
1491 1591
1492 if (input_style & XIMPreeditArea) 1592#if 0
1593 // unfortunately, only the focus window is used by XIM, hard to fix
1594 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1595 vt_select_input ();
1596#endif
1597
1493 IMSetStatusPosition (); 1598 IMSetPosition ();
1494 1599
1495 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1496 return true; 1600 return true;
1497} 1601}
1498 1602
1499void 1603void
1500rxvt_term::im_cb () 1604rxvt_term::im_cb ()
… …
1506 1610
1507 make_current (); 1611 make_current ();
1508 1612
1509 im_destroy (); 1613 im_destroy ();
1510 1614
1511 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1512 if (Input_Context) 1615 if (Input_Context)
1513 return; 1616 return;
1514 1617
1515#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1618#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1516 if (rs[Rs_imLocale]) 1619 if (rs[Rs_imLocale])
… …
1558 SET_LOCALE (locale); 1661 SET_LOCALE (locale);
1559#endif 1662#endif
1560} 1663}
1561 1664
1562void 1665void
1563rxvt_term::IMSetStatusPosition () 1666rxvt_term::IMSetPosition ()
1564{ 1667{
1565 XRectangle preedit_rect, status_rect, *needed_rect; 1668 XRectangle preedit_rect, status_rect, *needed_rect;
1566 XVaNestedList preedit_attr, status_attr; 1669 XVaNestedList preedit_attr, status_attr;
1567 1670
1568 if (!Input_Context 1671 if (!Input_Context
1569 || !focus 1672 || !focus
1570 || !(input_style & XIMPreeditArea) 1673 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1571 || !IMisRunning ()) 1674 || !IMisRunning ())
1572 return; 1675 return;
1573 1676
1677 if (input_style & XIMPreeditPosition)
1678 {
1679 im_set_size (preedit_rect);
1680 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681
1682 XSetICValues (Input_Context,
1683 XNPreeditAttributes, preedit_attr, NULL);
1684 }
1685 else
1686 {
1574 /* Getting the necessary width of preedit area */ 1687 /* Getting the necessary width of preedit area */
1575 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1688 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1576 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1689 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1577 XFree (status_attr); 1690 XFree (status_attr);
1578 1691
1579 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1692 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1580 XFree (needed_rect); 1693 XFree (needed_rect);
1581 1694
1582 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1695 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1583 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1696 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1584 1697
1585 XSetICValues (Input_Context, 1698 XSetICValues (Input_Context,
1586 XNPreeditAttributes, preedit_attr, 1699 XNPreeditAttributes, preedit_attr,
1587 XNStatusAttributes, status_attr, NULL); 1700 XNStatusAttributes, status_attr,
1701 NULL);
1588 1702
1703 XFree (status_attr);
1704 }
1705
1589 XFree (preedit_attr); 1706 XFree (preedit_attr);
1590 XFree (status_attr);
1591} 1707}
1592#endif /* USE_XIM */ 1708#endif /* USE_XIM */
1593 1709
1594/*----------------------------------------------------------------------*/
1595rxvt_t rxvt_current_term;
1596
1597/*----------------------- end-of-file (C source) -----------------------*/ 1710/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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