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

Diff Legend

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