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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines