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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines