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.23 by pcg, Sat Jan 31 03:18:43 2004 UTC vs.
Revision 1.60 by pcg, Sun Mar 28 02:07:08 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines