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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines