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

Diff Legend

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