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.70 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.134 by root, Fri Feb 4 11:41:23 2005 UTC

32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35#include "main.intpro" /* PROTOS for internal routines */
36 36
37#include <signal.h> 37#include <csignal>
38#include <cstring>
38 39
39#ifdef TTY_GID_SUPPORT 40#ifdef TTY_GID_SUPPORT
40# include <grp.h> 41# include <grp.h>
41#endif 42#endif
42 43
43#ifdef HAVE_TERMIOS_H 44#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45# include <termios.h>
45#endif 46#endif
46 47
47#include <cstring> 48#ifdef KEYSYM_RESOURCE
49# include "keyboard.h"
50#endif
48 51
49vector<rxvt_term *> rxvt_term::termlist; 52vector<rxvt_term *> rxvt_term::termlist;
50 53
51static char curlocale[128]; 54static char curlocale[128];
52 55
53bool 56bool
54rxvt_set_locale (const char *locale) 57rxvt_set_locale (const char *locale)
55{ 58{
56 if (!locale || !STRNCMP (locale, curlocale, 128)) 59 if (!locale || !strncmp (locale, curlocale, 128))
57 return false; 60 return false;
58 61
59 STRNCPY (curlocale, locale, 128); 62 strncpy (curlocale, locale, 128);
60 setlocale (LC_CTYPE, curlocale); 63 setlocale (LC_CTYPE, curlocale);
61 return true; 64 return true;
62} 65}
63 66
64#if ENABLE_COMBINING 67#if ENABLE_COMBINING
123 return len; 126 return len;
124 127
125} 128}
126#endif 129#endif
127 130
128void *
129rxvt_term::operator new (size_t s)
130{
131 void *p = malloc (s);
132
133 MEMSET (p, 0, s);
134 return p;
135}
136
137void
138rxvt_term::operator delete (void *p, size_t s)
139{
140 free (p);
141}
142
143rxvt_term::rxvt_term () 131rxvt_term::rxvt_term ()
144 : 132 :
133#if TRANSPARENT
145 rootwin_ev (this, &rxvt_term::rootwin_cb), 134 rootwin_ev (this, &rxvt_term::rootwin_cb),
135#endif
136#ifdef HAVE_SCROLLBARS
137 scrollbar_ev (this, &rxvt_term::x_cb),
138#endif
139#ifdef MENUBAR
140 menubar_ev (this, &rxvt_term::x_cb),
141#endif
142#ifdef CURSOR_BLINK
143 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
144#endif
145#ifdef TEXT_BLINK
146 text_blink_ev (this, &rxvt_term::text_blink_cb),
147#endif
148#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
149 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
150#endif
151#ifdef SELECTION_SCROLLING
152 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
153#endif
154#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
155 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
156#endif
157#ifdef POINTER_BLANK
158 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif
160#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb),
162#endif
163 sw_term (this, &rxvt_term::sig_term),
164 sw_int (this, &rxvt_term::sig_term),
165 sw_chld (this, &rxvt_term::sig_chld),
146 termwin_ev (this, &rxvt_term::x_cb), 166 termwin_ev (this, &rxvt_term::x_cb),
147 vt_ev (this, &rxvt_term::x_cb), 167 vt_ev (this, &rxvt_term::x_cb),
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif
169#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175 check_ev (this, &rxvt_term::check_cb), 168 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb),
176 destroy_ev (this, &rxvt_term::destroy_cb), 170 destroy_ev (this, &rxvt_term::destroy_cb),
177 pty_ev (this, &rxvt_term::pty_cb), 171 pty_ev (this, &rxvt_term::pty_cb),
178 incr_ev (this, &rxvt_term::incr_cb) 172 incr_ev (this, &rxvt_term::incr_cb)
179{ 173{
180 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 174 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
181 175
182 termlist.push_back (this); 176 termlist.push_back (this);
183}
184 177
185rxvt_term::~rxvt_term () 178#ifdef KEYSYM_RESOURCE
186{ 179 keyboard = new keyboard_manager;
187 termlist.erase (find (termlist.begin (), termlist.end(), this));
188 180
181 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n");
183#endif
184}
185
186// clean up the most important stuff, do *not* call x or free mem etc.
187// for use before an emergency exit
188void rxvt_term::emergency_cleanup ()
189{
189 if (cmd_fd >= 0) 190 if (cmd_pid)
190 close (cmd_fd); 191 kill (-cmd_pid, SIGHUP);
191 192
192#ifndef NO_SETOWNER_TTYDEV
193 privileged_ttydev (RESTORE);
194#endif
195#ifdef UTMP_SUPPORT 193#ifdef UTMP_SUPPORT
196 privileged_utmp (RESTORE); 194 privileged_utmp (RESTORE);
197#endif 195#endif
198 196
197 pty.put ();
198}
199
200rxvt_term::~rxvt_term ()
201{
202 termlist.erase (find (termlist.begin (), termlist.end(), this));
203
204 emergency_cleanup ();
205
206#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0])
209 delete TermWin.fontset[i];
210#endif
199 delete TermWin.fontset; 211 delete TermWin.fontset[0];
200 212
201 if (display) 213 if (display)
202 { 214 {
215 dDisp;
216
203 selection_clear (); 217 selection_clear ();
204 218
219#ifdef USE_XIM
220 im_destroy ();
221#endif
205#ifdef MENUBAR 222#ifdef MENUBAR
206 if (menubarGC) XFreeGC (display->display, menubarGC); 223 if (menubarGC) XFreeGC (disp, menubarGC);
207#endif 224#endif
208#ifdef XTERM_SCROLLBAR 225#ifdef XTERM_SCROLLBAR
209 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
210 if (ShadowGC) XFreeGC (display->display, ShadowGC); 227 if (ShadowGC) XFreeGC (disp, ShadowGC);
211#endif 228#endif
212#ifdef PLAIN_SCROLLBAR 229#ifdef PLAIN_SCROLLBAR
213 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
214#endif 231#endif
215#ifdef NEXT_SCROLLBAR 232#ifdef NEXT_SCROLLBAR
216 if (blackGC) XFreeGC (display->display, blackGC); 233 if (blackGC) XFreeGC (disp, blackGC);
217 if (whiteGC) XFreeGC (display->display, whiteGC); 234 if (whiteGC) XFreeGC (disp, whiteGC);
218 if (grayGC) XFreeGC (display->display, grayGC); 235 if (grayGC) XFreeGC (disp, grayGC);
219 if (darkGC) XFreeGC (display->display, darkGC); 236 if (darkGC) XFreeGC (disp, darkGC);
220 if (stippleGC) XFreeGC (display->display, stippleGC); 237 if (stippleGC) XFreeGC (disp, stippleGC);
221 if (dimple) XFreePixmap (display->display, dimple); 238 if (dimple) XFreePixmap (disp, dimple);
222 if (upArrow) XFreePixmap (display->display, upArrow); 239 if (upArrow) XFreePixmap (disp, upArrow);
223 if (downArrow) XFreePixmap (display->display, downArrow); 240 if (downArrow) XFreePixmap (disp, downArrow);
224 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 241 if (upArrowHi) XFreePixmap (disp, upArrowHi);
225 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 242 if (downArrowHi) XFreePixmap (disp, downArrowHi);
226#endif 243#endif
227#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
228 if (topShadowGC) XFreeGC (display->display, topShadowGC); 245 if (topShadowGC) XFreeGC (disp, topShadowGC);
229 if (botShadowGC) XFreeGC (display->display, botShadowGC); 246 if (botShadowGC) XFreeGC (disp, botShadowGC);
230 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 247 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
231#endif 248#endif
232 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 249 if (TermWin.gc) XFreeGC (disp, TermWin.gc);
233 250
234#if defined(MENUBAR) && (MENUBAR_MAX > 1) 251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
235 delete menuBar.drawable; 252 delete menuBar.drawable;
236 //if (menuBar.win) 253 //if (menuBar.win)
237 // XDestroyWindow (display->display, menuBar.win); 254 // XDestroyWindow (disp, menuBar.win);
238#endif 255#endif
239 delete TermWin.drawable; 256 delete TermWin.drawable;
240 // destroy all windows 257 // destroy all windows
241 if (TermWin.parent[0]) 258 if (TermWin.parent[0])
242 XDestroyWindow (display->display, TermWin.parent[0]); 259 XDestroyWindow (disp, TermWin.parent[0]);
243 } 260 }
244 261
245 // TODO: free pixcolours, colours should become part of rxvt_display 262 // TODO: free pixcolours, colours should become part of rxvt_display
246 263
247 delete PixColors; 264 delete pix_colors_focused;
265#ifdef OFF_FOCUS_FADING
266 delete pix_colors_unfocused;
267#endif
248 268
249 displays.put (display); 269 displays.put (display);
250 270
251 scr_release (); 271 scr_release ();
252 272
253 /* clear all resources */ 273 /* clear all resources */
254 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
255 free (allocated[i]); 275 free (allocated [i]);
256 276
257 free (selection.text); 277 free (selection.text);
258 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
259 free (env_windowid); 279 free (env_windowid);
260 free (env_display); 280 free (env_display);
261 free (env_term); 281 free (env_term);
262 free (env_colorfgbg); 282 free (env_colorfgbg);
263 free (locale); 283 free (locale);
264#if 0 284 free (v_buffer);
265 free (codeset); 285 free (incr_buf);
266#endif
267 286
268 delete envv; 287 delete envv;
269 delete argv; 288 delete argv;
289
290#ifdef KEYSYM_RESOURCE
291 delete keyboard;
292#endif
270} 293}
271 294
272void 295void
273rxvt_term::destroy () 296rxvt_term::destroy ()
274{ 297{
298 if (destroy_ev.active)
299 return;
300
301#if ENABLE_OVERLAY
302 scr_overlay_off ();
303#endif
304
275 if (display) 305 if (display)
276 { 306 {
307#if USE_XIM
308 im_ev.stop (display);
309#endif
310#if HAVE_SCROLLBARS
311 scrollbar_ev.stop (display);
312#endif
313#if MENUBAR
314 menubar_ev.stop (display);
315#endif
316#if TRANSPARENT
277 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
318#endif
319 incr_ev.stop ();
278 termwin_ev.stop (display); 320 termwin_ev.stop (display);
279 vt_ev.stop (display); 321 vt_ev.stop (display);
280#ifdef USE_XIM
281 im_destroy ();
282 im_ev.stop (display);
283#endif
284#ifdef HAVE_SCROLLBARS
285 scrollbar_ev.stop (display);
286#endif
287#ifdef MENUBAR
288 menubar_ev.stop (display);
289#endif
290 } 322 }
291 323
292 check_ev.stop (); 324 check_ev.stop ();
293 pty_ev.stop (); 325 pty_ev.stop ();
294#ifdef CURSOR_BLINK 326#ifdef CURSOR_BLINK
317 349
318 delete this; 350 delete this;
319} 351}
320 352
321/*----------------------------------------------------------------------*/ 353/*----------------------------------------------------------------------*/
354/*
355 * Exit gracefully, clearing the utmp entry and restoring tty attributes
356 * TODO: if debugging, this should free up any known resources if we can
357 */
358static XErrorHandler old_xerror_handler;
359
360static void
361rxvt_emergency_cleanup ()
362{
363 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
364 (*t)->emergency_cleanup ();
365}
366
367int
368rxvt_xerror_handler (Display *display, XErrorEvent *event)
369{
370 if (GET_R->allowedxerror == -1)
371 GET_R->allowedxerror = event->error_code;
372 else
373 {
374 //TODO: GET_R is most likely not the terminal which caused the error
375 //TODO: maybe just output the error and continue?
376 old_xerror_handler (display, event);
377 GET_R->destroy ();
378 }
379
380 return 0;
381}
382
383int
384rxvt_xioerror_handler (Display *display)
385{
386 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
387 DisplayString (display));
388 rxvt_emergency_cleanup ();
389 _exit (EXIT_FAILURE);
390}
391
392/*
393 * Catch a fatal signal and tidy up before quitting
394 */
395void
396rxvt_term::sig_term (sig_watcher &w)
397{
398#ifdef DEBUG_CMD
399 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
400#endif
401 rxvt_emergency_cleanup ();
402 signal (w.signum, SIG_DFL);
403 kill (getpid (), w.signum);
404}
405
406/*----------------------------------------------------------------------*/
322/* rxvt_init () */ 407/* rxvt_init () */
323bool 408bool
324rxvt_term::init (int argc, const char *const *argv) 409rxvt_term::init (int argc, const char *const *argv)
325{ 410{
326 SET_R (this); 411 SET_R (this);
327 412
413 set_locale ("");
414
328 if (!init_vars ()) 415 if (!init_vars ())
329 return false; 416 return false;
330 417
418 init_secondary ();
419
420 const char **cmd_argv = init_resources (argc, argv);
421
422#ifdef KEYSYM_RESOURCE
423 keyboard->register_done ();
424#endif
425
426#if MENUBAR_MAX
427 menubar_read (rs[Rs_menu]);
428#endif
429#ifdef HAVE_SCROLLBARS
430 if (options & Opt_scrollBar)
431 scrollBar.setIdle (); /* set existence for size calculations */
432#endif
433
434 create_windows (argc, argv);
435
436 dDisp;
437
438 init_xlocale ();
439
440 scr_reset (); /* initialize screen */
441
442#if 0
443 XSynchronize (disp, True);
444#endif
445
446#ifdef HAVE_SCROLLBARS
447 if (options & Opt_scrollBar)
448 resize_scrollbar (); /* create and map scrollbar */
449#endif
450#if (MENUBAR_MAX)
451 if (menubar_visible ())
452 XMapWindow (disp, menuBar.win);
453#endif
454#ifdef TRANSPARENT
455 if (options & Opt_transparent)
456 {
457 XSelectInput (disp, display->root, PropertyChangeMask);
458 check_our_parents ();
459 rootwin_ev.start (display, display->root);
460 }
461#endif
462
463 XMapWindow (disp, TermWin.vt);
464 XMapWindow (disp, TermWin.parent[0]);
465
466 set_colorfgbg ();
467
468 init_command (cmd_argv);
469
470 free (cmd_argv);
471
472 pty_ev.start (pty.pty, EVENT_READ);
473
474 check_ev.start ();
475
476 return true;
477}
478
479void
480rxvt_init ()
481{
331 /* 482 /*
332 * Save and then give up any super-user privileges 483 * Save and then give up any super-user privileges
333 * If we need privileges in any area then we must specifically request it. 484 * If we need privileges in any area then we must specifically request it.
334 * We should only need to be root in these cases: 485 * We should only need to be root in these cases:
335 * 1. write utmp entries on some systems 486 * 1. write utmp entries on some systems
336 * 2. chown tty on some systems 487 * 2. chown tty on some systems
337 */ 488 */
338 privileges (SAVE); 489 rxvt_privileges (SAVE);
339 privileges (IGNORE); 490 rxvt_privileges (IGNORE);
340 491
341 init_secondary (); 492 signal (SIGHUP, SIG_IGN);
342 493 signal (SIGPIPE, SIG_IGN);
343 const char **cmd_argv = init_resources (argc, argv);
344
345 set_locale ("");
346
347#if MENUBAR_MAX
348 menubar_read (rs[Rs_menu]);
349#endif
350#ifdef HAVE_SCROLLBARS
351 if (Options & Opt_scrollBar)
352 scrollBar.setIdle (); /* set existence for size calculations */
353#endif
354
355 create_windows (argc, argv);
356
357 init_xlocale ();
358
359 scr_reset (); /* initialize screen */
360
361#if 0
362 XSynchronize (display->display, True);
363#endif
364
365#ifdef HAVE_SCROLLBARS
366 if (Options & Opt_scrollBar)
367 resize_scrollbar (); /* create and map scrollbar */
368#endif
369#if (MENUBAR_MAX)
370 if (menubar_visible ())
371 XMapWindow (display->display, menuBar.win);
372#endif
373#ifdef TRANSPARENT
374 if (Options & Opt_transparent)
375 {
376 XSelectInput (display->display, display->root, PropertyChangeMask);
377 check_our_parents ();
378 }
379#endif
380
381 rootwin_ev.start (display, display->root);
382
383 XMapWindow (display->display, TermWin.vt);
384 XMapWindow (display->display, TermWin.parent[0]);
385
386 init_command (cmd_argv);
387
388 pty_ev.start (cmd_fd, EVENT_READ);
389
390 check_ev.start ();
391
392 return true;
393}
394
395static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
396
397void
398rxvt_init_signals ()
399{
400 /* install exit handler for cleanup */
401#if 0
402#ifdef HAVE_ATEXIT
403 atexit (rxvt_clean_exit);
404#else
405#endif
406#endif
407
408 struct sigaction sa;
409
410 sigfillset (&sa.sa_mask);
411 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
412 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
413 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
414 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
415 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
416 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
417 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
418 494
419 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 495 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
420 /* signal (SIGURG, SIG_DFL); */ 496 /* signal (SIGURG, SIG_DFL); */
421 497
422 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 498 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
499 // TODO: handle this with exceptions and tolerate the memory loss
423 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 500 XSetIOErrorHandler (rxvt_xioerror_handler);
424} 501}
425 502
426/* ------------------------------------------------------------------------- * 503/* ------------------------------------------------------------------------- *
427 * SIGNAL HANDLING & EXIT HANDLER * 504 * SIGNAL HANDLING & EXIT HANDLER *
428 * ------------------------------------------------------------------------- */ 505 * ------------------------------------------------------------------------- */
429/* 506/*
430 * Catch a SIGCHLD signal and exit if the direct child has died 507 * Catch a SIGCHLD signal and exit if the direct child has died
431 */ 508 */
432 509
433void rxvt_term::child_exited (int pid) 510void
511rxvt_term::sig_chld (sig_watcher &w)
434{ 512{
435 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 513 // we are being called for every SIGCHLD, not just ours
436 if (pid == (*t)->cmd_pid) 514 int pid;
437 {
438 (*t)->destroy ();
439 break;
440 }
441}
442
443/* ARGSUSED */
444/* EXTPROTO */
445RETSIGTYPE
446rxvt_Child_signal (int sig __attribute__ ((unused)))
447{
448 int pid, save_errno = errno;
449 515
450 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 516 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
451 rxvt_term::child_exited (pid); 517 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
452 518 if (pid == (*t)->cmd_pid)
453 errno = save_errno; 519 {
454} 520 (*t)->destroy ();
455 521 break;
456/* 522 }
457 * Catch a fatal signal and tidy up before quitting
458 */
459/* EXTPROTO */
460RETSIGTYPE
461rxvt_Exit_signal (int sig)
462{
463 signal (sig, SIG_DFL);
464#ifdef DEBUG_CMD
465 rxvt_warn ("caught signal %d, exiting.\n", sig);
466#endif
467 rxvt_clean_exit ();
468 kill (getpid (), sig);
469}
470
471/* INTPROTO */
472int
473rxvt_xerror_handler (Display *display, XErrorEvent *event)
474{
475 if (GET_R->allowedxerror == -1)
476 GET_R->allowedxerror = event->error_code;
477 else
478 {
479 old_xerror_handler (display, event);
480 GET_R->destroy ();
481 }
482
483 return 0;
484}
485
486/*----------------------------------------------------------------------*/
487/*
488 * Exit gracefully, clearing the utmp entry and restoring tty attributes
489 * TODO: if debugging, this should free up any known resources if we can
490 */
491/* EXTPROTO */
492void
493rxvt_clean_exit ()
494{
495 // TODO: rxvtd should clean up all ressources
496 if (GET_R)
497 GET_R->destroy ();
498} 523}
499 524
500/* ------------------------------------------------------------------------- * 525/* ------------------------------------------------------------------------- *
501 * MEMORY ALLOCATION WRAPPERS * 526 * MEMORY ALLOCATION WRAPPERS *
502 * ------------------------------------------------------------------------- */ 527 * ------------------------------------------------------------------------- */
503/* EXTPROTO */ 528void *
504void *
505rxvt_malloc (size_t size) 529rxvt_malloc (size_t size)
506{ 530{
507 void *p;
508
509 p = malloc (size); 531 void *p = malloc (size);
532
510 if (p) 533 if (!p)
534 rxvt_fatal ("memory allocation failure. aborting.\n");
535
511 return p; 536 return p;
512
513 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
514 rxvt_clean_exit ();
515 exit (EXIT_FAILURE);
516 /* NOTREACHED */
517} 537}
518 538
519/* EXTPROTO */ 539/* INTPROTO */
520void * 540void *
521rxvt_calloc (size_t number, size_t size) 541rxvt_calloc (size_t number, size_t size)
522{ 542{
523 void *p;
524
525 p = calloc (number, size); 543 void *p = calloc (number, size);
544
526 if (p) 545 if (!p)
546 rxvt_fatal ("memory allocation failure. aborting.\n");
547
527 return p; 548 return p;
528
529 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
530 rxvt_clean_exit ();
531 exit (EXIT_FAILURE);
532 /* NOTREACHED */
533} 549}
534 550
535/* EXTPROTO */ 551/* INTPROTO */
536void * 552void *
537rxvt_realloc (void *ptr, size_t size) 553rxvt_realloc (void *ptr, size_t size)
538{ 554{
539 void *p;
540
541 if (ptr)
542 p = realloc (ptr, size); 555 void *p = realloc (ptr, size);
543 else 556
544 p = malloc (size);
545 if (p) 557 if (!p)
558 rxvt_fatal ("memory allocation failure. aborting.\n");
559
546 return p; 560 return p;
547
548 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
549 rxvt_clean_exit ();
550 exit (EXIT_FAILURE);
551 /* NOTREACHED */
552} 561}
553 562
554/* ------------------------------------------------------------------------- * 563/* ------------------------------------------------------------------------- *
555 * PRIVILEGED OPERATIONS * 564 * PRIVILEGED OPERATIONS *
556 * ------------------------------------------------------------------------- */ 565 * ------------------------------------------------------------------------- */
557/* take care of suid/sgid super-user (root) privileges */ 566/* take care of suid/sgid super-user (root) privileges */
558void 567void
559rxvt_term::privileges (int mode) 568rxvt_privileges (rxvt_privaction action)
560{ 569{
570#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
571 static uid_t euid;
572 static gid_t egid;
573#endif
574
561#if ! defined(__CYGWIN32__) 575#if ! defined(__CYGWIN32__)
562# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 576# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
563 /* setreuid () is the poor man's setuid (), seteuid () */ 577 /* setreuid () is the poor man's setuid (), seteuid () */
564# define seteuid(a) setreuid(-1, (a)) 578# define seteuid(a) setreuid(-1, (a))
565# define setegid(a) setregid(-1, (a)) 579# define setegid(a) setregid(-1, (a))
566# define HAVE_SETEUID 580# define HAVE_SETEUID
567# endif 581# endif
568# ifdef HAVE_SETEUID 582# ifdef HAVE_SETEUID
569 switch (mode) 583 switch (action)
570 { 584 {
571 case IGNORE: 585 case IGNORE:
572 /* 586 /*
573 * change effective uid/gid - not real uid/gid - so we can switch 587 * change effective uid/gid - not real uid/gid - so we can switch
574 * back to root later, as required 588 * back to root later, as required
584 seteuid (euid); 598 seteuid (euid);
585 setegid (egid); 599 setegid (egid);
586 break; 600 break;
587 } 601 }
588# else 602# else
589 switch (mode) 603 switch (action)
590 { 604 {
591 case IGNORE: 605 case IGNORE:
592 setuid (getuid ()); 606 setuid (getuid ());
593 setgid (getgid ()); 607 setgid (getgid ());
594 /* FALLTHROUGH */ 608 /* FALLTHROUGH */
601#endif 615#endif
602} 616}
603 617
604#ifdef UTMP_SUPPORT 618#ifdef UTMP_SUPPORT
605void 619void
606rxvt_term::privileged_utmp (char action) 620rxvt_term::privileged_utmp (rxvt_privaction action)
607{ 621{
608 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
609 action, next_utmp_action, getpid ()));
610 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
611 || (Options & Opt_utmpInhibit) 622 if ((options & Opt_utmpInhibit)
612 || ttydev == NULL || *ttydev == '\0') 623 || !pty.name || !*pty.name)
613 return; 624 return;
614 625
615 privileges (RESTORE); 626 rxvt_privileges (RESTORE);
627
616 if (action == SAVE) 628 if (action == SAVE)
617 {
618 next_utmp_action = RESTORE;
619 makeutent (ttydev, rs[Rs_display_name]); 629 makeutent (pty.name, rs[Rs_display_name]);
620 }
621 else 630 else
622 { /* action == RESTORE */
623 next_utmp_action = IGNORE;
624 cleanutent (); 631 cleanutent ();
625 } 632
626 privileges (IGNORE); 633 rxvt_privileges (IGNORE);
627}
628#endif
629
630#ifndef NO_SETOWNER_TTYDEV
631void
632rxvt_term::privileged_ttydev (char action)
633{
634 D_MAIN ((stderr,
635 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
636 action, next_tty_action, getpid ()));
637 if (next_tty_action != action || (action != SAVE && action != RESTORE)
638 || ttydev == NULL || *ttydev == '\0')
639 return;
640
641 privileges (RESTORE);
642
643 if (action == SAVE)
644 {
645 next_tty_action = RESTORE;
646# ifndef RESET_TTY_TO_COMMON_DEFAULTS
647 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
648 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
649 next_tty_action = IGNORE;
650 else
651# endif
652
653 {
654 chown (ttydev, getuid (), ttygid); /* fail silently */
655 chmod (ttydev, ttymode);
656# ifdef HAVE_REVOKE
657 revoke (ttydev);
658# endif
659
660 }
661 }
662 else
663 { /* action == RESTORE */
664 next_tty_action = IGNORE;
665# ifndef RESET_TTY_TO_COMMON_DEFAULTS
666 chmod (ttydev, ttyfd_stat.st_mode);
667 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
668# else
669 chmod (ttydev,
670 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
671 chown (ttydev, 0, 0);
672# endif
673
674 }
675
676 privileges (IGNORE);
677
678# ifndef RESET_TTY_TO_COMMON_DEFAULTS
679 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
680 action == RESTORE ? "Restoring" : (action ==
681 SAVE ? "Saving" :
682 "UNKNOWN ERROR for"), ttydev,
683 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
684 ttyfd_stat.st_gid));
685# endif
686} 634}
687#endif 635#endif
688 636
689/*----------------------------------------------------------------------*/ 637/*----------------------------------------------------------------------*/
690/* 638/*
692 * if width/height are non-zero then override calculated width/height 640 * if width/height are non-zero then override calculated width/height
693 */ 641 */
694void 642void
695rxvt_term::window_calc (unsigned int width, unsigned int height) 643rxvt_term::window_calc (unsigned int width, unsigned int height)
696{ 644{
697 short recalc_x, recalc_y; 645 short recalc_x, recalc_y;
698 int x, y, sb_w, mb_h, flags; 646 int x, y, sb_w, mb_h, flags;
699 unsigned int w, h; 647 unsigned int w, h;
700 unsigned int max_width, max_height; 648 unsigned int max_width, max_height;
649 dDisp;
701 650
702 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 651 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
703 TermWin.ncol, TermWin.nrow, szHint.width, 652 TermWin.ncol, TermWin.nrow, szHint.width,
704 szHint.height)); 653 szHint.height));
705 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 654 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
761 710
762 if (scrollbar_visible ()) 711 if (scrollbar_visible ())
763 { 712 {
764 sb_w = scrollbar_TotalWidth (); 713 sb_w = scrollbar_TotalWidth ();
765 szHint.base_width += sb_w; 714 szHint.base_width += sb_w;
766 if (!(Options & Opt_scrollBar_right)) 715 if (!(options & Opt_scrollBar_right))
767 window_vt_x += sb_w; 716 window_vt_x += sb_w;
768 } 717 }
769 718
770 if (menubar_visible ()) 719 if (menubar_visible ())
771 { 720 {
799 { 748 {
800 MIN_IT (TermWin.height, max_height); 749 MIN_IT (TermWin.height, max_height);
801 szHint.height = szHint.base_height + TermWin.height; 750 szHint.height = szHint.base_height + TermWin.height;
802 } 751 }
803 752
804 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 753 if (scrollbar_visible () && (options & Opt_scrollBar_right))
805 window_sb_x = szHint.width - sb_w; 754 window_sb_x = szHint.width - sb_w;
806 755
807 if (recalc_x) 756 if (recalc_x)
808 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 757 szHint.x += (DisplayWidth (disp, display->screen)
809 - szHint.width - 2 * TermWin.ext_bwidth); 758 - szHint.width - 2 * TermWin.ext_bwidth);
810 if (recalc_y) 759 if (recalc_y)
811 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 760 szHint.y += (DisplayHeight (disp, display->screen)
812 - szHint.height - 2 * TermWin.ext_bwidth); 761 - szHint.height - 2 * TermWin.ext_bwidth);
813 762
814 TermWin.ncol = TermWin.width / TermWin.fwidth; 763 TermWin.ncol = TermWin.width / TermWin.fwidth;
815 TermWin.nrow = TermWin.height / TermWin.fheight; 764 TermWin.nrow = TermWin.height / TermWin.fheight;
816 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 765 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
825 * Called after a window size change. 774 * Called after a window size change.
826 */ 775 */
827void 776void
828rxvt_term::tt_winch () 777rxvt_term::tt_winch ()
829{ 778{
779 if (pty.pty < 0)
780 return;
781
830 struct winsize ws; 782 struct winsize ws;
831
832 if (cmd_fd < 0)
833 return;
834 783
835 ws.ws_col = TermWin.ncol; 784 ws.ws_col = TermWin.ncol;
836 ws.ws_row = TermWin.nrow; 785 ws.ws_row = TermWin.nrow;
837 ws.ws_xpixel = ws.ws_ypixel = 0; 786 ws.ws_xpixel = TermWin.width;
838#ifndef DEBUG_SIZE 787 ws.ws_ypixel = TermWin.height;
839 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 788 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
840#else 789
841 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 790#if 0
842 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 791 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
843# ifdef SIGWINCH
844 else if (cmd_pid) /* force through to the command */ 792 if (cmd_pid) /* force through to the command */
845 kill (cmd_pid, SIGWINCH); 793 kill (cmd_pid, SIGWINCH);
846# endif
847#endif 794#endif
848} 795}
849 796
850/*----------------------------------------------------------------------*/ 797/*----------------------------------------------------------------------*/
851/* rxvt_change_font () - Switch to a new font */ 798/* set_fonts () - load and set the various fonts
852/* 799/*
853 * init = 1 - initialize 800 * init = 1 - initialize
854 * 801 *
855 * fontname == FONT_UP - switch to bigger font 802 * fontname == FONT_UP - switch to bigger font
856 * fontname == FONT_DN - switch to smaller font 803 * fontname == FONT_DN - switch to smaller font
857 */ 804 */
858bool 805bool
859rxvt_term::change_font (const char *fontname) 806rxvt_term::set_fonts ()
860{ 807{
861 if (fontname == FONT_UP)
862 {
863 // TODO
864 }
865 else if (fontname == FONT_DN)
866 {
867 // TODO
868 }
869 else
870 {
871 rxvt_fontset *fs = new rxvt_fontset (this); 808 rxvt_fontset *fs = new rxvt_fontset (this);
809 rxvt_fontprop prop;
872 810
873 if (fs && fs->populate (fontname ? fontname : "fixed")) 811 if (!fs
812 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
813 || !fs->realize_font (1))
814 {
815 delete fs;
816 return false;
817 }
818
819#if ENABLE_STYLES
820 for (int i = RS_styleCount; --i; )
821 if (TermWin.fontset[i] != TermWin.fontset[0])
822 delete TermWin.fontset[i];
823#endif
824
825 delete TermWin.fontset[0];
826 TermWin.fontset[0] = fs;
827
828 prop = (*fs)[1]->properties ();
829 prop.height += TermWin.lineSpace;
830 fs->set_prop (prop);
831
832 TermWin.fwidth = prop.width;
833 TermWin.fheight = prop.height;
834 TermWin.fweight = prop.weight;
835 TermWin.fslant = prop.slant;
836 TermWin.fbase = (*fs)[1]->ascent;
837
838 for (int style = 1; style < 4; style++)
839 {
840#if ENABLE_STYLES
841 const char *res = rs[Rs_font + style];
842
843 if (res && !*res)
844 TermWin.fontset[style] = TermWin.fontset[0];
845 else
874 { 846 {
875 delete TermWin.fontset; 847 TermWin.fontset[style] = fs = new rxvt_fontset (this);
876 TermWin.fontset = fs; 848 rxvt_fontprop prop2 = prop;
877 TermWin.fwidth = fs->base_font ()->width;
878 TermWin.fheight = fs->base_font ()->height;
879 TermWin.fbase = fs->base_font ()->ascent;
880 849
881 if (TermWin.parent[0]) 850 if (res)
851 prop2.weight = prop2.slant = rxvt_fontprop::unset;
852 else
882 { 853 {
883 resize_all_windows (0, 0, 0); 854 res = TermWin.fontset[0]->fontdesc;
884 scr_remap_chars (); 855
885 scr_touch (true); 856 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
857 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
886 } 858 }
887 859
888 return true; 860 fs->populate (res);
861 fs->set_prop (prop2);
889 } 862 }
863#else
864 TermWin.fontset[style] = TermWin.fontset[0];
865#endif
866 }
867
868 if (TermWin.parent[0])
890 } 869 {
870 resize_all_windows (0, 0, 0);
871 scr_remap_chars ();
872 scr_touch (true);
873 }
891 874
892 return false; 875 return true;
893} 876}
894 877
895bool 878void rxvt_term::set_string_property (Atom prop, const char *str, int len)
896rxvt_term::font_up_down (int n, int direction)
897{ 879{
898 return false; 880 // TODO: SMART_WINDOW_TITLE
881 XChangeProperty (display->display, TermWin.parent[0],
882 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884}
885
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{
888 // TODO: SMART_WINDOW_TITLE
889 wchar_t *ws = rxvt_mbstowcs (str, len);
890 char *s = rxvt_wcstoutf8 (ws);
891
892 XChangeProperty (display->display, TermWin.parent[0],
893 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
894 (const unsigned char *)s, strlen (s));
895
896 free (s);
897 free (ws);
899} 898}
900 899
901/*----------------------------------------------------------------------*/ 900/*----------------------------------------------------------------------*/
902/*----------------------------------------------------------------------*/ 901/*----------------------------------------------------------------------*/
903/* xterm sequences - title, iconName, color (exptl) */ 902/* xterm sequences - title, iconName, color (exptl) */
904void 903void
905rxvt_term::set_title (const char *str) 904rxvt_term::set_title (const char *str)
906{ 905{
907#ifdef SMART_WINDOW_TITLE 906 set_string_property (XA_WM_NAME, str);
908 char *name; 907#if ENABLE_FRILLS
909 908 set_utf8_property (xa[XA_NET_WM_NAME], str);
910 if (!XFetchName (display->display, TermWin.parent[0], &name))
911 name = NULL;
912
913 if (name == NULL || STRCMP (name, str))
914#endif
915 XStoreName (display->display, TermWin.parent[0], str);
916
917#ifdef SMART_WINDOW_TITLE
918 if (name)
919 XFree (name);
920#endif 909#endif
921} 910}
922 911
923void 912void
924rxvt_term::set_icon_name (const char *str) 913rxvt_term::set_icon_name (const char *str)
925{ 914{
926#ifdef SMART_WINDOW_TITLE 915 set_string_property (XA_WM_ICON_NAME, str);
927 char *name; 916#if ENABLE_FRILLS
928 917 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
929 if (!XGetIconName (display->display, TermWin.parent[0], &name))
930 name = NULL;
931
932 if (name == NULL || STRCMP (name, str))
933#endif
934 XSetIconName (display->display, TermWin.parent[0], str);
935
936#ifdef SMART_WINDOW_TITLE
937 if (name)
938 XFree (name);
939#endif 918#endif
940} 919}
941 920
942#ifdef XTERM_COLOR_CHANGE 921#ifdef XTERM_COLOR_CHANGE
943void 922void
951 930
952 /* handle color aliases */ 931 /* handle color aliases */
953 if (isdigit (*color)) 932 if (isdigit (*color))
954 { 933 {
955 i = atoi (color); 934 i = atoi (color);
935
956 if (i >= 8 && i <= 15) 936 if (i >= 8 && i <= 15)
957 { /* bright colors */ 937 { /* bright colors */
958 i -= 8; 938 i -= 8;
959# ifndef NO_BRIGHTCOLOR 939# ifndef NO_BRIGHTCOLOR
960 PixColors[idx] = PixColors[minBrightCOLOR + i]; 940 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
961 SET_PIXCOLOR (idx); 941 SET_PIXCOLOR (idx);
962 goto Done; 942 goto Done;
963# endif 943# endif
964
965 } 944 }
945
966 if (i >= 0 && i <= 7) 946 if (i >= 0 && i <= 7)
967 { /* normal colors */ 947 { /* normal colors */
968 PixColors[idx] = PixColors[minCOLOR + i]; 948 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
969 SET_PIXCOLOR (idx); 949 SET_PIXCOLOR (idx);
970 goto Done; 950 goto Done;
971 } 951 }
972 } 952 }
973 953
974 if (!rXParseAllocColor (& xcol, color)) 954 if (!rXParseAllocColor (&xcol, color))
975 return; 955 return;
976 956
977 /* XStoreColor (display->display, XCMAP, XColor*); */ 957 /* XStoreColor (display->display, display->cmap, XColor*); */
978 958
979 /* 959 /*
980 * FIXME: should free colors here, but no idea how to do it so instead, 960 * FIXME: should free colors here, but no idea how to do it so instead,
981 * so just keep gobbling up the colormap 961 * so just keep gobbling up the colormap
982 */ 962 */
983# if 0 963# if 0
984 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
985 if (PixColors[idx] == PixColors[i]) 965 if (pix_colors[idx] == pix_colors[i])
986 break; 966 break;
987 if (i > Color_White) 967 if (i > Color_White)
988 { 968 {
989 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 969 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
990 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 970 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
991 DisplayPlanes (display->display, display->screen)); 971 DisplayPlanes (display->display, display->screen));
992 } 972 }
993# endif 973# endif
994 974
995 PixColors[idx] = xcol; 975 pix_colors_focused[idx] = xcol;
996 SET_PIXCOLOR (idx); 976 SET_PIXCOLOR (idx);
997 977
998 /* XSetWindowAttributes attr; */ 978 /* XSetWindowAttributes attr; */
999 /* Cursor cursor; */ 979 /* Cursor cursor; */
1000Done: 980Done:
1001 if (idx == Color_bg && ! (Options & Opt_transparent)) 981#ifdef OFF_FOCUS_FADING
1002 XSetWindowBackground (display->display, TermWin.vt, 982 if (rs[Rs_fade])
1003 PixColors[Color_bg]); 983 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
984#endif
1004 985
1005 /* handle Color_BD, scrollbar background, etc. */ 986 /*TODO: handle Color_BD, scrollbar background, etc. */
1006 987
1007 set_colorfgbg ();
1008 recolour_cursor (); 988 recolour_cursor ();
1009 scr_touch (true); 989 scr_recolour ();
1010} 990}
1011 991
1012#else 992#else
1013# define set_window_color (idx,color) ((void)0) 993# define set_window_color (idx,color) ((void)0)
1014#endif /* XTERM_COLOR_CHANGE */ 994#endif /* XTERM_COLOR_CHANGE */
1016void 996void
1017rxvt_term::recolour_cursor () 997rxvt_term::recolour_cursor ()
1018{ 998{
1019 XColor xcol[2]; 999 XColor xcol[2];
1020 1000
1021 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg]; 1001 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
1022 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg]; 1002 ? pix_colors_focused[Color_pointer_fg]
1003 : pix_colors_focused[Color_fg];
1004 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1005 ? pix_colors_focused[Color_pointer_bg]
1006 : pix_colors_focused[Color_bg];
1007
1023 XQueryColors (display->display, XCMAP, xcol, 2); 1008 XQueryColors (display->display, display->cmap, xcol, 2);
1024 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 1009 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1025} 1010}
1026 1011
1027/*----------------------------------------------------------------------*/ 1012/*----------------------------------------------------------------------*/
1028/* 1013/*
1029 * find if fg/bg matches any of the normal (low-intensity) colors 1014 * find if fg/bg matches any of the normal (low-intensity) colors
1030 */ 1015 */
1031void 1016void
1032rxvt_term::set_colorfgbg () 1017rxvt_term::set_colorfgbg ()
1033{ 1018{
1034 unsigned int i; 1019 unsigned int i;
1035 const char *xpmb = "\0"; 1020 const char *xpmb = "\0";
1036 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1021 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1037 1022
1038 env_colorfgbg =
1039 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1023 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1040 STRCPY (fstr, "default"); 1024 strcpy (fstr, "default");
1041 STRCPY (bstr, "default"); 1025 strcpy (bstr, "default");
1042 for (i = Color_Black; i <= Color_White; i++) 1026 for (i = Color_Black; i <= Color_White; i++)
1043 if (PixColors[Color_fg] == PixColors[i]) 1027 if (pix_colors[Color_fg] == pix_colors[i])
1044 { 1028 {
1045 sprintf (fstr, "%d", (i - Color_Black)); 1029 sprintf (fstr, "%d", (i - Color_Black));
1046 break; 1030 break;
1047 } 1031 }
1032
1048 for (i = Color_Black; i <= Color_White; i++) 1033 for (i = Color_Black; i <= Color_White; i++)
1049 if (PixColors[Color_bg] == PixColors[i]) 1034 if (pix_colors[Color_bg] == pix_colors[i])
1050 { 1035 {
1051 sprintf (bstr, "%d", (i - Color_Black)); 1036 sprintf (bstr, "%d", (i - Color_Black));
1052#ifdef XPM_BACKGROUND 1037#ifdef XPM_BACKGROUND
1053 xpmb = "default;"; 1038 xpmb = "default;";
1054#endif 1039#endif
1055 break; 1040 break;
1056 } 1041 }
1057 1042
1058 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1043 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1059
1060#ifndef NO_BRIGHTCOLOR
1061 colorfgbg = DEFAULT_RSTYLE;
1062 for (i = minCOLOR; i <= maxCOLOR; i++)
1063 {
1064 if (PixColors[Color_fg] == PixColors[i])
1065 colorfgbg = SET_FGCOLOR (colorfgbg, i);
1066 if (PixColors[Color_bg] == PixColors[i])
1067 colorfgbg = SET_BGCOLOR (colorfgbg, i);
1068 }
1069#endif
1070} 1044}
1071 1045
1072/*----------------------------------------------------------------------*/ 1046/*----------------------------------------------------------------------*/
1073/*
1074 * Colour determination for low colour displays, routine from
1075 * Hans de Goede <hans@highrise.nl>
1076 */
1077 1047
1078int 1048int
1079rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1049rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1080{ 1050{
1081 if (!screen_in_out->set (display, colour)) 1051 if (!screen_in_out->set (display, colour))
1092 * -------------------------------------------------------------------- */ 1062 * -------------------------------------------------------------------- */
1093void 1063void
1094rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1064rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
1095{ 1065{
1096 int fix_screen; 1066 int fix_screen;
1097
1098#ifdef SMART_RESIZE 1067#ifdef SMART_RESIZE
1099 int old_width = szHint.width, old_height = szHint.height; 1068 int old_width = szHint.width, old_height = szHint.height;
1100#endif 1069#endif
1070 dDisp;
1101 1071
1102 window_calc (width, height); 1072 window_calc (width, height);
1103 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1073 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1104 1074
1105 if (!ignoreparent) 1075 if (!ignoreparent)
1106 { 1076 {
1107#ifdef SMART_RESIZE 1077#ifdef SMART_RESIZE
1108 /* 1078 /*
1112 int x, y, x1, y1; 1082 int x, y, x1, y1;
1113 int dx, dy; 1083 int dx, dy;
1114 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1084 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1115 Window unused_cr; 1085 Window unused_cr;
1116 1086
1117 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1087 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1118 0, 0, &x, &y, &unused_cr); 1088 0, 0, &x, &y, &unused_cr);
1119 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1089 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
1120 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1090 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1121 /* 1091 /*
1122 * if display->root isn't the parent window, a WM will probably have offset 1092 * if display->root isn't the parent window, a WM will probably have offset
1123 * our position for handles and decorations. Counter it 1093 * our position for handles and decorations. Counter it
1124 */ 1094 */
1126 { 1096 {
1127 x -= x1; 1097 x -= x1;
1128 y -= y1; 1098 y -= y1;
1129 } 1099 }
1130 1100
1131 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1101 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1132 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1102 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1133 dx = old_width - szHint.width; 1103 dx = old_width - szHint.width;
1134 dy = old_height - szHint.height; 1104 dy = old_height - szHint.height;
1135 1105
1136 /* Check position of the center of the window */ 1106 /* Check position of the center of the window */
1137 if (x < x1) /* left half */ 1107 if (x < x1) /* left half */
1141 if (y < y1) /* top half */ 1111 if (y < y1) /* top half */
1142 dy = 0; 1112 dy = 0;
1143 else if (y == y1) /* exact center */ 1113 else if (y == y1) /* exact center */
1144 dy /= 2; 1114 dy /= 2;
1145 1115
1146 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1116 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
1147 szHint.width, szHint.height); 1117 szHint.width, szHint.height);
1148#else 1118#else
1149 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1119 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
1150#endif 1120#endif
1151 } 1121 }
1152 1122
1153 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1123 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1154 1124
1155 if (fix_screen || width != old_width || height != old_height) 1125 if (fix_screen || width != old_width || height != old_height)
1156 { 1126 {
1157 if (scrollbar_visible ()) 1127 if (scrollbar_visible ())
1158 { 1128 {
1159 XMoveResizeWindow (display->display, scrollBar.win, 1129 XMoveResizeWindow (disp, scrollBar.win,
1160 window_sb_x, 0, 1130 window_sb_x, 0,
1161 scrollbar_TotalWidth (), szHint.height); 1131 scrollbar_TotalWidth (), szHint.height);
1162 resize_scrollbar (); 1132 resize_scrollbar ();
1163 } 1133 }
1164 1134
1165 if (menubar_visible ()) 1135 if (menubar_visible ())
1166 XMoveResizeWindow (display->display, menuBar.win, 1136 XMoveResizeWindow (disp, menuBar.win,
1167 window_vt_x, 0, 1137 window_vt_x, 0,
1168 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1138 TermWin_TotalWidth (), menuBar_TotalHeight ());
1169 1139
1170 XMoveResizeWindow (display->display, TermWin.vt, 1140 XMoveResizeWindow (disp, TermWin.vt,
1171 window_vt_x, window_vt_y, 1141 window_vt_x, window_vt_y,
1172 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1142 TermWin_TotalWidth (), TermWin_TotalHeight ());
1143
1173 scr_clear (); 1144 scr_clear ();
1174#ifdef XPM_BACKGROUND 1145#ifdef XPM_BACKGROUND
1175 resize_pixmap (); 1146 resize_pixmap ();
1176#endif 1147#endif
1177 } 1148 }
1200 } 1171 }
1201 1172
1202 old_width = szHint.width; 1173 old_width = szHint.width;
1203 old_height = szHint.height; 1174 old_height = szHint.height;
1204 1175
1176#ifdef XPM_BACKGROUND
1177 if (TermWin.pixmap)
1178 scr_touch (false);
1179#endif
1180
1205#ifdef USE_XIM 1181#ifdef USE_XIM
1206 IMSetStatusPosition (); 1182 IMSetStatusPosition ();
1207#endif 1183#endif
1208} 1184}
1209 1185
1222 if (width == 0) 1198 if (width == 0)
1223 width = wattr.width - szHint.base_width; 1199 width = wattr.width - szHint.base_width;
1224 if (height == 0) 1200 if (height == 0)
1225 height = wattr.height - szHint.base_height; 1201 height = wattr.height - szHint.base_height;
1226 } 1202 }
1203
1227 if (width != TermWin.width || height != TermWin.height) 1204 if (width != TermWin.width || height != TermWin.height)
1228 { 1205 {
1229 width += szHint.base_width; 1206 width += szHint.base_width;
1230 height += szHint.base_height; 1207 height += szHint.base_height;
1231 resize_all_windows (width, height, 0); 1208 resize_all_windows (width, height, 0);
1236 * - X INPUT METHOD ROUTINES - * 1213 * - X INPUT METHOD ROUTINES - *
1237 * -------------------------------------------------------------------- */ 1214 * -------------------------------------------------------------------- */
1238#ifdef USE_XIM 1215#ifdef USE_XIM
1239 1216
1240void 1217void
1218rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1219{
1220 fg = pix_colors[Color_fg];
1221 bg = pix_colors[Color_bg];
1222}
1223
1224void
1241rxvt_term::im_set_size (XRectangle *size) 1225rxvt_term::im_set_size (XRectangle &size)
1242{ 1226{
1227 // the int_bwidth terms make no sense to me
1243 size->x = TermWin.int_bwidth; 1228 size.x = TermWin.int_bwidth;
1244 size->y = TermWin.int_bwidth; 1229 size.y = TermWin.int_bwidth;
1245 size->width = Width2Pixel (TermWin.ncol); 1230 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1246 size->height = Height2Pixel (TermWin.nrow); 1231 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1247} 1232}
1248 1233
1249void 1234void
1250rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1235rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1236 XRectangle &status_rect,
1237 const XRectangle &needed_rect)
1251{ 1238{
1252 *fg = PixColors[Color_fg]; 1239 preedit_rect.x = needed_rect.width;
1253 *bg = PixColors[Color_bg]; 1240 preedit_rect.y = 0;
1241 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
1242 preedit_rect.height = TermWin.fheight;
1243
1244 status_rect.x = 0;
1245 status_rect.y = 0;
1246 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
1247 status_rect.height = TermWin.fheight;
1254} 1248}
1255 1249
1256/* Checking whether input method is running. */ 1250/* Checking whether input method is running. */
1257bool 1251bool
1258rxvt_term::IMisRunning () 1252rxvt_term::IMisRunning ()
1259{ 1253{
1260 char *p; 1254 char *p;
1261 Atom atom; 1255 Atom atom;
1262 Window win; 1256 Window win;
1263 char server[IMBUFSIZ]; 1257 char server[IMBUFSIZ];
1264 1258
1265 /* get current locale modifier */ 1259 /* get current locale modifier */
1266 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1260 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1267 { 1261 {
1268 STRCPY (server, "@server="); 1262 strcpy (server, "@server=");
1269 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1263 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1264
1270 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1265 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1271 *p = '\0'; 1266 *p = '\0';
1272 1267
1273 atom = XInternAtom (display->display, server, False); 1268 atom = XInternAtom (display->display, server, False);
1274 win = XGetSelectionOwner (display->display, atom); 1269 win = XGetSelectionOwner (display->display, atom);
1270
1275 if (win != None) 1271 if (win != None)
1276 return True; 1272 return True;
1277 } 1273 }
1274
1278 return False; 1275 return False;
1279} 1276}
1280 1277
1281void 1278void
1282rxvt_term::IMSendSpot () 1279rxvt_term::IMSendSpot ()
1283{ 1280{
1284 XPoint spot; 1281 XPoint nspot;
1285 XVaNestedList preedit_attr; 1282 XVaNestedList preedit_attr;
1286 1283
1287 if (Input_Context == NULL 1284 if (!Input_Context
1285 || !TermWin.focus
1288 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1286 || !(input_style & XIMPreeditPosition))
1289 || ! (event_type == KeyPress
1290 || event_type == Expose
1291 || event_type == NoExpose
1292 || event_type == SelectionNotify
1293 || event_type == ButtonRelease || event_type == FocusIn)
1294 || !IMisRunning ())
1295 return; 1287 return;
1296 1288
1297 im_set_position (&spot); 1289 im_set_position (nspot);
1290
1291 if (nspot.x == spot.x && nspot.y == spot.y)
1292 return;
1293
1294 spot = nspot;
1298 1295
1299 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1296 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1300 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1297 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1301 XFree (preedit_attr); 1298 XFree (preedit_attr);
1302} 1299}
1303 1300
1304void 1301void
1305rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1306 XRectangle * needed_rect)
1307{
1308 int mbh, vtx = 0;
1309
1310 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1311 vtx = scrollbar_TotalWidth ();
1312
1313 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1314 mbh -= TermWin.lineSpace;
1315
1316 preedit_rect->x = needed_rect->width + vtx;
1317 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1318
1319 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1320 preedit_rect->height = Height2Pixel (1);
1321
1322 status_rect->x = vtx;
1323 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1324
1325 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1326 status_rect->height = Height2Pixel (1);
1327}
1328
1329void
1330rxvt_term::im_destroy () 1302rxvt_term::im_destroy ()
1331{ 1303{
1332 if (Input_Context)
1333 {
1334 XDestroyIC (Input_Context);
1335 Input_Context = NULL;
1336 }
1337
1338 if (input_method) 1304 if (input_method)
1339 { 1305 {
1306 if (Input_Context && input_method->xim)
1307 XDestroyIC (Input_Context);
1308
1340 display->put_xim (input_method); 1309 display->put_xim (input_method);
1341 input_method = 0; 1310 input_method = 0;
1342 } 1311 }
1312
1313 Input_Context = 0;
1343} 1314}
1344 1315
1345/* 1316/*
1346 * Try to open a XIM with the current modifiers, then see if we can 1317 * Try to open a XIM with the current modifiers, then see if we can
1347 * open a suitable preedit type 1318 * open a suitable preedit type
1348 */ 1319 */
1349bool 1320bool
1350rxvt_term::IM_get_IC (const char *modifiers) 1321rxvt_term::IM_get_IC (const char *modifiers)
1351{ 1322{
1352 int i, j, found; 1323 int i, j, found;
1353 XIM xim; 1324 XIM xim;
1354 XPoint spot; 1325 XPoint spot;
1355 XRectangle rect, status_rect, needed_rect; 1326 XRectangle rect, status_rect, needed_rect;
1356 unsigned long fg, bg; 1327 unsigned long fg, bg;
1357 const char *p; 1328 const char *p;
1358 char **s; 1329 char **s;
1359 XIMStyles *xim_styles; 1330 XIMStyles *xim_styles;
1360 XVaNestedList preedit_attr, status_attr;
1361 1331
1362 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1332 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1363 return false; 1333 return false;
1364 1334
1365 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1335 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1366 input_method = display->get_xim (locale, modifiers); 1336 input_method = display->get_xim (locale, modifiers);
1367 if (input_method == NULL) 1337 if (input_method == NULL)
1368 return false; 1338 return false;
1369 1339
1370 xim = input_method->xim; 1340 xim = input_method->xim;
1341 spot.x = spot.y = -1;
1371 1342
1372 xim_styles = NULL; 1343 xim_styles = NULL;
1373 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1344 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1374 || !xim_styles || !xim_styles->count_styles) 1345 || !xim_styles || !xim_styles->count_styles)
1375 { 1346 {
1376 display->put_xim (input_method); 1347 im_destroy ();
1377 return false; 1348 return false;
1378 } 1349 }
1379 1350
1380 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1351 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1352
1353 for (int pi = 0; pi < 2; pi++)
1354 {
1355 p = pet[pi];
1356
1357 if (!p)
1358 continue;
1359
1381 s = rxvt_splitcommastring (p); 1360 s = rxvt_splitcommastring (p);
1361
1382 for (i = found = 0; !found && s[i]; i++) 1362 for (i = found = 0; !found && s[i]; i++)
1383 { 1363 {
1384 if (!STRCMP (s[i], "OverTheSpot")) 1364 if (!strcmp (s[i], "OverTheSpot"))
1385 input_style = (XIMPreeditPosition | XIMStatusNothing); 1365 input_style = (XIMPreeditPosition | XIMStatusNothing);
1386 else if (!STRCMP (s[i], "OffTheSpot")) 1366 else if (!strcmp (s[i], "OffTheSpot"))
1387 input_style = (XIMPreeditArea | XIMStatusArea); 1367 input_style = (XIMPreeditArea | XIMStatusArea);
1388 else if (!STRCMP (s[i], "Root")) 1368 else if (!strcmp (s[i], "Root"))
1389 input_style = (XIMPreeditNothing | XIMStatusNothing); 1369 input_style = (XIMPreeditNothing | XIMStatusNothing);
1370 else if (!strcmp (s[i], "None"))
1371 input_style = (XIMPreeditNone | XIMStatusNone);
1390 1372
1391 for (j = 0; j < xim_styles->count_styles; j++) 1373 for (j = 0; j < xim_styles->count_styles; j++)
1392 if (input_style == xim_styles->supported_styles[j]) 1374 if (input_style == xim_styles->supported_styles[j])
1393 { 1375 {
1376 rxvt_freecommastring (s);
1377
1394 found = 1; 1378 found = 1;
1395 break; 1379 goto foundpet;
1380 }
1381
1396 } 1382 }
1397 }
1398 1383
1399 for (i = 0; s[i]; i++) 1384 rxvt_freecommastring (s);
1400 free (s[i]); 1385 }
1401 1386
1402 free (s); 1387foundpet:
1388
1403 XFree (xim_styles); 1389 XFree (xim_styles);
1404 1390
1405 if (!found) 1391 if (!found)
1406 { 1392 {
1407 display->put_xim (input_method); 1393 im_destroy ();
1408 return false; 1394 return false;
1409 } 1395 }
1410 1396
1411 preedit_attr = status_attr = NULL; 1397 XFontSet fs = 0;
1398 XVaNestedList preedit_attr = 0, status_attr = 0;
1399
1400 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1401 {
1402 // fake us a font-set, please
1403 char **missing_charset_list;
1404 int missing_charset_count;
1405 char *def_string;
1406 char pat[512];
1407
1408 sprintf (pat,
1409 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1410 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1411 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1412 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1413 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1414 "*",
1415 TermWin.fheight,
1416 TermWin.fheight + 1, TermWin.fheight - 1,
1417 TermWin.fheight - 2, TermWin.fheight + 2);
1418
1419 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1420 &missing_charset_list, &missing_charset_count, &def_string);
1421
1422 if (missing_charset_list)
1423 XFreeStringList (missing_charset_list);
1424
1425 if (!fs)
1426 {
1427 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1428 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1429 }
1430 }
1412 1431
1413 if (input_style & XIMPreeditPosition) 1432 if (input_style & XIMPreeditPosition)
1414 { 1433 {
1415 im_set_size (&rect); 1434 im_set_size (rect);
1416 im_set_position (&spot); 1435 im_set_position (spot);
1417 im_set_color (&fg, &bg); 1436 im_set_color (fg, bg);
1418 1437
1419 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1438 preedit_attr = XVaCreateNestedList (0,
1439 XNForeground, fg,
1440 XNBackground, bg,
1441 XNArea, &rect,
1420 XNSpotLocation, &spot, 1442 XNSpotLocation, &spot,
1421 XNForeground, fg, XNBackground, bg,
1422 //XNFontSet, TermWin.fontset, 1443 XNFontSet, fs,
1423 NULL); 1444 NULL);
1424 } 1445 }
1425 else if (input_style & XIMPreeditArea) 1446 else if (input_style & XIMPreeditArea)
1426 { 1447 {
1427 im_set_color (&fg, &bg); 1448 im_set_color (fg, bg);
1428 1449
1429 /* 1450 /*
1430 * The necessary width of preedit area is unknown 1451 * The necessary width of preedit area is unknown
1431 * until create input context. 1452 * until create input context.
1432 */ 1453 */
1433 needed_rect.width = 0; 1454 needed_rect.width = 0;
1434
1435 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1455 im_set_preedit_area (rect, status_rect, needed_rect);
1436 1456
1437 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1457 preedit_attr = XVaCreateNestedList (0,
1458 XNForeground, fg,
1438 XNForeground, fg, XNBackground, bg, 1459 XNBackground, bg,
1460 XNArea, &rect,
1461 XNFontSet, fs,
1462 NULL);
1463 status_attr = XVaCreateNestedList (0,
1464 XNForeground, fg,
1465 XNBackground, bg,
1466 XNArea, &status_rect,
1439 //XNFontSet, TermWin.fontset, 1467 XNFontSet, fs,
1440 NULL); 1468 NULL);
1441 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1442 XNForeground, fg, XNBackground, bg,
1443 //XNFontSet, TermWin.fontset,
1444 NULL);
1445 } 1469 }
1446 1470
1447 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1471 Input_Context = XCreateIC (xim,
1472 XNInputStyle, input_style,
1448 XNClientWindow, TermWin.parent[0], 1473 XNClientWindow, TermWin.vt,
1449 XNFocusWindow, TermWin.parent[0], 1474 XNFocusWindow, TermWin.parent[0],
1450 preedit_attr ? XNPreeditAttributes : NULL, 1475 preedit_attr ? XNPreeditAttributes : NULL,
1451 preedit_attr, 1476 preedit_attr,
1452 status_attr ? XNStatusAttributes : NULL, 1477 status_attr ? XNStatusAttributes : NULL,
1453 status_attr, NULL); 1478 status_attr, NULL);
1479
1454 if (preedit_attr) XFree (preedit_attr); 1480 if (preedit_attr) XFree (preedit_attr);
1455 if (status_attr) XFree (status_attr); 1481 if (status_attr) XFree (status_attr);
1482 if (fs) XFreeFontSet (display->display, fs);
1456 1483
1457 if (Input_Context == NULL) 1484 if (Input_Context == NULL)
1458 { 1485 {
1459 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1486 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1460 display->put_xim (input_method); 1487 im_destroy ();
1461 return false; 1488 return false;
1462 } 1489 }
1463 1490
1464 if (input_style & XIMPreeditArea) 1491 if (input_style & XIMPreeditArea)
1465 IMSetStatusPosition (); 1492 IMSetStatusPosition ();
1491 if (p && *p) 1518 if (p && *p)
1492 { 1519 {
1493 bool found = false; 1520 bool found = false;
1494 1521
1495 s = rxvt_splitcommastring (p); 1522 s = rxvt_splitcommastring (p);
1523
1496 for (i = 0; s[i]; i++) 1524 for (i = 0; s[i]; i++)
1497 { 1525 {
1498 if (*s[i]) 1526 if (*s[i])
1499 { 1527 {
1500 STRCPY (buf, "@im="); 1528 strcpy (buf, "@im=");
1501 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1529 strncat (buf, s[i], IMBUFSIZ - 5);
1502 if (IM_get_IC (buf)) 1530 if (IM_get_IC (buf))
1503 { 1531 {
1504 found = true; 1532 found = true;
1505 break; 1533 break;
1506 } 1534 }
1507 } 1535 }
1508 } 1536 }
1509 for (i = 0; s[i]; i++) 1537
1510 free (s[i]); 1538 rxvt_freecommastring (s);
1511 free (s);
1512 1539
1513 if (found) 1540 if (found)
1514 goto done; 1541 goto done;
1515 } 1542 }
1516 1543
1530} 1557}
1531 1558
1532void 1559void
1533rxvt_term::IMSetStatusPosition () 1560rxvt_term::IMSetStatusPosition ()
1534{ 1561{
1535 XRectangle preedit_rect, status_rect, *needed_rect; 1562 XRectangle preedit_rect, status_rect, *needed_rect;
1536 XVaNestedList preedit_attr, status_attr; 1563 XVaNestedList preedit_attr, status_attr;
1537 1564
1538 if (Input_Context == NULL 1565 if (!Input_Context
1566 || !TermWin.focus
1539 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1567 || !(input_style & XIMPreeditArea)
1540 || !IMisRunning ()) 1568 || !IMisRunning ())
1541 return; 1569 return;
1542 1570
1543 /* Getting the necessary width of preedit area */ 1571 /* Getting the necessary width of preedit area */
1544 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1572 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1545 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1573 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1546 XFree (status_attr); 1574 XFree (status_attr);
1547 1575
1548 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1576 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1577 XFree (needed_rect);
1549 1578
1550 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1579 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1551 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1580 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1552 1581
1553 XSetICValues (Input_Context, 1582 XSetICValues (Input_Context,
1554 XNPreeditAttributes, preedit_attr, 1583 XNPreeditAttributes, preedit_attr,
1555 XNStatusAttributes, status_attr, NULL); 1584 XNStatusAttributes, status_attr, NULL);
1556 1585
1557 XFree (preedit_attr); 1586 XFree (preedit_attr);
1558 XFree (status_attr); 1587 XFree (status_attr);
1559} 1588}
1560#endif /* USE_XIM */ 1589#endif /* USE_XIM */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines