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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines