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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.32 by pcg, Fri Feb 13 12:16:21 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines