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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines