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.45 by pcg, Tue Feb 24 21:46:15 2004 UTC

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

Diff Legend

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