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.43 by pcg, Tue Feb 24 00:02:44 2004 UTC vs.
Revision 1.132 by root, Thu Feb 3 07:18:30 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines