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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.359 by sf-exg, Fri Jul 29 09:41:22 2011 UTC vs.
Revision 1.403 by root, Thu Jun 17 00:49:20 2021 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>	16	* Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
		17	* Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
17	*	18	*
18	* This program is free software; you can redistribute it and/or modify	19	* 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	20	* 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	21	* the Free Software Foundation; either version 3 of the License, or
21	* (at your option) any later version.	22	* (at your option) any later version.
22	*	23	*
23	* This program is distributed in the hope that it will be useful,	24	* This program is distributed in the hope that it will be useful,
24	* but WITHOUT ANY WARRANTY; without even the implied warranty of	25	* but WITHOUT ANY WARRANTY; without even the implied warranty of
25	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	26	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
…		…
36	#include "keyboard.h"	37	#include "keyboard.h"
37	#include "rxvtperl.h"	38	#include "rxvtperl.h"
38		39
39	#include <limits>	40	#include <limits>
40		41
41	#include <cassert>	42	#include <assert.h>
42	#include <csignal>	43	#include <signal.h>
43	#include <cstring>	44	#include <string.h>
44		45
45	#include <termios.h>	46	#include <termios.h>
46		47
47	#ifdef HAVE_XSETLOCALE	48	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	49	# define X_LOCALE
49	# include <X11/Xlocale.h>	50	# include <X11/Xlocale.h>
50	#else	51	#else
51	# ifdef HAVE_SETLOCALE
52	# include <clocale>	52	# include <locale.h>
53	# endif
54	#endif	53	#endif
55		54
56	struct termios rxvt_term::def_tio;	55	struct termios rxvt_term::def_tio;
57	vector<rxvt_term *> rxvt_term::termlist;	56	vector<rxvt_term *> rxvt_term::termlist;
58		57
…		…
60	rxvt_t rxvt_current_term;	59	rxvt_t rxvt_current_term;
61		60
62	static char curlocale[128], savelocale[128];	61	static char curlocale[128], savelocale[128];
63		62
64	bool	63	bool
65	rxvt_set_locale (const char *locale) NOTHROW	64	rxvt_set_locale (const char *locale) noexcept
66	{	65	{
67	int size = strlen (locale) + 1;	66	int size = strlen (locale) + 1;
68		67
69	if (size > sizeof (curlocale))	68	if (size > sizeof (curlocale))
70	rxvt_fatal ("locale string too long, aborting.\n");	69	rxvt_fatal ("locale string too long, aborting.\n");
…		…
76	setlocale (LC_CTYPE, curlocale);	75	setlocale (LC_CTYPE, curlocale);
77	return true;	76	return true;
78	}	77	}
79		78
80	void	79	void
81	rxvt_push_locale (const char *locale) NOTHROW	80	rxvt_push_locale (const char *locale) noexcept
82	{	81	{
83	strcpy (savelocale, curlocale);	82	strcpy (savelocale, curlocale);
84	rxvt_set_locale (locale);	83	rxvt_set_locale (locale);
85	}	84	}
86		85
87	void	86	void
88	rxvt_pop_locale () NOTHROW	87	rxvt_pop_locale () noexcept
89	{	88	{
90	rxvt_set_locale (savelocale);	89	rxvt_set_locale (savelocale);
91	}	90	}
92		91
93	#if ENABLE_COMBINING	92	#if ENABLE_COMBINING
…		…
125	v.push_back (compose_char (c1, c2));	124	v.push_back (compose_char (c1, c2));
126		125
127	return v.size () - 1 + COMPOSE_LO;	126	return v.size () - 1 + COMPOSE_LO;
128	}	127	}
129		128
		129	template<typename T>
130	int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)	130	int rxvt_composite_vec::expand (unicode_t c, T *r)
131	{	131	{
132	compose_char cc = (this)[c];	132	compose_char cc = (this)[c];
133		133
134	if (!cc)	134	if (!cc)
135	{	135	{
…		…
146	len++;	146	len++;
147	if (r) *r++ = cc->c2;	147	if (r) *r++ = cc->c2;
148	}	148	}
149		149
150	return len;	150	return len;
151
152	}	151	}
		152
		153	template int rxvt_composite_vec::expand<text_t> (unicode_t c, text_t *);
		154	template int rxvt_composite_vec::expand<wchar_t> (unicode_t c, wchar_t *);
153	#endif	155	#endif
154		156
155	rxvt_term::rxvt_term ()	157	rxvt_term::rxvt_term ()
156	{	158	{
157	#if HAVE_BG_PIXMAP
158	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
159	#endif
160	#ifdef CURSOR_BLINK	159	#ifdef CURSOR_BLINK
161	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);	160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
162	#endif	161	#endif
163	#ifdef TEXT_BLINK	162	#ifdef TEXT_BLINK
164	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);	163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
…		…
170	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);	169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171	#endif	170	#endif
172	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)	171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);	172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174	#endif	173	#endif
175	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_PERL
176	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177	#endif	176	#endif
178	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179	#ifdef USE_XIM	178	#if USE_XIM
180	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181	#endif	180	#endif
182	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
183	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184	#endif	183	#endif
…		…
224	if (fontset[i] != fontset[0])	223	if (fontset[i] != fontset[0])
225	delete fontset[i];	224	delete fontset[i];
226	#endif	225	#endif
227	delete fontset[0];	226	delete fontset[0];
228		227
229	#ifdef HAVE_BG_PIXMAP	228	#if HAVE_IMG
230	bg_destroy ();	229	delete bg_img;
231	#endif	230	#endif
232		231
233	if (display)	232	if (display)
234	{	233	{
235	selection_clear ();	234	selection_clear ();
236	selection_clear (true);	235	selection_clear (true);
237		236
238	#ifdef USE_XIM	237	#if USE_XIM
239	im_destroy ();	238	im_destroy ();
240	#endif	239	#endif
241	scrollBar.destroy ();	240	scrollBar.destroy ();
		241
		242	if (gc)
242	if (gc) XFreeGC (dpy, gc);	243	XFreeGC (dpy, gc);
243		244
244	delete drawable;	245	delete drawable;
		246
245	// destroy all windows	247	// destroy all windows
246	if (parent)	248	if (parent)
247	XDestroyWindow (dpy, parent);	249	XDestroyWindow (dpy, parent);
248		250
249	for (int i = 0; i < TOTAL_COLORS; i++)	251	for (int i = 0; i < TOTAL_COLORS; i++)
250	if (ISSET_PIXCOLOR (i))	252	if (ISSET_PIXCOLOR (i))
251	{	253	{
252	pix_colors_focused [i].free (this);	254	pix_colors_focused [i].free (this);
253	#if OFF_FOCUS_FADING	255	#if OFF_FOCUS_FADING
		256	if (rs[Rs_fade])
254	pix_colors_unfocused [i].free (this);	257	pix_colors_unfocused [i].free (this);
255	#endif	258	#endif
256	}	259	}
257		260
258	clear ();	261	clear ();
259		262
…		…
267	for (int i = 0; i < allocated.size (); i++)	270	for (int i = 0; i < allocated.size (); i++)
268	free (allocated [i]);	271	free (allocated [i]);
269		272
270	free (selection.text);	273	free (selection.text);
271	free (selection.clip_text);	274	free (selection.clip_text);
272	// TODO: manage env vars in child only(!)
273	free (env_display);
274	free (env_term);
275	free (locale);	275	free (locale);
276	free (v_buffer);	276	free (v_buffer);
277		277
278	delete selection_req;	278	delete selection_req;
279		279
		280	if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
		281	rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
		282
		283	delete [] env;
		284
280	delete envv;	285	delete envv;
281	delete argv;	286	delete argv;
282		287
283	#ifdef KEYSYM_RESOURCE	288	#ifdef KEYSYM_RESOURCE
284	delete keyboard;	289	delete keyboard;
285	#endif	290	#endif
286	#ifndef NO_RESOURCES	291	#ifndef NO_RESOURCES
287	XrmDestroyDatabase (option_db);	292	XrmDestroyDatabase (option_db);
288	#endif	293	#endif
		294
		295	SET_R ((rxvt_term *)0);
289	}	296	}
290		297
291	// child has exited, usually destroys	298	// child has exited, usually destroys
292	void	299	void
293	rxvt_term::child_cb (ev::child &w, int status)	300	rxvt_term::child_cb (ev::child &w, int status)
…		…
316	{	323	{
317	#if USE_XIM	324	#if USE_XIM
318	im_ev.stop (display);	325	im_ev.stop (display);
319	#endif	326	#endif
320	scrollbar_ev.stop (display);	327	scrollbar_ev.stop (display);
321	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	328	#if ENABLE_PERL
322	rootwin_ev.stop (display);	329	rootwin_ev.stop (display);
323	#endif	330	#endif
324	termwin_ev.stop (display);	331	termwin_ev.stop (display);
325	vt_ev.stop (display);	332	vt_ev.stop (display);
326	}	333	}
…		…
353		360
354	delete this;	361	delete this;
355	}	362	}
356		363
357	void	364	void
358	rxvt_term::set_option (uint8_t opt, bool set)	365	rxvt_term::set_option (uint8_t opt, bool set) noexcept
359	{	366	{
360	if (!opt)	367	if (!opt)
361	return;	368	return;
362		369
363	uint8_t mask = 1 << (opt & 7);	370	uint8_t mask = 1 << (opt & 7);
…		…
367	}	374	}
368		375
369	/----------------------------------------------------------------------/	376	/----------------------------------------------------------------------/
370	/*	377	/*
371	* Exit gracefully, clearing the utmp entry and restoring tty attributes	378	* Exit gracefully, clearing the utmp entry and restoring tty attributes
372	* TODO: if debugging, this should free up any known resources if we can
373	*/	379	*/
374	static XErrorHandler old_xerror_handler;	380	static XErrorHandler old_xerror_handler;
375		381
376	static void	382	static void
377	rxvt_emergency_cleanup ()	383	rxvt_emergency_cleanup ()
…		…
379	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	385	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380	(*t)->emergency_cleanup ();	386	(*t)->emergency_cleanup ();
381	}	387	}
382		388
383	#if !ENABLE_MINIMAL	389	#if !ENABLE_MINIMAL
384	static void	390	static void ecb_cold
385	print_x_error (Display dpy, XErrorEvent event)	391	print_x_error (Display dpy, XErrorEvent event)
386	{	392	{
387	char buffer[BUFSIZ];	393	char buffer[BUFSIZ];
388	char mesg[BUFSIZ];	394	char mesg[BUFSIZ];
389	char number[32];	395	char number[32];
390	const char mtype[] = "XlibMessage";	396
391	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
392	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
393	rxvt_warn ("An X Error occurred, trying to continue after report.\n");	397	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
		398
		399	XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
		400	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
		401
		402	XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
		403	XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
394	rxvt_warn ("%s: %s\n", mesg, buffer);	404	rxvt_warn ("+ %s: %s\n", mesg, buffer);
		405
395	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	406	XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
396	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	407	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
		408
		409	if (event->request_code >= 128)
		410	{
		411	#if 0
		412	/* XListExtensions and probably query extensions hangs when there are multiple queues errors */
		413	int nexts;
		414	char **exts = XListExtensions (dpy, &nexts);
		415
		416	while (nexts)
		417	{
		418	char *extname = exts [nexts - 1];
		419	int major, first_event, first_error;
		420
		421	if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
		422	{
		423	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		424	rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
		425
		426	snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
		427	XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
		428	rxvt_warn ("+ (which is %s)\n", buffer);
		429
		430	break;
		431	}
		432
		433	printf ("nextss %d %s\n", nexts, extname);//D
		434	--nexts;
		435	++exts;
		436	}
		437	#else
		438	int nexts = 0;
		439	char **exts = 0;
		440	#endif
		441
		442	if (!nexts)
		443	{
		444	rxvt_warn ("+ (which is an unknown extension)\n", buffer);
		445
		446	XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
		447	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
		448
		449	#if 0
		450	sprintf (number, "RENDER.%d", event->minor_code);
		451	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
		452	rxvt_warn ("+ (which is %s)\n", buffer);
		453	#endif
		454	}
		455
		456	XFreeExtensionList (exts);
		457	}
		458	else
		459	{
397	sprintf(number, "%d", event->request_code);	460	sprintf (number, "%d", event->request_code);
398	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	461	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
399	rxvt_warn ("(which is %s)\n", buffer);	462	rxvt_warn ("+ (which is %s)\n", buffer);
400	if (event->request_code >= 128) {
401	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
402	mesg, BUFSIZ);
403	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
404	}	463	}
		464
405	if ((event->error_code == BadWindow) \|\|	465	if (event->error_code == BadWindow
406	(event->error_code == BadPixmap) \|\|	466	\|\| event->error_code == BadPixmap
407	(event->error_code == BadCursor) \|\|	467	\|\| event->error_code == BadCursor
408	(event->error_code == BadFont) \|\|	468	\|\| event->error_code == BadFont
409	(event->error_code == BadDrawable) \|\|	469	\|\| event->error_code == BadDrawable
410	(event->error_code == BadColor) \|\|	470	\|\| event->error_code == BadColor
411	(event->error_code == BadGC) \|\|	471	\|\| event->error_code == BadGC
412	(event->error_code == BadIDChoice) \|\|	472	\|\| event->error_code == BadIDChoice
413	(event->error_code == BadValue) \|\|	473	\|\| event->error_code == BadValue
414	(event->error_code == BadAtom)) {	474	\|\| event->error_code == BadAtom)
		475	{
415	if (event->error_code == BadValue)	476	if (event->error_code == BadValue)
416	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	477	XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
417	mesg, BUFSIZ);
418	else if (event->error_code == BadAtom)	478	else if (event->error_code == BadAtom)
419	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	479	XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
420	mesg, BUFSIZ);
421	else	480	else
422	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	481	XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
423	mesg, BUFSIZ);
424	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
425	}
426	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
427	mesg, BUFSIZ);
428	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
429	}
430	#endif
431		482
432	int	483	snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
		484	}
		485	}
		486	#endif
		487
		488	int ecb_cold
433	rxvt_xerror_handler (Display display, XErrorEvent event)	489	rxvt_xerror_handler (Display display, XErrorEvent event)
434	{	490	{
435	if (GET_R->allowedxerror == -1)	491	if (GET_R && GET_R->allowedxerror == -1)
436	GET_R->allowedxerror = event->error_code;	492	GET_R->allowedxerror = event->error_code;
437	else	493	else
438	{	494	{
439	// GET_R is most likely not the terminal which caused the error,	495	// GET_R is most likely not the terminal which caused the error,
440	// so just output the error and continue	496	// so just output the error and continue
…		…
446	}	502	}
447		503
448	return 0;	504	return 0;
449	}	505	}
450		506
451	int	507	int ecb_cold
452	rxvt_xioerror_handler (Display *display)	508	rxvt_xioerror_handler (Display *display)
453	{	509	{
454	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",	510	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
455	DisplayString (display));	511	DisplayString (display));
456	rxvt_emergency_cleanup ();	512	rxvt_emergency_cleanup ();
…		…
576	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	632	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
577	// TODO: handle this with exceptions and tolerate the memory loss	633	// TODO: handle this with exceptions and tolerate the memory loss
578	XSetIOErrorHandler (rxvt_xioerror_handler);	634	XSetIOErrorHandler (rxvt_xioerror_handler);
579		635
580	XrmInitialize ();	636	XrmInitialize ();
		637
		638	#if HAVE_PIXBUF
		639	g_type_init ();
		640	#endif
581	}	641	}
582		642
583	/----------------------------------------------------------------------/	643	/----------------------------------------------------------------------/
584	/*	644	/*
585	* window size/position calculations for XSizeHint and other storage.	645	* window size/position calculations for XSizeHint and other storage.
…		…
706	if (recalc_y)	766	if (recalc_y)
707	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	767	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
708		768
709	ncol = width / fwidth;	769	ncol = width / fwidth;
710	nrow = height / fheight;	770	nrow = height / fheight;
		771
		772	// When the size of the vt window is not a multiple of the cell
		773	// size, i.e., when the wm does not honour our size hints, there are
		774	// extra areas not covered by the terminal screen. Such gaps, when a
		775	// bg pixmap is set, would have to be cleared manually to properly
		776	// refresh the background. We take the simpler route and shrink the
		777	// vt window so as to avoid creating gaps.
		778	vt_width = ncol * fwidth;
		779	vt_height = nrow * fheight;
711	}	780	}
712		781
713	/----------------------------------------------------------------------/	782	/----------------------------------------------------------------------/
714	/*	783	/*
715	* Tell the teletype handler what size the window is.	784	* Tell the teletype handler what size the window is.
…		…
723		792
724	struct winsize ws;	793	struct winsize ws;
725		794
726	ws.ws_col = ncol;	795	ws.ws_col = ncol;
727	ws.ws_row = nrow;	796	ws.ws_row = nrow;
728	ws.ws_xpixel = width;	797	ws.ws_xpixel = vt_width;
729	ws.ws_ypixel = height;	798	ws.ws_ypixel = vt_height;
730	ioctl (pty->pty, TIOCSWINSZ, &ws);	799	ioctl (pty->pty, TIOCSWINSZ, &ws);
731		800
732	#if 0	801	#if 0
733	// TIOCSWINSZ is supposed to do this automatically and correctly	802	// TIOCSWINSZ is supposed to do this automatically and correctly
734	if (cmd_pid) /* force through to the command */	803	if (cmd_pid) /* force through to the command */
…		…
760		829
761	delete fontset[0];	830	delete fontset[0];
762	fontset[0] = fs;	831	fontset[0] = fs;
763		832
764	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	833	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
765	prop.height += lineSpace;	834	prop.width = max (prop.width + letterSpace, 1);
766	prop.width += letterSpace;
767		835
768	fs->set_prop (prop, false);	836	fs->set_prop (prop, false);
769		837
770	fwidth = prop.width;	838	fwidth = prop.width;
771	fheight = prop.height;	839	fheight = prop.height + lineSpace;
772	fbase = prop.ascent;	840	fbase = prop.ascent;
773		841
774	for (int style = 1; style < 4; style++)	842	for (int style = 1; style < 4; style++)
775	{	843	{
776	#if ENABLE_STYLES	844	#if ENABLE_STYLES
…		…
871		939
872	void	940	void
873	rxvt_term::set_window_color (int idx, const char *color)	941	rxvt_term::set_window_color (int idx, const char *color)
874	{	942	{
875	#ifdef XTERM_COLOR_CHANGE	943	#ifdef XTERM_COLOR_CHANGE
876	rxvt_color xcol;
877
878	if (color == NULL \|\| *color == '\0')	944	if (color == NULL \|\| *color == '\0')
879	return;	945	return;
880		946
881	color = strdup (color);	947	color = strdup (color);
882	allocated.push_back ((void *)color);	948	allocated.push_back ((void *)color);
…		…
888	int i = atoi (color);	954	int i = atoi (color);
889		955
890	if (i >= 8 && i <= 15)	956	if (i >= 8 && i <= 15)
891	{	957	{
892	/* bright colors */	958	/* bright colors */
893	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];	959	alias_color (idx, minBrightCOLOR + i - 8);
894	goto done;	960	goto done;
895	}	961	}
896		962
897	if (i >= 0 && i <= 7)	963	if (i >= 0 && i <= 7)
898	{	964	{
899	/* normal colors */	965	/* normal colors */
900	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	966	alias_color (idx, minCOLOR + i);
901	goto done;	967	goto done;
902	}	968	}
903	}	969	}
904		970
905	set_color (xcol, color);	971	pix_colors_focused[idx].free (this);
906		972	set_color (pix_colors_focused[idx], color);
907	/*
908	* FIXME: should free colors here, but no idea how to do it so instead,
909	* so just keep gobbling up the colormap
910	*/
911
912	pix_colors_focused[idx] = xcol;
913		973
914	done:	974	done:
915	/TODO: handle Color_BD, scrollbar background, etc. /	975	/TODO: handle Color_BD, scrollbar background, etc. /
916		976
917	update_fade_color (idx);	977	update_fade_color (idx);
918	recolour_cursor ();	978	recolor_cursor ();
919	scr_recolour ();	979	scr_recolor ();
920	#endif /* XTERM_COLOR_CHANGE */	980	#endif /* XTERM_COLOR_CHANGE */
921	}	981	}
922		982
923	void	983	void
924	rxvt_term::recolour_cursor ()	984	rxvt_term::recolor_cursor ()
925	{	985	{
926	XColor fg, bg;	986	XColor fg, bg;
927		987
928	(ISSET_PIXCOLOR (Color_pointer_fg)	988	(ISSET_PIXCOLOR (Color_pointer_fg)
929	? pix_colors_focused[Color_pointer_fg]	989	? pix_colors_focused[Color_pointer_fg]
…		…
938		998
939	/----------------------------------------------------------------------/	999	/----------------------------------------------------------------------/
940	/*	1000	/*
941	* find if fg/bg matches any of the normal (low-intensity) colors	1001	* find if fg/bg matches any of the normal (low-intensity) colors
942	*/	1002	*/
943	void	1003	char *
944	rxvt_term::set_colorfgbg ()	1004	rxvt_term::get_colorfgbg ()
945	{	1005	{
946	unsigned int i;	1006	unsigned int i;
947	const char *xpmb = "";	1007	const char *xpmb = "";
948	char fstr[] = "default";	1008	char fstr[] = "default";
949	char bstr[] = "default";	1009	char bstr[] = "default";
		1010	char *env_colorfgbg;
950		1011
951	for (i = Color_Black; i <= Color_White; i++)	1012	for (i = Color_Black; i <= Color_White; i++)
952	if (pix_colors[Color_fg] == pix_colors[i])	1013	if (pix_colors[Color_fg] == pix_colors[i])
953	{	1014	{
954	sprintf (fstr, "%d", i - Color_Black);	1015	sprintf (fstr, "%d", i - Color_Black);
…		…
957		1018
958	for (i = Color_Black; i <= Color_White; i++)	1019	for (i = Color_Black; i <= Color_White; i++)
959	if (pix_colors[Color_bg] == pix_colors[i])	1020	if (pix_colors[Color_bg] == pix_colors[i])
960	{	1021	{
961	sprintf (bstr, "%d", i - Color_Black);	1022	sprintf (bstr, "%d", i - Color_Black);
962	#ifdef BG_IMAGE_FROM_FILE	1023	#if HAVE_IMG
963	xpmb = "default;";	1024	xpmb = "default;";
964	#endif	1025	#endif
965	break;	1026	break;
966	}	1027	}
967		1028
		1029	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
968	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1030	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
		1031	return env_colorfgbg;
969	}	1032	}
970		1033
971	/----------------------------------------------------------------------/	1034	/----------------------------------------------------------------------/
972		1035
973	bool	1036	bool
…		…
981	}	1044	}
982		1045
983	void	1046	void
984	rxvt_term::alias_color (int dst, int src)	1047	rxvt_term::alias_color (int dst, int src)
985	{	1048	{
		1049	pix_colors[dst].free (this);
986	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);	1050	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
987	}	1051	}
		1052
		1053	#ifdef SMART_RESIZE
		1054	static unsigned int
		1055	get_parent_bw (Display *dpy, Window w)
		1056	{
		1057	int idummy;
		1058	unsigned int udummy;
		1059	Window wdummy, parent;
		1060	Window *children;
		1061	unsigned int nchildren, border_width;
		1062
		1063	XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
		1064	XFree (children);
		1065	XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
		1066	&udummy, &udummy, &border_width, &udummy);
		1067
		1068	return border_width;
		1069	}
		1070	#endif
988		1071
989	/* -------------------------------------------------------------------- *	1072	/* -------------------------------------------------------------------- *
990	* - WINDOW RESIZING - *	1073	* - WINDOW RESIZING - *
991	* -------------------------------------------------------------------- */	1074	* -------------------------------------------------------------------- */
992	void	1075	void
…		…
1028	* if display->root isn't the parent window, a WM will probably have offset	1111	* if display->root isn't the parent window, a WM will probably have offset
1029	* our position for handles and decorations. Counter it	1112	* our position for handles and decorations. Counter it
1030	*/	1113	*/
1031	if (x1 != x \|\| y1 != y)	1114	if (x1 != x \|\| y1 != y)
1032	{	1115	{
1033	x -= x1;	1116	unsigned int border_width = get_parent_bw (dpy, parent);
1034	y -= y1;	1117
		1118	x -= x1 + border_width;
		1119	y -= y1 + border_width;
1035	}	1120	}
1036		1121
1037	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;	1122	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1038	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;	1123	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1039	dx = old_width - szHint.width;	1124	dx = old_width - szHint.width;
…		…
1066	if (scrollBar.state)	1151	if (scrollBar.state)
1067	scrollBar.resize ();	1152	scrollBar.resize ();
1068		1153
1069	XMoveResizeWindow (dpy, vt,	1154	XMoveResizeWindow (dpy, vt,
1070	window_vt_x, window_vt_y,	1155	window_vt_x, window_vt_y,
1071	width, height);	1156	vt_width, vt_height);
1072		1157
1073	#ifdef HAVE_BG_PIXMAP	1158	HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1074	if (bg_window_size_sensitive ())
1075	update_background ();
1076	#endif
1077	}	1159	}
1078		1160
1079	if (fix_screen \|\| old_height == 0)	1161	if (fix_screen \|\| old_height == 0)
1080	scr_reset ();	1162	scr_reset ();
1081		1163
1082	#ifdef USE_XIM	1164	#if USE_XIM
1083	im_set_position ();	1165	im_set_position ();
1084	#endif	1166	#endif
1085	}	1167	}
1086		1168
1087	/*	1169	/*
…		…
1101	newwidth = wattr.width - szHint.base_width;	1183	newwidth = wattr.width - szHint.base_width;
1102	if (newheight == 0)	1184	if (newheight == 0)
1103	newheight = wattr.height - szHint.base_height;	1185	newheight = wattr.height - szHint.base_height;
1104	}	1186	}
1105		1187
1106	if (newwidth != width \|\| newheight != height)	1188	if (newwidth != vt_width \|\| newheight != vt_height)
1107	{	1189	{
1108	newwidth += szHint.base_width;	1190	newwidth += szHint.base_width;
1109	newheight += szHint.base_height;	1191	newheight += szHint.base_height;
1110	resize_all_windows (newwidth, newheight, 0);	1192	resize_all_windows (newwidth, newheight, 0);
1111	}	1193	}
1112	}	1194	}
1113		1195
1114	/* -------------------------------------------------------------------- *	1196	/* -------------------------------------------------------------------- *
1115	* - X INPUT METHOD ROUTINES - *	1197	* - X INPUT METHOD ROUTINES - *
1116	* -------------------------------------------------------------------- */	1198	* -------------------------------------------------------------------- */
1117	#ifdef USE_XIM	1199	#if USE_XIM
1118		1200
1119	void	1201	void
1120	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1202	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1121	{	1203	{
1122	fg = pix_colors [Color_fg];	1204	fg = pix_colors [Color_fg];
…		…
1302	unsigned long fg, bg;	1384	unsigned long fg, bg;
1303	const char *p;	1385	const char *p;
1304	char **s;	1386	char **s;
1305	XIMStyles *xim_styles;	1387	XIMStyles *xim_styles;
1306		1388
1307	set_environ (envv);	1389	set_environ (env);
1308		1390
1309	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1391	if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1310	return false;	1392	return false;
1311		1393
1312	input_method = display->get_xim (locale, modifiers);	1394	input_method = display->get_xim (locale, modifiers);
1313	if (input_method == NULL)	1395	if (input_method == NULL)
1314	return false;	1396	return false;
…		…
1519	im_destroy ();	1601	im_destroy ();
1520		1602
1521	if (Input_Context)	1603	if (Input_Context)
1522	return;	1604	return;
1523		1605
1524	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1525	if (rs[Rs_imLocale])	1606	if (rs[Rs_imLocale])
1526	SET_LOCALE (rs[Rs_imLocale]);	1607	SET_LOCALE (rs[Rs_imLocale]);
1527	#endif
1528		1608
1529	p = rs[Rs_inputMethod];	1609	p = rs[Rs_inputMethod];
1530	if (p && *p)	1610	if (p && *p)
1531	{	1611	{
1532	bool found = false;	1612	bool found = false;
…		…
1560	/* try with no modifiers base IF the user didn't specify an IM */	1640	/* try with no modifiers base IF the user didn't specify an IM */
1561	if (im_get_ic ("@im=none"))	1641	if (im_get_ic ("@im=none"))
1562	goto done;	1642	goto done;
1563		1643
1564	done:	1644	done:
1565	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1566	if (rs[Rs_imLocale])	1645	if (rs[Rs_imLocale])
1567	SET_LOCALE (locale);	1646	SET_LOCALE (locale);
1568	#endif
1569	}	1647	}
1570		1648
1571	void	1649	void
1572	rxvt_term::im_set_position ()	1650	rxvt_term::im_set_position ()
1573	{	1651	{
…		…
1618	{	1696	{
1619	Window cr;	1697	Window cr;
1620	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);	1698	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1621	}	1699	}
1622		1700
1623	Pixmap
1624	rxvt_term::get_pixmap_property (Atom property)
1625	{
1626	Pixmap pixmap = None;
1627
1628	int aformat;
1629	unsigned long nitems, bytes_after;
1630	Atom atype;
1631	unsigned char *prop;
1632	int result = XGetWindowProperty (dpy, display->root, property,
1633	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1634	&nitems, &bytes_after, &prop);
1635	if (result == Success)
1636	{
1637	if (atype == XA_PIXMAP)
1638	pixmap = (Pixmap )prop;
1639	XFree (prop);
1640	}
1641
1642	return pixmap;
1643	}
1644
1645	#ifdef HAVE_BG_PIXMAP
1646
1647	void
1648	rxvt_term::update_background ()
1649	{
1650	if (update_background_ev.is_active ())
1651	return;
1652
1653	bg_invalidate ();
1654
1655	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1656
1657	if (to_wait <= 0.)
1658	bg_render ();
1659	else
1660	update_background_ev.start (to_wait);
1661	}
1662
1663	void
1664	rxvt_term::update_background_cb (ev::timer &w, int revents)
1665	{
1666	make_current ();
1667
1668	update_background_ev.stop ();
1669	bg_render ();
1670	refresh_check ();
1671	}
1672
1673	#endif /* HAVE_BG_PIXMAP */
1674
1675	/----------------------- end-of-file (C source) -----------------------/	1701	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.359 by sf-exg, Fri Jul 29 09:41:22 2011 UTC vs. Revision 1.403 by root, Thu Jun 17 00:49:20 2021 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.359 by sf-exg, Fri Jul 29 09:41:22 2011 UTC vs.
Revision 1.403 by root, Thu Jun 17 00:49:20 2021 UTC