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

Diff Legend

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