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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines