[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.73 by root, Fri Jul 30 14:59:12 2004 UTC vs.
Revision 1.117 by root, Mon Nov 29 01:20:42 2004 UTC

…		…
51	static char curlocale[128];	51	static char curlocale[128];
52		52
53	bool	53	bool
54	rxvt_set_locale (const char *locale)	54	rxvt_set_locale (const char *locale)
55	{	55	{
56	if (!locale \|\| !STRNCMP (locale, curlocale, 128))	56	if (!locale \|\| !strncmp (locale, curlocale, 128))
57	return false;	57	return false;
58		58
59	STRNCPY (curlocale, locale, 128);	59	strncpy (curlocale, locale, 128);
60	setlocale (LC_CTYPE, curlocale);	60	setlocale (LC_CTYPE, curlocale);
61	return true;	61	return true;
62	}	62	}
63		63
64	#if ENABLE_COMBINING	64	#if ENABLE_COMBINING
…		…
123	return len;	123	return len;
124		124
125	}	125	}
126	#endif	126	#endif
127		127
128	void *
129	rxvt_term::operator new (size_t s)
130	{
131	void *p = malloc (s);
132
133	MEMSET (p, 0, s);
134	return p;
135	}
136
137	void
138	rxvt_term::operator delete (void *p, size_t s)
139	{
140	free (p);
141	}
142
143	rxvt_term::rxvt_term ()	128	rxvt_term::rxvt_term ()
144	:	129	:
		130	#if TRANSPARENT
145	rootwin_ev (this, &rxvt_term::rootwin_cb),	131	rootwin_ev (this, &rxvt_term::rootwin_cb),
		132	#endif
		133	#ifdef HAVE_SCROLLBARS
		134	scrollbar_ev (this, &rxvt_term::x_cb),
		135	#endif
		136	#ifdef MENUBAR
		137	menubar_ev (this, &rxvt_term::x_cb),
		138	#endif
		139	#ifdef CURSOR_BLINK
		140	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
		141	#endif
		142	#ifdef TEXT_BLINK
		143	text_blink_ev (this, &rxvt_term::text_blink_cb),
		144	#endif
		145	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		146	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
		147	#endif
		148	#ifdef SELECTION_SCROLLING
		149	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
		150	#endif
		151	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		152	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
		153	#endif
		154	#ifdef POINTER_BLANK
		155	pointer_ev (this, &rxvt_term::pointer_cb),
		156	#endif
		157	#ifdef USE_XIM
		158	im_ev (this, &rxvt_term::im_cb),
		159	#endif
		160	sw_term (this, &rxvt_term::sig_term),
		161	sw_chld (this, &rxvt_term::sig_chld),
146	termwin_ev (this, &rxvt_term::x_cb),	162	termwin_ev (this, &rxvt_term::x_cb),
147	vt_ev (this, &rxvt_term::x_cb),	163	vt_ev (this, &rxvt_term::x_cb),
148	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif
151	#ifdef MENUBAR
152	menubar_ev (this, &rxvt_term::x_cb),
153	#endif
154	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156	#endif
157	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),
159	#endif
160	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162	#endif
163	#ifdef SELECTION_SCROLLING
164	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165	#endif
166	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168	#endif
169	#ifdef POINTER_BLANK
170	pointer_ev (this, &rxvt_term::pointer_cb),
171	#endif
172	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),
174	#endif
175	check_ev (this, &rxvt_term::check_cb),	164	check_ev (this, &rxvt_term::check_cb),
		165	flush_ev (this, &rxvt_term::flush_cb),
176	destroy_ev (this, &rxvt_term::destroy_cb),	166	destroy_ev (this, &rxvt_term::destroy_cb),
177	pty_ev (this, &rxvt_term::pty_cb),	167	pty_ev (this, &rxvt_term::pty_cb),
178	incr_ev (this, &rxvt_term::incr_cb)	168	incr_ev (this, &rxvt_term::incr_cb)
179	{	169	{
180	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	170	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
…		…
184		174
185	rxvt_term::~rxvt_term ()	175	rxvt_term::~rxvt_term ()
186	{	176	{
187	termlist.erase (find (termlist.begin (), termlist.end(), this));	177	termlist.erase (find (termlist.begin (), termlist.end(), this));
188		178
189	if (cmd_fd >= 0)	179	if (cmd_pid)
190	close (cmd_fd);	180	kill (-cmd_pid, SIGHUP);
191		181
192	#ifndef NO_SETOWNER_TTYDEV	182	pty.put ();
193	privileged_ttydev (RESTORE);	183
194	#endif
195	#ifdef UTMP_SUPPORT	184	#ifdef UTMP_SUPPORT
196	privileged_utmp (RESTORE);	185	privileged_utmp (RESTORE);
197	#endif	186	#endif
198		187
		188	#if ENABLE_STYLES
		189	for (int i = RS_styleCount; --i; )
		190	if (TermWin.fontset[i] != TermWin.fontset[0])
		191	delete TermWin.fontset[i];
		192	#endif
199	delete TermWin.fontset;	193	delete TermWin.fontset[0];
200		194
201	if (display)	195	if (display)
202	{	196	{
203	selection_clear ();	197	selection_clear ();
204		198
		199	#ifdef USE_XIM
		200	im_destroy ();
		201	#endif
205	#ifdef MENUBAR	202	#ifdef MENUBAR
206	if (menubarGC) XFreeGC (display->display, menubarGC);	203	if (menubarGC) XFreeGC (display->display, menubarGC);
207	#endif	204	#endif
208	#ifdef XTERM_SCROLLBAR	205	#ifdef XTERM_SCROLLBAR
209	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);	206	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
210	if (ShadowGC) XFreeGC (display->display, ShadowGC);	207	if (ShadowGC) XFreeGC (display->display, ShadowGC);
211	#endif	208	#endif
…		…
242	XDestroyWindow (display->display, TermWin.parent[0]);	239	XDestroyWindow (display->display, TermWin.parent[0]);
243	}	240	}
244		241
245	// TODO: free pixcolours, colours should become part of rxvt_display	242	// TODO: free pixcolours, colours should become part of rxvt_display
246		243
247	delete PixColorsFocused;	244	delete pix_colors_focused;
248	#ifdef OFF_FOCUS_FADING	245	#ifdef OFF_FOCUS_FADING
249	delete PixColorsUnFocused;	246	delete pix_colors_unfocused;
250	#endif	247	#endif
251		248
252	displays.put (display);	249	displays.put (display);
253		250
254	scr_release ();	251	scr_release ();
…		…
273	}	270	}
274		271
275	void	272	void
276	rxvt_term::destroy ()	273	rxvt_term::destroy ()
277	{	274	{
		275	if (destroy_ev.active)
		276	return;
		277
		278	#if ENABLE_OVERLAY
		279	scr_overlay_off ();
		280	#endif
		281
278	if (display)	282	if (display)
279	{	283	{
		284	#if USE_XIM
		285	im_ev.stop (display);
		286	#endif
		287	#if HAVE_SCROLLBARS
		288	scrollbar_ev.stop (display);
		289	#endif
		290	#if MENUBAR
		291	menubar_ev.stop (display);
		292	#endif
		293	#if TRANSPARENT
280	rootwin_ev.stop (display);	294	rootwin_ev.stop (display);
		295	#endif
		296	incr_ev.stop ();
281	termwin_ev.stop (display);	297	termwin_ev.stop (display);
282	vt_ev.stop (display);	298	vt_ev.stop (display);
283	#ifdef USE_XIM
284	im_destroy ();
285	im_ev.stop (display);
286	#endif
287	#ifdef HAVE_SCROLLBARS
288	scrollbar_ev.stop (display);
289	#endif
290	#ifdef MENUBAR
291	menubar_ev.stop (display);
292	#endif
293	}	299	}
294		300
295	check_ev.stop ();	301	check_ev.stop ();
296	pty_ev.stop ();	302	pty_ev.stop ();
297	#ifdef CURSOR_BLINK	303	#ifdef CURSOR_BLINK
…		…
329	SET_R (this);	335	SET_R (this);
330		336
331	if (!init_vars ())	337	if (!init_vars ())
332	return false;	338	return false;
333		339
		340	init_secondary ();
		341
		342	const char **cmd_argv = init_resources (argc, argv);
		343
		344	set_locale ("");
		345
		346	#if MENUBAR_MAX
		347	menubar_read (rs[Rs_menu]);
		348	#endif
		349	#ifdef HAVE_SCROLLBARS
		350	if (options & Opt_scrollBar)
		351	scrollBar.setIdle (); /* set existence for size calculations */
		352	#endif
		353
		354	create_windows (argc, argv);
		355
		356	init_xlocale ();
		357
		358	scr_reset (); /* initialize screen */
		359
		360	#if 0
		361	XSynchronize (display->display, True);
		362	#endif
		363
		364	#ifdef HAVE_SCROLLBARS
		365	if (options & Opt_scrollBar)
		366	resize_scrollbar (); /* create and map scrollbar */
		367	#endif
		368	#if (MENUBAR_MAX)
		369	if (menubar_visible ())
		370	XMapWindow (display->display, menuBar.win);
		371	#endif
		372	#ifdef TRANSPARENT
		373	if (options & Opt_transparent)
		374	{
		375	XSelectInput (display->display, display->root, PropertyChangeMask);
		376	check_our_parents ();
		377	rootwin_ev.start (display, display->root);
		378	}
		379	#endif
		380
		381	XMapWindow (display->display, TermWin.vt);
		382	XMapWindow (display->display, TermWin.parent[0]);
		383
		384	set_colorfgbg ();
		385
		386	init_command (cmd_argv);
		387
		388	pty_ev.start (pty.pty, EVENT_READ);
		389
		390	check_ev.start ();
		391
		392	return true;
		393	}
		394
		395	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);
		396
		397	void
		398	rxvt_init ()
		399	{
334	/*	400	/*
335	* Save and then give up any super-user privileges	401	* Save and then give up any super-user privileges
336	* If we need privileges in any area then we must specifically request it.	402	* If we need privileges in any area then we must specifically request it.
337	* We should only need to be root in these cases:	403	* We should only need to be root in these cases:
338	* 1. write utmp entries on some systems	404	* 1. write utmp entries on some systems
339	* 2. chown tty on some systems	405	* 2. chown tty on some systems
340	*/	406	*/
341	privileges (SAVE);	407	rxvt_privileges (SAVE);
342	privileges (IGNORE);	408	rxvt_privileges (IGNORE);
343		409
344	init_secondary ();	410	signal (SIGHUP, SIG_IGN);
345		411	signal (SIGPIPE, SIG_IGN);
346	const char **cmd_argv = init_resources (argc, argv);
347
348	set_locale ("");
349
350	#if MENUBAR_MAX
351	menubar_read (rs[Rs_menu]);
352	#endif
353	#ifdef HAVE_SCROLLBARS
354	if (Options & Opt_scrollBar)
355	scrollBar.setIdle (); /* set existence for size calculations */
356	#endif
357
358	create_windows (argc, argv);
359
360	init_xlocale ();
361
362	scr_reset (); /* initialize screen */
363
364	#if 0
365	XSynchronize (display->display, True);
366	#endif
367
368	#ifdef HAVE_SCROLLBARS
369	if (Options & Opt_scrollBar)
370	resize_scrollbar (); /* create and map scrollbar */
371	#endif
372	#if (MENUBAR_MAX)
373	if (menubar_visible ())
374	XMapWindow (display->display, menuBar.win);
375	#endif
376	#ifdef TRANSPARENT
377	if (Options & Opt_transparent)
378	{
379	XSelectInput (display->display, display->root, PropertyChangeMask);
380	check_our_parents ();
381	}
382	#endif
383
384	rootwin_ev.start (display, display->root);
385
386	XMapWindow (display->display, TermWin.vt);
387	XMapWindow (display->display, TermWin.parent[0]);
388
389	init_command (cmd_argv);
390
391	pty_ev.start (cmd_fd, EVENT_READ);
392
393	check_ev.start ();
394
395	return true;
396	}
397
398	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);
399
400	void
401	rxvt_init_signals ()
402	{
403	/* install exit handler for cleanup */
404	#if 0
405	#ifdef HAVE_ATEXIT
406	atexit (rxvt_clean_exit);
407	#else
408	#endif
409	#endif
410
411	struct sigaction sa;
412
413	sigfillset (&sa.sa_mask);
414	sa.sa_flags = SA_NOCLDSTOP \| SA_RESTART;
415	sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
416	sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
417	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
418	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
419	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
420	sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
421		412
422	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	413	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
423	/* signal (SIGURG, SIG_DFL); */	414	/* signal (SIGURG, SIG_DFL); */
424		415
425	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	416	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
		417	// TODO: handle this with exceptions and tolerate the memory loss
426	//XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);	418	//XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
427	}	419	}
428		420
429	/* ------------------------------------------------------------------------- *	421	/* ------------------------------------------------------------------------- *
430	* SIGNAL HANDLING & EXIT HANDLER *	422	* SIGNAL HANDLING & EXIT HANDLER *
431	* ------------------------------------------------------------------------- */	423	* ------------------------------------------------------------------------- */
432	/*	424	/*
433	* Catch a SIGCHLD signal and exit if the direct child has died	425	* Catch a SIGCHLD signal and exit if the direct child has died
434	*/	426	*/
435		427
436	void rxvt_term::child_exited (int pid)	428	void
		429	rxvt_term::sig_chld (sig_watcher &w)
437	{	430	{
438	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	431	// we are being called for every SIGCHLD, not just ours
439	if (pid == (*t)->cmd_pid)	432	int pid;
440	{
441	(*t)->destroy ();
442	break;
443	}
444	}
445
446	/* ARGSUSED */
447	/* EXTPROTO */
448	RETSIGTYPE
449	rxvt_Child_signal (int sig __attribute__ ((unused)))
450	{
451	int pid, save_errno = errno;
452		433
453	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)	434	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
454	rxvt_term::child_exited (pid);	435	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
455		436	if (pid == (*t)->cmd_pid)
456	errno = save_errno;	437	{
457	}	438	(*t)->destroy ();
458		439	break;
459	/*	440	}
460	* Catch a fatal signal and tidy up before quitting
461	*/
462	/* EXTPROTO */
463	RETSIGTYPE
464	rxvt_Exit_signal (int sig)
465	{
466	signal (sig, SIG_DFL);
467	#ifdef DEBUG_CMD
468	rxvt_warn ("caught signal %d, exiting.\n", sig);
469	#endif
470	rxvt_clean_exit ();
471	kill (getpid (), sig);
472	}
473
474	/* INTPROTO */
475	int
476	rxvt_xerror_handler (Display display, XErrorEvent event)
477	{
478	if (GET_R->allowedxerror == -1)
479	GET_R->allowedxerror = event->error_code;
480	else
481	{
482	old_xerror_handler (display, event);
483	GET_R->destroy ();
484	}
485
486	return 0;
487	}	441	}
488		442
489	/----------------------------------------------------------------------/	443	/----------------------------------------------------------------------/
490	/*	444	/*
491	* Exit gracefully, clearing the utmp entry and restoring tty attributes	445	* Exit gracefully, clearing the utmp entry and restoring tty attributes
492	* TODO: if debugging, this should free up any known resources if we can	446	* TODO: if debugging, this should free up any known resources if we can
493	*/	447	*/
494	/* EXTPROTO */
495	void	448	void
496	rxvt_clean_exit ()	449	rxvt_destroy_all ()
497	{	450	{
498	// TODO: rxvtd should clean up all ressources	451	// TODO: rxvtd should clean up all ressources
499	if (GET_R)	452	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		453	(*t)->destroy ();
		454	}
		455
		456	/*
		457	* Catch a fatal signal and tidy up before quitting
		458	*/
		459	void
		460	rxvt_term::sig_term (sig_watcher &w)
		461	{
		462	#ifdef DEBUG_CMD
		463	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
		464	#endif
		465	rxvt_destroy_all ();
		466	signal (w.signum, SIG_DFL);
		467	kill (getpid (), w.signum);
		468	}
		469
		470	/* INTPROTO */
		471	int
		472	rxvt_xerror_handler (Display display, XErrorEvent event)
		473	{
		474	if (GET_R->allowedxerror == -1)
		475	GET_R->allowedxerror = event->error_code;
		476	else
		477	{
		478	old_xerror_handler (display, event);
500	GET_R->destroy ();	479	GET_R->destroy ();
		480	}
		481
		482	return 0;
501	}	483	}
502		484
503	/* ------------------------------------------------------------------------- *	485	/* ------------------------------------------------------------------------- *
504	* MEMORY ALLOCATION WRAPPERS *	486	* MEMORY ALLOCATION WRAPPERS *
505	* ------------------------------------------------------------------------- */	487	* ------------------------------------------------------------------------- */
506	/* EXTPROTO */	488	void *
507	void *
508	rxvt_malloc (size_t size)	489	rxvt_malloc (size_t size)
509	{	490	{
510	void *p;
511
512	p = malloc (size);	491	void *p = malloc (size);
		492
513	if (p)	493	if (!p)
		494	rxvt_fatal ("memory allocation failure. aborting.\n");
		495
514	return p;	496	return p;
515
516	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
517	rxvt_clean_exit ();
518	exit (EXIT_FAILURE);
519	/* NOTREACHED */
520	}	497	}
521		498
522	/* EXTPROTO */	499	/* INTPROTO */
523	void *	500	void *
524	rxvt_calloc (size_t number, size_t size)	501	rxvt_calloc (size_t number, size_t size)
525	{	502	{
526	void *p;
527
528	p = calloc (number, size);	503	void *p = calloc (number, size);
		504
529	if (p)	505	if (!p)
		506	rxvt_fatal ("memory allocation failure. aborting.\n");
		507
530	return p;	508	return p;
531
532	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
533	rxvt_clean_exit ();
534	exit (EXIT_FAILURE);
535	/* NOTREACHED */
536	}	509	}
537		510
538	/* EXTPROTO */	511	/* INTPROTO */
539	void *	512	void *
540	rxvt_realloc (void *ptr, size_t size)	513	rxvt_realloc (void *ptr, size_t size)
541	{	514	{
542	void *p;
543
544	if (ptr)
545	p = realloc (ptr, size);	515	void *p = realloc (ptr, size);
546	else	516
547	p = malloc (size);
548	if (p)	517	if (!p)
		518	rxvt_fatal ("memory allocation failure. aborting.\n");
		519
549	return p;	520	return p;
550
551	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
552	rxvt_clean_exit ();
553	exit (EXIT_FAILURE);
554	/* NOTREACHED */
555	}	521	}
556		522
557	/* ------------------------------------------------------------------------- *	523	/* ------------------------------------------------------------------------- *
558	* PRIVILEGED OPERATIONS *	524	* PRIVILEGED OPERATIONS *
559	* ------------------------------------------------------------------------- */	525	* ------------------------------------------------------------------------- */
560	/* take care of suid/sgid super-user (root) privileges */	526	/* take care of suid/sgid super-user (root) privileges */
561	void	527	void
562	rxvt_term::privileges (int mode)	528	rxvt_privileges (rxvt_privaction action)
563	{	529	{
		530	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
		531	static uid_t euid;
		532	static gid_t egid;
		533	#endif
		534
564	#if ! defined(__CYGWIN32__)	535	#if ! defined(__CYGWIN32__)
565	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)	536	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
566	/* setreuid () is the poor man's setuid (), seteuid () */	537	/* setreuid () is the poor man's setuid (), seteuid () */
567	# define seteuid(a) setreuid(-1, (a))	538	# define seteuid(a) setreuid(-1, (a))
568	# define setegid(a) setregid(-1, (a))	539	# define setegid(a) setregid(-1, (a))
569	# define HAVE_SETEUID	540	# define HAVE_SETEUID
570	# endif	541	# endif
571	# ifdef HAVE_SETEUID	542	# ifdef HAVE_SETEUID
572	switch (mode)	543	switch (action)
573	{	544	{
574	case IGNORE:	545	case IGNORE:
575	/*	546	/*
576	* change effective uid/gid - not real uid/gid - so we can switch	547	* change effective uid/gid - not real uid/gid - so we can switch
577	* back to root later, as required	548	* back to root later, as required
…		…
587	seteuid (euid);	558	seteuid (euid);
588	setegid (egid);	559	setegid (egid);
589	break;	560	break;
590	}	561	}
591	# else	562	# else
592	switch (mode)	563	switch (action)
593	{	564	{
594	case IGNORE:	565	case IGNORE:
595	setuid (getuid ());	566	setuid (getuid ());
596	setgid (getgid ());	567	setgid (getgid ());
597	/* FALLTHROUGH */	568	/* FALLTHROUGH */
…		…
604	#endif	575	#endif
605	}	576	}
606		577
607	#ifdef UTMP_SUPPORT	578	#ifdef UTMP_SUPPORT
608	void	579	void
609	rxvt_term::privileged_utmp (char action)	580	rxvt_term::privileged_utmp (rxvt_privaction action)
610	{	581	{
611	D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
612	action, next_utmp_action, getpid ()));
613	if (next_utmp_action != action \|\| (action != SAVE && action != RESTORE)
614	\|\| (Options & Opt_utmpInhibit)	582	if ((options & Opt_utmpInhibit)
615	\|\| ttydev == NULL \|\| *ttydev == '\0')	583	\|\| !pty.name \|\| !*pty.name)
616	return;	584	return;
617		585
618	privileges (RESTORE);	586	rxvt_privileges (RESTORE);
		587
619	if (action == SAVE)	588	if (action == SAVE)
620	{
621	next_utmp_action = RESTORE;
622	makeutent (ttydev, rs[Rs_display_name]);	589	makeutent (pty.name, rs[Rs_display_name]);
623	}
624	else	590	else
625	{ /* action == RESTORE */
626	next_utmp_action = IGNORE;
627	cleanutent ();	591	cleanutent ();
628	}	592
629	privileges (IGNORE);	593	rxvt_privileges (IGNORE);
630	}
631	#endif
632
633	#ifndef NO_SETOWNER_TTYDEV
634	void
635	rxvt_term::privileged_ttydev (char action)
636	{
637	D_MAIN ((stderr,
638	"privileged_ttydev (%c); waiting for: %c (pid: %d)",
639	action, next_tty_action, getpid ()));
640	if (next_tty_action != action \|\| (action != SAVE && action != RESTORE)
641	\|\| ttydev == NULL \|\| *ttydev == '\0')
642	return;
643
644	privileges (RESTORE);
645
646	if (action == SAVE)
647	{
648	next_tty_action = RESTORE;
649	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
650	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
651	if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
652	next_tty_action = IGNORE;
653	else
654	# endif
655
656	{
657	chown (ttydev, getuid (), ttygid); /* fail silently */
658	chmod (ttydev, ttymode);
659	# ifdef HAVE_REVOKE
660	revoke (ttydev);
661	# endif
662
663	}
664	}
665	else
666	{ /* action == RESTORE */
667	next_tty_action = IGNORE;
668	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
669	chmod (ttydev, ttyfd_stat.st_mode);
670	chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
671	# else
672	chmod (ttydev,
673	(S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IWGRP \| S_IROTH \| S_IWOTH));
674	chown (ttydev, 0, 0);
675	# endif
676
677	}
678
679	privileges (IGNORE);
680
681	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
682	D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
683	action == RESTORE ? "Restoring" : (action ==
684	SAVE ? "Saving" :
685	"UNKNOWN ERROR for"), ttydev,
686	ttyfd_stat.st_mode, ttyfd_stat.st_uid,
687	ttyfd_stat.st_gid));
688	# endif
689	}	594	}
690	#endif	595	#endif
691		596
692	/----------------------------------------------------------------------/	597	/----------------------------------------------------------------------/
693	/*	598	/*
…		…
764		669
765	if (scrollbar_visible ())	670	if (scrollbar_visible ())
766	{	671	{
767	sb_w = scrollbar_TotalWidth ();	672	sb_w = scrollbar_TotalWidth ();
768	szHint.base_width += sb_w;	673	szHint.base_width += sb_w;
769	if (!(Options & Opt_scrollBar_right))	674	if (!(options & Opt_scrollBar_right))
770	window_vt_x += sb_w;	675	window_vt_x += sb_w;
771	}	676	}
772		677
773	if (menubar_visible ())	678	if (menubar_visible ())
774	{	679	{
…		…
802	{	707	{
803	MIN_IT (TermWin.height, max_height);	708	MIN_IT (TermWin.height, max_height);
804	szHint.height = szHint.base_height + TermWin.height;	709	szHint.height = szHint.base_height + TermWin.height;
805	}	710	}
806		711
807	if (scrollbar_visible () && (Options & Opt_scrollBar_right))	712	if (scrollbar_visible () && (options & Opt_scrollBar_right))
808	window_sb_x = szHint.width - sb_w;	713	window_sb_x = szHint.width - sb_w;
809		714
810	if (recalc_x)	715	if (recalc_x)
811	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))	716	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
812	- szHint.width - 2 * TermWin.ext_bwidth);	717	- szHint.width - 2 * TermWin.ext_bwidth);
…		…
828	* Called after a window size change.	733	* Called after a window size change.
829	*/	734	*/
830	void	735	void
831	rxvt_term::tt_winch ()	736	rxvt_term::tt_winch ()
832	{	737	{
		738	if (pty.pty < 0)
		739	return;
		740
833	struct winsize ws;	741	struct winsize ws;
834
835	if (cmd_fd < 0)
836	return;
837		742
838	ws.ws_col = TermWin.ncol;	743	ws.ws_col = TermWin.ncol;
839	ws.ws_row = TermWin.nrow;	744	ws.ws_row = TermWin.nrow;
840	ws.ws_xpixel = ws.ws_ypixel = 0;	745	ws.ws_xpixel = TermWin.width;
841	#ifndef DEBUG_SIZE	746	ws.ws_ypixel = TermWin.height;
842	(void)ioctl (cmd_fd, TIOCSWINSZ, &ws);	747	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
843	#else	748
844	if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)	749	#if 0
845	D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));	750	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
846	# ifdef SIGWINCH
847	else if (cmd_pid) /* force through to the command */	751	if (cmd_pid) /* force through to the command */
848	kill (cmd_pid, SIGWINCH);	752	kill (cmd_pid, SIGWINCH);
849	# endif
850	#endif	753	#endif
851	}	754	}
852		755
853	/----------------------------------------------------------------------/	756	/----------------------------------------------------------------------/
854	/* rxvt_change_font () - Switch to a new font */	757	/* set_fonts () - load and set the various fonts
855	/*	758	/*
856	* init = 1 - initialize	759	* init = 1 - initialize
857	*	760	*
858	* fontname == FONT_UP - switch to bigger font	761	* fontname == FONT_UP - switch to bigger font
859	* fontname == FONT_DN - switch to smaller font	762	* fontname == FONT_DN - switch to smaller font
860	*/	763	*/
861	bool	764	bool
862	rxvt_term::change_font (const char *fontname)	765	rxvt_term::set_fonts ()
863	{	766	{
864	if (fontname == FONT_UP)
865	{
866	// TODO
867	}
868	else if (fontname == FONT_DN)
869	{
870	// TODO
871	}
872	else
873	{
874	rxvt_fontset *fs = new rxvt_fontset (this);	767	rxvt_fontset *fs = new rxvt_fontset (this);
		768	rxvt_fontprop prop;
875		769
876	if (fs && fs->populate (fontname ? fontname : "fixed"))	770	if (!fs
		771	\|\| !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
		772	\|\| !fs->realize_font (1))
		773	{
		774	delete fs;
		775	return false;
		776	}
		777
		778	#if ENABLE_STYLES
		779	for (int i = RS_styleCount; --i; )
		780	if (TermWin.fontset[i] != TermWin.fontset[0])
		781	delete TermWin.fontset[i];
		782	#endif
		783
		784	delete TermWin.fontset[0];
		785	TermWin.fontset[0] = fs;
		786
		787	prop = (*fs)[1]->properties ();
		788	fs->set_prop (prop);
		789
		790	TermWin.fwidth = prop.width;
		791	TermWin.fheight = prop.height;
		792	TermWin.fweight = prop.weight;
		793	TermWin.fslant = prop.slant;
		794	TermWin.fbase = (*fs)[1]->ascent;
		795
		796	for (int style = 1; style < 4; style++)
		797	{
		798	#if ENABLE_STYLES
		799	const char *res = rs[Rs_font + style];
		800
		801	if (res && !*res)
		802	TermWin.fontset[style] = TermWin.fontset[0];
		803	else
877	{	804	{
878	delete TermWin.fontset;	805	TermWin.fontset[style] = fs = new rxvt_fontset (this);
879	TermWin.fontset = fs;	806	rxvt_fontprop prop2 = prop;
880	TermWin.fwidth = fs->base_font ()->width;
881	TermWin.fheight = fs->base_font ()->height;
882	TermWin.fbase = fs->base_font ()->ascent;
883		807
884	if (TermWin.parent[0])	808	if (res)
		809	prop2.weight = prop2.slant = rxvt_fontprop::unset;
		810	else
885	{	811	{
886	resize_all_windows (0, 0, 0);	812	res = TermWin.fontset[0]->fontdesc;
887	scr_remap_chars ();	813
888	scr_touch (true);	814	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
		815	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
889	}	816	}
890		817
891	return true;	818	fs->populate (res);
		819	fs->set_prop (prop2);
892	}	820	}
		821	#else
		822	TermWin.fontset[style] = TermWin.fontset[0];
		823	#endif
		824	}
		825
		826	if (TermWin.parent[0])
893	}	827	{
		828	resize_all_windows (0, 0, 0);
		829	scr_remap_chars ();
		830	scr_touch (true);
		831	}
894		832
895	return false;	833	return true;
896	}
897
898	bool
899	rxvt_term::font_up_down (int n, int direction)
900	{
901	return false;
902	}	834	}
903		835
904	/----------------------------------------------------------------------/	836	/----------------------------------------------------------------------/
905	/----------------------------------------------------------------------/	837	/----------------------------------------------------------------------/
906	/* xterm sequences - title, iconName, color (exptl) */	838	/* xterm sequences - title, iconName, color (exptl) */
…		…
911	char *name;	843	char *name;
912		844
913	if (!XFetchName (display->display, TermWin.parent[0], &name))	845	if (!XFetchName (display->display, TermWin.parent[0], &name))
914	name = NULL;	846	name = NULL;
915		847
916	if (name == NULL \|\| STRCMP (name, str))	848	if (name == NULL \|\| strcmp (name, str))
917	#endif	849	#endif
918	XStoreName (display->display, TermWin.parent[0], str);	850	XStoreName (display->display, TermWin.parent[0], str);
919		851
920	#ifdef SMART_WINDOW_TITLE	852	#ifdef SMART_WINDOW_TITLE
921	if (name)	853	if (name)
…		…
930	char *name;	862	char *name;
931		863
932	if (!XGetIconName (display->display, TermWin.parent[0], &name))	864	if (!XGetIconName (display->display, TermWin.parent[0], &name))
933	name = NULL;	865	name = NULL;
934		866
935	if (name == NULL \|\| STRCMP (name, str))	867	if (name == NULL \|\| strcmp (name, str))
936	#endif	868	#endif
937	XSetIconName (display->display, TermWin.parent[0], str);	869	XSetIconName (display->display, TermWin.parent[0], str);
938		870
939	#ifdef SMART_WINDOW_TITLE	871	#ifdef SMART_WINDOW_TITLE
940	if (name)	872	if (name)
…		…
958	i = atoi (color);	890	i = atoi (color);
959	if (i >= 8 && i <= 15)	891	if (i >= 8 && i <= 15)
960	{ /* bright colors */	892	{ /* bright colors */
961	i -= 8;	893	i -= 8;
962	# ifndef NO_BRIGHTCOLOR	894	# ifndef NO_BRIGHTCOLOR
963	PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];	895	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
964	SET_PIXCOLOR (idx);	896	SET_PIXCOLOR (idx);
965	goto Done;	897	goto Done;
966	# endif	898	# endif
967		899
968	}	900	}
969	if (i >= 0 && i <= 7)	901	if (i >= 0 && i <= 7)
970	{ /* normal colors */	902	{ /* normal colors */
971	PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];	903	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
972	SET_PIXCOLOR (idx);	904	SET_PIXCOLOR (idx);
973	goto Done;	905	goto Done;
974	}	906	}
975	}	907	}
976		908
977	if (!rXParseAllocColor (& xcol, color))	909	if (!rXParseAllocColor (& xcol, color))
978	return;	910	return;
979		911
980	/* XStoreColor (display->display, XCMAP, XColor); /	912	/* XStoreColor (display->display, display->cmap, XColor); /
981		913
982	/*	914	/*
983	* FIXME: should free colors here, but no idea how to do it so instead,	915	* FIXME: should free colors here, but no idea how to do it so instead,
984	* so just keep gobbling up the colormap	916	* so just keep gobbling up the colormap
985	*/	917	*/
986	# if 0	918	# if 0
987	for (i = Color_Black; i <= Color_White; i++)	919	for (i = Color_Black; i <= Color_White; i++)
988	if (PixColors[idx] == PixColors[i])	920	if (pix_colors[idx] == pix_colors[i])
989	break;	921	break;
990	if (i > Color_White)	922	if (i > Color_White)
991	{	923	{
992	/* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */	924	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
993	XFreeColors (display->display, XCMAP, (PixColors + idx), 1,	925	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
994	DisplayPlanes (display->display, display->screen));	926	DisplayPlanes (display->display, display->screen));
995	}	927	}
996	# endif	928	# endif
997		929
998	PixColorsFocused[idx] = xcol;	930	pix_colors_focused[idx] = xcol;
999	SET_PIXCOLOR (idx);	931	SET_PIXCOLOR (idx);
1000		932
1001	/* XSetWindowAttributes attr; */	933	/* XSetWindowAttributes attr; */
1002	/* Cursor cursor; */	934	/* Cursor cursor; */
1003	Done:	935	Done:
1004	#ifdef OFF_FOCUS_FADING	936	#ifdef OFF_FOCUS_FADING
		937	if (rs[Rs_fade])
1005	PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));	938	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
1006	#endif	939	#endif
1007	if (idx == Color_bg && ! (Options & Opt_transparent))
1008	XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1009		940
1010	/* handle Color_BD, scrollbar background, etc. */	941	/TODO: handle Color_BD, scrollbar background, etc. /
1011		942
1012	set_colorfgbg ();
1013	recolour_cursor ();	943	recolour_cursor ();
1014	scr_touch (true);	944	scr_recolour ();
1015	}	945	}
1016		946
1017	#else	947	#else
1018	# define set_window_color (idx,color) ((void)0)	948	# define set_window_color (idx,color) ((void)0)
1019	#endif /* XTERM_COLOR_CHANGE */	949	#endif /* XTERM_COLOR_CHANGE */
…		…
1021	void	951	void
1022	rxvt_term::recolour_cursor ()	952	rxvt_term::recolour_cursor ()
1023	{	953	{
1024	XColor xcol[2];	954	XColor xcol[2];
1025		955
1026	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];	956	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
1027	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];	957	? pix_colors_focused[Color_pointer_fg]
		958	: pix_colors_focused[Color_fg];
		959	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
		960	? pix_colors_focused[Color_pointer_bg]
		961	: pix_colors_focused[Color_bg];
		962
1028	XQueryColors (display->display, XCMAP, xcol, 2);	963	XQueryColors (display->display, display->cmap, xcol, 2);
1029	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);	964	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1030	}	965	}
1031		966
1032	/----------------------------------------------------------------------/	967	/----------------------------------------------------------------------/
1033	/*	968	/*
1034	* find if fg/bg matches any of the normal (low-intensity) colors	969	* find if fg/bg matches any of the normal (low-intensity) colors
1035	*/	970	*/
1036	void	971	void
1037	rxvt_term::set_colorfgbg ()	972	rxvt_term::set_colorfgbg ()
1038	{	973	{
1039	unsigned int i;	974	unsigned int i;
1040	const char *xpmb = "\0";	975	const char *xpmb = "\0";
1041	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	976	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1042		977
1043	env_colorfgbg =
1044	(char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);	978	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1045	STRCPY (fstr, "default");	979	strcpy (fstr, "default");
1046	STRCPY (bstr, "default");	980	strcpy (bstr, "default");
1047	for (i = Color_Black; i <= Color_White; i++)	981	for (i = Color_Black; i <= Color_White; i++)
1048	if (PixColors[Color_fg] == PixColors[i])	982	if (pix_colors[Color_fg] == pix_colors[i])
1049	{	983	{
1050	sprintf (fstr, "%d", (i - Color_Black));	984	sprintf (fstr, "%d", (i - Color_Black));
1051	break;	985	break;
1052	}	986	}
		987
1053	for (i = Color_Black; i <= Color_White; i++)	988	for (i = Color_Black; i <= Color_White; i++)
1054	if (PixColors[Color_bg] == PixColors[i])	989	if (pix_colors[Color_bg] == pix_colors[i])
1055	{	990	{
1056	sprintf (bstr, "%d", (i - Color_Black));	991	sprintf (bstr, "%d", (i - Color_Black));
1057	#ifdef XPM_BACKGROUND	992	#ifdef XPM_BACKGROUND
1058	xpmb = "default;";	993	xpmb = "default;";
1059	#endif	994	#endif
1060	break;	995	break;
1061	}	996	}
1062		997
1063	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	998	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1064
1065	#ifndef NO_BRIGHTCOLOR
1066	colorfgbg = DEFAULT_RSTYLE;
1067	for (i = minCOLOR; i <= maxCOLOR; i++)
1068	{
1069	if (PixColors[Color_fg] == PixColors[i])
1070	colorfgbg = SET_FGCOLOR (colorfgbg, i);
1071	if (PixColors[Color_bg] == PixColors[i])
1072	colorfgbg = SET_BGCOLOR (colorfgbg, i);
1073	}
1074	#endif
1075	}	999	}
1076		1000
1077	/----------------------------------------------------------------------/	1001	/----------------------------------------------------------------------/
1078	/*	1002	/*
1079	* Colour determination for low colour displays, routine from	1003	* Colour determination for low colour displays, routine from
…		…
1227	if (width == 0)	1151	if (width == 0)
1228	width = wattr.width - szHint.base_width;	1152	width = wattr.width - szHint.base_width;
1229	if (height == 0)	1153	if (height == 0)
1230	height = wattr.height - szHint.base_height;	1154	height = wattr.height - szHint.base_height;
1231	}	1155	}
		1156
1232	if (width != TermWin.width \|\| height != TermWin.height)	1157	if (width != TermWin.width \|\| height != TermWin.height)
1233	{	1158	{
1234	width += szHint.base_width;	1159	width += szHint.base_width;
1235	height += szHint.base_height;	1160	height += szHint.base_height;
1236	resize_all_windows (width, height, 0);	1161	resize_all_windows (width, height, 0);
…		…
1241	* - X INPUT METHOD ROUTINES - *	1166	* - X INPUT METHOD ROUTINES - *
1242	* -------------------------------------------------------------------- */	1167	* -------------------------------------------------------------------- */
1243	#ifdef USE_XIM	1168	#ifdef USE_XIM
1244		1169
1245	void	1170	void
		1171	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
		1172	{
		1173	fg = pix_colors[Color_fg];
		1174	bg = pix_colors[Color_bg];
		1175	}
		1176
		1177	void
1246	rxvt_term::im_set_size (XRectangle *size)	1178	rxvt_term::im_set_size (XRectangle &size)
1247	{	1179	{
		1180	// the int_bwidth terms make no sense to me
1248	size->x = TermWin.int_bwidth;	1181	size.x = TermWin.int_bwidth;
1249	size->y = TermWin.int_bwidth;	1182	size.y = TermWin.int_bwidth;
1250	size->width = Width2Pixel (TermWin.ncol);	1183	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1251	size->height = Height2Pixel (TermWin.nrow);	1184	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1252	}	1185	}
1253		1186
1254	void	1187	void
1255	rxvt_term::im_set_color (unsigned long fg, unsigned long bg)	1188	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
		1189	XRectangle &status_rect,
		1190	const XRectangle &needed_rect)
1256	{	1191	{
1257	*fg = PixColors[Color_fg];	1192	preedit_rect.x = needed_rect.width;
1258	*bg = PixColors[Color_bg];	1193	preedit_rect.y = 0;
		1194	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
		1195	preedit_rect.height = TermWin.fheight;
		1196
		1197	status_rect.x = 0;
		1198	status_rect.y = 0;
		1199	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
		1200	status_rect.height = TermWin.fheight;
1259	}	1201	}
1260		1202
1261	/* Checking whether input method is running. */	1203	/* Checking whether input method is running. */
1262	bool	1204	bool
1263	rxvt_term::IMisRunning ()	1205	rxvt_term::IMisRunning ()
1264	{	1206	{
1265	char *p;	1207	char *p;
1266	Atom atom;	1208	Atom atom;
1267	Window win;	1209	Window win;
1268	char server[IMBUFSIZ];	1210	char server[IMBUFSIZ];
1269		1211
1270	/* get current locale modifier */	1212	/* get current locale modifier */
1271	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1213	if ((p = XSetLocaleModifiers (NULL)) != NULL)
1272	{	1214	{
1273	STRCPY (server, "@server=");	1215	strcpy (server, "@server=");
1274	STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1216	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
		1217
1275	if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */	1218	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1276	*p = '\0';	1219	*p = '\0';
1277		1220
1278	atom = XInternAtom (display->display, server, False);	1221	atom = XInternAtom (display->display, server, False);
1279	win = XGetSelectionOwner (display->display, atom);	1222	win = XGetSelectionOwner (display->display, atom);
		1223
1280	if (win != None)	1224	if (win != None)
1281	return True;	1225	return True;
1282	}	1226	}
		1227
1283	return False;	1228	return False;
1284	}	1229	}
1285		1230
1286	void	1231	void
1287	rxvt_term::IMSendSpot ()	1232	rxvt_term::IMSendSpot ()
1288	{	1233	{
1289	XPoint spot;	1234	XPoint nspot;
1290	XVaNestedList preedit_attr;	1235	XVaNestedList preedit_attr;
1291		1236
1292	if (Input_Context == NULL	1237	if (!Input_Context
		1238	\|\| !TermWin.focus
1293	\|\| !TermWin.focus \|\| ! (input_style & XIMPreeditPosition)	1239	\|\| !(input_style & XIMPreeditPosition))
1294	\|\| ! (event_type == KeyPress
1295	\|\| event_type == Expose
1296	\|\| event_type == NoExpose
1297	\|\| event_type == SelectionNotify
1298	\|\| event_type == ButtonRelease \|\| event_type == FocusIn)
1299	\|\| !IMisRunning ())
1300	return;	1240	return;
1301		1241
1302	im_set_position (&spot);	1242	im_set_position (nspot);
		1243
		1244	if (nspot.x == spot.x && nspot.y == spot.y)
		1245	return;
		1246
		1247	spot = nspot;
1303		1248
1304	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);	1249	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1305	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);	1250	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1306	XFree (preedit_attr);	1251	XFree (preedit_attr);
1307	}	1252	}
1308		1253
1309	void	1254	void
1310	rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1311	XRectangle * needed_rect)
1312	{
1313	int mbh, vtx = 0;
1314
1315	if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1316	vtx = scrollbar_TotalWidth ();
1317
1318	mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1319	mbh -= TermWin.lineSpace;
1320
1321	preedit_rect->x = needed_rect->width + vtx;
1322	preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1323
1324	preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1325	preedit_rect->height = Height2Pixel (1);
1326
1327	status_rect->x = vtx;
1328	status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1329
1330	status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1331	status_rect->height = Height2Pixel (1);
1332	}
1333
1334	void
1335	rxvt_term::im_destroy ()	1255	rxvt_term::im_destroy ()
1336	{	1256	{
1337	if (Input_Context)
1338	{
1339	XDestroyIC (Input_Context);
1340	Input_Context = NULL;
1341	}
1342
1343	if (input_method)	1257	if (input_method)
1344	{	1258	{
		1259	if (Input_Context && input_method->xim)
		1260	XDestroyIC (Input_Context);
		1261
1345	display->put_xim (input_method);	1262	display->put_xim (input_method);
1346	input_method = 0;	1263	input_method = 0;
1347	}	1264	}
		1265
		1266	Input_Context = 0;
1348	}	1267	}
1349		1268
1350	/*	1269	/*
1351	* Try to open a XIM with the current modifiers, then see if we can	1270	* Try to open a XIM with the current modifiers, then see if we can
1352	* open a suitable preedit type	1271	* open a suitable preedit type
1353	*/	1272	*/
1354	bool	1273	bool
1355	rxvt_term::IM_get_IC (const char *modifiers)	1274	rxvt_term::IM_get_IC (const char *modifiers)
1356	{	1275	{
1357	int i, j, found;	1276	int i, j, found;
1358	XIM xim;	1277	XIM xim;
1359	XPoint spot;	1278	XPoint spot;
1360	XRectangle rect, status_rect, needed_rect;	1279	XRectangle rect, status_rect, needed_rect;
1361	unsigned long fg, bg;	1280	unsigned long fg, bg;
1362	const char *p;	1281	const char *p;
1363	char **s;	1282	char **s;
1364	XIMStyles *xim_styles;	1283	XIMStyles *xim_styles;
1365	XVaNestedList preedit_attr, status_attr;
1366		1284
1367	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1285	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1368	return false;	1286	return false;
1369		1287
1370	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1288	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1371	input_method = display->get_xim (locale, modifiers);	1289	input_method = display->get_xim (locale, modifiers);
1372	if (input_method == NULL)	1290	if (input_method == NULL)
1373	return false;	1291	return false;
1374		1292
1375	xim = input_method->xim;	1293	xim = input_method->xim;
		1294	spot.x = spot.y = -1;
1376		1295
1377	xim_styles = NULL;	1296	xim_styles = NULL;
1378	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)	1297	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1379	\|\| !xim_styles \|\| !xim_styles->count_styles)	1298	\|\| !xim_styles \|\| !xim_styles->count_styles)
1380	{	1299	{
1381	display->put_xim (input_method);	1300	im_destroy ();
1382	return false;	1301	return false;
1383	}	1302	}
1384		1303
1385	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";	1304	const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
		1305
		1306	for (int pi = 0; pi < 2; pi++)
		1307	{
		1308	p = pet[pi];
		1309
		1310	if (!p)
		1311	continue;
		1312
1386	s = rxvt_splitcommastring (p);	1313	s = rxvt_splitcommastring (p);
		1314
1387	for (i = found = 0; !found && s[i]; i++)	1315	for (i = found = 0; !found && s[i]; i++)
1388	{	1316	{
1389	if (!STRCMP (s[i], "OverTheSpot"))	1317	if (!strcmp (s[i], "OverTheSpot"))
1390	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1318	input_style = (XIMPreeditPosition \| XIMStatusNothing);
1391	else if (!STRCMP (s[i], "OffTheSpot"))	1319	else if (!strcmp (s[i], "OffTheSpot"))
1392	input_style = (XIMPreeditArea \| XIMStatusArea);	1320	input_style = (XIMPreeditArea \| XIMStatusArea);
1393	else if (!STRCMP (s[i], "Root"))	1321	else if (!strcmp (s[i], "Root"))
1394	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1322	input_style = (XIMPreeditNothing \| XIMStatusNothing);
		1323	else if (!strcmp (s[i], "None"))
		1324	input_style = (XIMPreeditNone \| XIMStatusNone);
1395		1325
1396	for (j = 0; j < xim_styles->count_styles; j++)	1326	for (j = 0; j < xim_styles->count_styles; j++)
1397	if (input_style == xim_styles->supported_styles[j])	1327	if (input_style == xim_styles->supported_styles[j])
1398	{	1328	{
		1329	rxvt_freecommastring (s);
		1330
1399	found = 1;	1331	found = 1;
1400	break;	1332	goto foundpet;
		1333	}
		1334
1401	}	1335	}
1402	}
1403		1336
1404	for (i = 0; s[i]; i++)	1337	rxvt_freecommastring (s);
1405	free (s[i]);	1338	}
1406		1339
1407	free (s);	1340	foundpet:
		1341
1408	XFree (xim_styles);	1342	XFree (xim_styles);
1409		1343
1410	if (!found)	1344	if (!found)
1411	{	1345	{
1412	display->put_xim (input_method);	1346	im_destroy ();
1413	return false;	1347	return false;
1414	}	1348	}
1415		1349
1416	preedit_attr = status_attr = NULL;	1350	XFontSet fs = 0;
		1351	XVaNestedList preedit_attr = 0, status_attr = 0;
		1352
		1353	if (input_style & (XIMPreeditPosition \| XIMPreeditArea))
		1354	{
		1355	// fake us a font-set, please
		1356	char **missing_charset_list;
		1357	int missing_charset_count;
		1358	char *def_string;
		1359	char pat[512];
		1360
		1361	sprintf (pat,
		1362	"----R---%d------*,"
		1363	"----R---%d------*,"
		1364	"----R---%d------*,"
		1365	"----R---%d------*,"
		1366	"----R---%d------*,"
		1367	"*",
		1368	TermWin.fheight,
		1369	TermWin.fheight + 1, TermWin.fheight - 1,
		1370	TermWin.fheight - 2, TermWin.fheight + 2);
		1371
		1372	fs = XCreateFontSet (display->display, pat,
		1373	&missing_charset_list, &missing_charset_count, &def_string);
		1374
		1375	if (missing_charset_list)
		1376	XFreeStringList (missing_charset_list);
		1377
		1378	if (!fs)
		1379	{
		1380	input_style &= ~(XIMPreeditPosition \| XIMPreeditArea);
		1381	rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
		1382	}
		1383	}
1417		1384
1418	if (input_style & XIMPreeditPosition)	1385	if (input_style & XIMPreeditPosition)
1419	{	1386	{
1420	im_set_size (&rect);	1387	im_set_size (rect);
1421	im_set_position (&spot);	1388	im_set_position (spot);
1422	im_set_color (&fg, &bg);	1389	im_set_color (fg, bg);
1423		1390
1424	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1391	preedit_attr = XVaCreateNestedList (0,
		1392	XNForeground, fg,
		1393	XNBackground, bg,
		1394	XNArea, &rect,
1425	XNSpotLocation, &spot,	1395	XNSpotLocation, &spot,
1426	XNForeground, fg, XNBackground, bg,
1427	//XNFontSet, TermWin.fontset,	1396	XNFontSet, fs,
1428	NULL);	1397	NULL);
1429	}	1398	}
1430	else if (input_style & XIMPreeditArea)	1399	else if (input_style & XIMPreeditArea)
1431	{	1400	{
1432	im_set_color (&fg, &bg);	1401	im_set_color (fg, bg);
1433		1402
1434	/*	1403	/*
1435	* The necessary width of preedit area is unknown	1404	* The necessary width of preedit area is unknown
1436	* until create input context.	1405	* until create input context.
1437	*/	1406	*/
1438	needed_rect.width = 0;	1407	needed_rect.width = 0;
1439
1440	im_set_preedit_area (&rect, &status_rect, &needed_rect);	1408	im_set_preedit_area (rect, status_rect, needed_rect);
1441		1409
1442	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1410	preedit_attr = XVaCreateNestedList (0,
		1411	XNForeground, fg,
1443	XNForeground, fg, XNBackground, bg,	1412	XNBackground, bg,
		1413	XNArea, &rect,
		1414	XNFontSet, fs,
		1415	NULL);
		1416	status_attr = XVaCreateNestedList (0,
		1417	XNForeground, fg,
		1418	XNBackground, bg,
		1419	XNArea, &status_rect,
1444	//XNFontSet, TermWin.fontset,	1420	XNFontSet, fs,
1445	NULL);	1421	NULL);
1446	status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1447	XNForeground, fg, XNBackground, bg,
1448	//XNFontSet, TermWin.fontset,
1449	NULL);
1450	}	1422	}
1451		1423
1452	Input_Context = XCreateIC (xim, XNInputStyle, input_style,	1424	Input_Context = XCreateIC (xim,
		1425	XNInputStyle, input_style,
1453	XNClientWindow, TermWin.parent[0],	1426	XNClientWindow, TermWin.vt,
1454	XNFocusWindow, TermWin.parent[0],	1427	XNFocusWindow, TermWin.parent[0],
1455	preedit_attr ? XNPreeditAttributes : NULL,	1428	preedit_attr ? XNPreeditAttributes : NULL,
1456	preedit_attr,	1429	preedit_attr,
1457	status_attr ? XNStatusAttributes : NULL,	1430	status_attr ? XNStatusAttributes : NULL,
1458	status_attr, NULL);	1431	status_attr, NULL);
		1432
1459	if (preedit_attr) XFree (preedit_attr);	1433	if (preedit_attr) XFree (preedit_attr);
1460	if (status_attr) XFree (status_attr);	1434	if (status_attr) XFree (status_attr);
		1435	if (fs) XFreeFontSet (display->display, fs);
1461		1436
1462	if (Input_Context == NULL)	1437	if (Input_Context == NULL)
1463	{	1438	{
1464	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1439	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1465	display->put_xim (input_method);	1440	im_destroy ();
1466	return false;	1441	return false;
1467	}	1442	}
1468		1443
1469	if (input_style & XIMPreeditArea)	1444	if (input_style & XIMPreeditArea)
1470	IMSetStatusPosition ();	1445	IMSetStatusPosition ();
…		…
1496	if (p && *p)	1471	if (p && *p)
1497	{	1472	{
1498	bool found = false;	1473	bool found = false;
1499		1474
1500	s = rxvt_splitcommastring (p);	1475	s = rxvt_splitcommastring (p);
		1476
1501	for (i = 0; s[i]; i++)	1477	for (i = 0; s[i]; i++)
1502	{	1478	{
1503	if (*s[i])	1479	if (*s[i])
1504	{	1480	{
1505	STRCPY (buf, "@im=");	1481	strcpy (buf, "@im=");
1506	STRNCAT (buf, s[i], IMBUFSIZ - 5);	1482	strncat (buf, s[i], IMBUFSIZ - 5);
1507	if (IM_get_IC (buf))	1483	if (IM_get_IC (buf))
1508	{	1484	{
1509	found = true;	1485	found = true;
1510	break;	1486	break;
1511	}	1487	}
1512	}	1488	}
1513	}	1489	}
1514	for (i = 0; s[i]; i++)	1490
1515	free (s[i]);	1491	rxvt_freecommastring (s);
1516	free (s);
1517		1492
1518	if (found)	1493	if (found)
1519	goto done;	1494	goto done;
1520	}	1495	}
1521		1496
…		…
1535	}	1510	}
1536		1511
1537	void	1512	void
1538	rxvt_term::IMSetStatusPosition ()	1513	rxvt_term::IMSetStatusPosition ()
1539	{	1514	{
1540	XRectangle preedit_rect, status_rect, *needed_rect;	1515	XRectangle preedit_rect, status_rect, *needed_rect;
1541	XVaNestedList preedit_attr, status_attr;	1516	XVaNestedList preedit_attr, status_attr;
1542		1517
1543	if (Input_Context == NULL	1518	if (!Input_Context
		1519	\|\| !TermWin.focus
1544	\|\| !TermWin.focus \|\| ! (input_style & XIMPreeditArea)	1520	\|\| !(input_style & XIMPreeditArea)
1545	\|\| !IMisRunning ())	1521	\|\| !IMisRunning ())
1546	return;	1522	return;
1547		1523
1548	/* Getting the necessary width of preedit area */	1524	/* Getting the necessary width of preedit area */
1549	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1525	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1550	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1526	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1551	XFree (status_attr);	1527	XFree (status_attr);
1552		1528
1553	im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);	1529	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
		1530	XFree (needed_rect);
1554		1531
1555	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1532	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1556	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1533	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1557		1534
1558	XSetICValues (Input_Context,	1535	XSetICValues (Input_Context,
1559	XNPreeditAttributes, preedit_attr,	1536	XNPreeditAttributes, preedit_attr,
1560	XNStatusAttributes, status_attr, NULL);	1537	XNStatusAttributes, status_attr, NULL);
1561		1538
1562	XFree (preedit_attr);	1539	XFree (preedit_attr);
1563	XFree (status_attr);	1540	XFree (status_attr);
1564	}	1541	}
1565	#endif /* USE_XIM */	1542	#endif /* USE_XIM */

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.73 by root, Fri Jul 30 14:59:12 2004 UTC vs. Revision 1.117 by root, Mon Nov 29 01:20:42 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.73 by root, Fri Jul 30 14:59:12 2004 UTC vs.
Revision 1.117 by root, Mon Nov 29 01:20:42 2004 UTC