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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines