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

Diff Legend

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