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.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.53 by pcg, Sun Mar 14 17:33:07 2004 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines