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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines