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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.281 by root, Tue Jan 24 17:28:06 2006 UTC vs.
Revision 1.290 by root, Sat Jan 28 20:41:38 2006 UTC

…		…
299	rxvt_term::lookup_key (XKeyEvent &ev)	299	rxvt_term::lookup_key (XKeyEvent &ev)
300	{	300	{
301	int ctrl, meta, shft, len;	301	int ctrl, meta, shft, len;
302	unsigned int newlen;	302	unsigned int newlen;
303	KeySym keysym;	303	KeySym keysym;
304	#ifdef DEBUG_CMD
305	static int debug_key = 1; /* accessible by a debugger only */
306	#endif
307	int valid_keysym;	304	int valid_keysym;
308	char kbuf[KBUFSZ];	305	char kbuf[KBUFSZ];
309		306
310	/*	307	/*
311	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an	308	* use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
…		…
902	{	899	{
903	const char ch = C0_ESC;	900	const char ch = C0_ESC;
904	tt_write (&ch, 1);	901	tt_write (&ch, 1);
905	}	902	}
906		903
907	#if defined(DEBUG_CMD)
908	/* Display keyboard buffer contents */
909	unsigned char *p;
910	int i;
911
912	fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913	for (i = 0, p = kbuf; i < len; i++, p++)
914	fprintf (stderr, (p >= ' ' && p < '\177' ? "%c" : "\\%03o"), *p);
915	fprintf (stderr, "'\n");
916	#endif /* DEBUG_CMD */
917	tt_write (kbuf, (unsigned int)len);	904	tt_write (kbuf, (unsigned int)len);
918	}	905	}
919	/}}} /	906	/}}} /
920		907
921	#if defined (KEYSYM_RESOURCE)	908	#if defined (KEYSYM_RESOURCE)
…		…
1177	}	1164	}
1178		1165
1179	void	1166	void
1180	rxvt_term::pointer_unblank ()	1167	rxvt_term::pointer_unblank ()
1181	{	1168	{
1182	XDefineCursor (display->display, vt, TermWin_cursor);	1169	XDefineCursor (xdisp, vt, TermWin_cursor);
1183	recolour_cursor ();	1170	recolour_cursor ();
1184		1171
1185	#ifdef POINTER_BLANK	1172	#ifdef POINTER_BLANK
1186	hidden_pointer = 0;	1173	hidden_pointer = 0;
1187		1174
…		…
1195	rxvt_term::pointer_blank ()	1182	rxvt_term::pointer_blank ()
1196	{	1183	{
1197	if (!OPTION (Opt_pointerBlank))	1184	if (!OPTION (Opt_pointerBlank))
1198	return;	1185	return;
1199		1186
1200	XDefineCursor (display->display, vt, display->blank_cursor);	1187	XDefineCursor (xdisp, vt, display->blank_cursor);
1201	XFlush (display->display);	1188	XFlush (xdisp);
1202		1189
1203	hidden_pointer = 1;	1190	hidden_pointer = 1;
1204	}	1191	}
1205		1192
1206	void	1193	void
…		…
1279	(32 + button_number + key_state),	1266	(32 + button_number + key_state),
1280	(32 + x + 1),	1267	(32 + x + 1),
1281	(32 + y + 1));	1268	(32 + y + 1));
1282	}	1269	}
1283		1270
1284	#ifdef USING_W11LIB
1285	void
1286	rxvt_W11_process_x_event (XEvent *ev)
1287	{
1288	rxvt_t *r = rxvt_get_r ();
1289
1290	x_cb (*ev);
1291	}
1292	#endif
1293
1294	/{{{ process an X event /	1271	/{{{ process an X event /
1295	void	1272	void
1296	rxvt_term::x_cb (XEvent &ev)	1273	rxvt_term::x_cb (XEvent &ev)
1297	{	1274	{
1298	make_current ();	1275	make_current ();
1299		1276
1300	dDisp;	1277	dLocal (Display *, xdisp);
1301		1278
1302	if (ev.xany.window == vt	1279	if (ev.xany.window == vt
1303	&& SHOULD_INVOKE (HOOK_X_EVENT)	1280	&& SHOULD_INVOKE (HOOK_X_EVENT)
1304	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))	1281	&& HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305	return;	1282	return;
…		…
1415	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))	1392	if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416	destroy ();	1393	destroy ();
1417	}	1394	}
1418	#if ENABLE_EWMH	1395	#if ENABLE_EWMH
1419	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])	1396	else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420	XSendEvent (disp, ev.xclient.window = display->root,	1397	XSendEvent (xdisp, ev.xclient.window = display->root,
1421	False, SubstructureRedirectMask \| SubstructureNotifyMask,	1398	False, SubstructureRedirectMask \| SubstructureNotifyMask,
1422	&ev);	1399	&ev);
1423	#endif	1400	#endif
1424	}	1401	}
1425	}	1402	}
…		…
1473	break;	1450	break;
1474		1451
1475	case ConfigureNotify:	1452	case ConfigureNotify:
1476	if (ev.xconfigure.window == parent[0])	1453	if (ev.xconfigure.window == parent[0])
1477	{	1454	{
1478	while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))	1455	while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1479	;	1456	;
1480		1457
1481	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1458	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1482	{	1459	{
1483	seen_resize = 1;	1460	seen_resize = 1;
…		…
1541	if (ev.xany.window == vt)	1518	if (ev.xany.window == vt)
1542	{	1519	{
1543	do	1520	do
1544	scr_expose (ev.xexpose.x, ev.xexpose.y,	1521	scr_expose (ev.xexpose.x, ev.xexpose.y,
1545	ev.xexpose.width, ev.xexpose.height, False);	1522	ev.xexpose.width, ev.xexpose.height, False);
1546	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));	1523	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1547		1524
1548	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1525	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549		1526
1550	while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))	1527	while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1551	scr_expose (ev.xexpose.x, ev.xexpose.y,	1528	scr_expose (ev.xexpose.x, ev.xexpose.y,
1552	ev.xexpose.width, ev.xexpose.height, False);	1529	ev.xexpose.width, ev.xexpose.height, False);
1553		1530
1554	want_refresh = 1;	1531	want_refresh = 1;
1555	}	1532	}
1556	else	1533	else
1557	{	1534	{
1558	XEvent unused_event;	1535	XEvent unused_event;
1559		1536
1560	while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))	1537	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1561	;	1538	;
1562	while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))	1539	while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1563	;	1540	;
1564		1541
1565	if (isScrollbarWindow (ev.xany.window))	1542	if (isScrollbarWindow (ev.xany.window))
1566	{	1543	{
1567	scrollBar.setIdle ();	1544	scrollBar.setIdle ();
1568	scrollbar_show (0);	1545	scrollbar_show (0);
1569	}	1546	}
1570		1547
1571	#ifdef TRANSPARENT	1548	#ifdef TRANSPARENT
1572	if (am_transparent && ev.xany.window == parent[0])	1549	if (am_transparent && ev.xany.window == parent[0])
1573	XClearWindow (disp, ev.xany.window);	1550	XClearWindow (xdisp, ev.xany.window);
1574	#endif	1551	#endif
1575	}	1552	}
1576	break;	1553	break;
1577		1554
1578	case MotionNotify:	1555	case MotionNotify:
…		…
1588	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)	1565	if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))	1566	&& HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590	; // nop	1567	; // nop
1591	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))	1568	else if (ev.xbutton.state & (Button1Mask \| Button3Mask))
1592	{	1569	{
1593	while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))	1570	while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1594	;	1571	;
1595		1572
1596	XQueryPointer (disp, vt,	1573	XQueryPointer (xdisp, vt,
1597	&unused_root, &unused_child,	1574	&unused_root, &unused_child,
1598	&unused_root_x, &unused_root_y,	1575	&unused_root_x, &unused_root_y,
1599	&ev.xbutton.x, &ev.xbutton.y,	1576	&ev.xbutton.x, &ev.xbutton.y,
1600	&ev.xbutton.state);	1577	&ev.xbutton.state);
1601	#ifdef MOUSE_THRESHOLD	1578	#ifdef MOUSE_THRESHOLD
…		…
1665	#endif	1642	#endif
1666	}	1643	}
1667	}	1644	}
1668	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())	1645	else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669	{	1646	{
1670	while (XCheckTypedWindowEvent (disp, scrollBar.win,	1647	while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1671	MotionNotify, &ev))	1648	MotionNotify, &ev))
1672	;	1649	;
1673		1650
1674	XQueryPointer (disp, scrollBar.win,	1651	XQueryPointer (xdisp, scrollBar.win,
1675	&unused_root, &unused_child,	1652	&unused_root, &unused_child,
1676	&unused_root_x, &unused_root_y,	1653	&unused_root_x, &unused_root_y,
1677	&ev.xbutton.x, &ev.xbutton.y,	1654	&ev.xbutton.x, &ev.xbutton.y,
1678	&unused_mask);	1655	&unused_mask);
1679	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1656	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
…		…
2194	#if TINTING	2171	#if TINTING
2195	/* taken from aterm-0.4.2 */	2172	/* taken from aterm-0.4.2 */
2196		2173
2197	typedef uint32_t RUINT32T;	2174	typedef uint32_t RUINT32T;
2198		2175
2199	void ShadeXImage(rxvt_display display, XImage srcImage, int shade, int rm, int gm, int bm)	2176	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2200	{	2177	{
2201	int sh_r, sh_g, sh_b;	2178	int sh_r, sh_g, sh_b;
2202	RUINT32T mask_r, mask_g, mask_b;	2179	RUINT32T mask_r, mask_g, mask_b;
2203	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	2180	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2204	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	2181	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2205	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	2182	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2206	int i;	2183	int i;
2207		2184
2208	Visual *visual = display->visual;	2185	Visual *visual = term->visual;
2209		2186
2210	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	2187	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2211		2188
2212	/* for convenience */	2189	/* for convenience */
2213	mask_r = visual->red_mask;	2190	mask_r = visual->red_mask;
…		…
2434	Atom atype;	2411	Atom atype;
2435	unsigned char *prop = NULL;	2412	unsigned char *prop = NULL;
2436	Window root, oldp, *list;	2413	Window root, oldp, *list;
2437	Pixmap rootpixmap = None;	2414	Pixmap rootpixmap = None;
2438	XWindowAttributes wattr, wrootattr;	2415	XWindowAttributes wattr, wrootattr;
2439	dDisp;
2440		2416
2441	pchanged = 0;	2417	pchanged = 0;
2442		2418
2443	if (!OPTION (Opt_transparent))	2419	if (!OPTION (Opt_transparent))
2444	return pchanged; /* Don't try any more */	2420	return pchanged; /* Don't try any more */
2445		2421
2446	XGetWindowAttributes (disp, display->root, &wrootattr);	2422	XGetWindowAttributes (xdisp, display->root, &wrootattr);
2447	rootdepth = wrootattr.depth;	2423	rootdepth = wrootattr.depth;
2448		2424
2449	XGetWindowAttributes (disp, parent[0], &wattr);	2425	XGetWindowAttributes (xdisp, parent[0], &wattr);
2450		2426
2451	if (rootdepth != wattr.depth)	2427	if (rootdepth != wattr.depth)
2452	{	2428	{
2453	if (am_transparent)	2429	if (am_transparent)
2454	{	2430	{
2455	pchanged = 1;	2431	pchanged = 1;
2456	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2432	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2457	am_transparent = am_pixmap_trans = 0;	2433	am_transparent = am_pixmap_trans = 0;
2458	}	2434	}
2459		2435
2460	return pchanged; /* Don't try any more */	2436	return pchanged; /* Don't try any more */
2461	}	2437	}
2462		2438
2463	/* Get all X ops out of the queue so that our information is up-to-date. */	2439	/* Get all X ops out of the queue so that our information is up-to-date. */
2464	XSync (disp, False);	2440	XSync (xdisp, False);
2465		2441
2466	/*	2442	/*
2467	* Make the frame window set by the window manager have	2443	* Make the frame window set by the window manager have
2468	* the root background. Some window managers put multiple nested frame	2444	* the root background. Some window managers put multiple nested frame
2469	* windows for each client, so we have to take care about that.	2445	* windows for each client, so we have to take care about that.
2470	*/	2446	*/
2471	i = (xa[XA_XROOTPMAP_ID]	2447	i = (xa[XA_XROOTPMAP_ID]
2472	&& XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],	2448	&& XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2473	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2449	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474	&nitems, &bytes_after, &prop) == Success);	2450	&nitems, &bytes_after, &prop) == Success);
2475		2451
2476	if (!i \|\| prop == NULL)	2452	if (!i \|\| prop == NULL)
2477	i = (xa[XA_ESETROOT_PMAP_ID]	2453	i = (xa[XA_ESETROOT_PMAP_ID]
2478	&& XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],	2454	&& XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2479	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	2455	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2480	&nitems, &bytes_after, &prop) == Success);	2456	&nitems, &bytes_after, &prop) == Success);
2481		2457
2482	if (!i \|\| prop == NULL	2458	if (!i \|\| prop == NULL
2483	#if TINTING	2459	#if TINTING
…		…
2502	Window cr;	2478	Window cr;
2503	XImage *image;	2479	XImage *image;
2504	GC gc;	2480	GC gc;
2505	XGCValues gcvalue;	2481	XGCValues gcvalue;
2506		2482
2507	XTranslateCoordinates (disp, parent[0], display->root,	2483	XTranslateCoordinates (xdisp, parent[0], display->root,
2508	0, 0, &sx, &sy, &cr);	2484	0, 0, &sx, &sy, &cr);
2509	nw = (unsigned int)szHint.width;	2485	nw = (unsigned int)szHint.width;
2510	nh = (unsigned int)szHint.height;	2486	nh = (unsigned int)szHint.height;
2511	nx = ny = 0;	2487	nx = ny = 0;
2512		2488
…		…
2525	}	2501	}
2526		2502
2527	min_it (nw, (unsigned int) (wrootattr.width - sx));	2503	min_it (nw, (unsigned int) (wrootattr.width - sx));
2528	min_it (nh, (unsigned int) (wrootattr.height - sy));	2504	min_it (nh, (unsigned int) (wrootattr.height - sy));
2529		2505
2530	XSync (disp, False);	2506	XSync (xdisp, False);
2531	allowedxerror = -1;	2507	allowedxerror = -1;
2532	image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);	2508	image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2533		2509
2534	/* XXX: handle BadMatch - usually because we're outside the pixmap */	2510	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2535	/* XXX: may need a delay here? */	2511	/* XXX: may need a delay here? */
2536	allowedxerror = 0;	2512	allowedxerror = 0;
2537		2513
…		…
2540	if (am_transparent && am_pixmap_trans)	2516	if (am_transparent && am_pixmap_trans)
2541	{	2517	{
2542	pchanged = 1;	2518	pchanged = 1;
2543	if (pixmap != None)	2519	if (pixmap != None)
2544	{	2520	{
2545	XFreePixmap (disp, pixmap);	2521	XFreePixmap (xdisp, pixmap);
2546	pixmap = None;	2522	pixmap = None;
2547	}	2523	}
2548	}	2524	}
2549		2525
2550	am_pixmap_trans = 0;	2526	am_pixmap_trans = 0;
2551	}	2527	}
2552	else	2528	else
2553	{	2529	{
2554	if (pixmap != None)	2530	if (pixmap != None)
2555	XFreePixmap (disp, pixmap);	2531	XFreePixmap (xdisp, pixmap);
2556		2532
2557	#if TINTING	2533	#if TINTING
2558	if (ISSET_PIXCOLOR (Color_tint))	2534	if (ISSET_PIXCOLOR (Color_tint))
2559	{	2535	{
2560	unsigned short rm, gm, bm;	2536	unsigned short rm, gm, bm;
2561	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;	2537	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2562		2538
2563	pix_colors_focused[Color_tint].get (display, rm, gm, bm);	2539	pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2564		2540
2565	ShadeXImage (display, image, shade, rm, gm, bm);	2541	ShadeXImage (this, image, shade, rm, gm, bm);
2566	}	2542	}
2567	#endif	2543	#endif
2568		2544
2569	pixmap = XCreatePixmap (disp, vt,	2545	pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2570	szHint.width, szHint.height, image->depth);
2571	gc = XCreateGC (disp, vt, 0UL, &gcvalue);	2546	gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2572	XPutImage (disp, pixmap, gc, image, 0, 0,	2547	XPutImage (xdisp, pixmap, gc, image, 0, 0,
2573	nx, ny, image->width, image->height);	2548	nx, ny, image->width, image->height);
2574	XFreeGC (disp, gc);	2549	XFreeGC (xdisp, gc);
2575	XDestroyImage (image);	2550	XDestroyImage (image);
2576	XSetWindowBackgroundPixmap (disp, parent[0], pixmap);	2551	XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2577	XClearWindow (disp, parent[0]);	2552	XClearWindow (xdisp, parent[0]);
2578		2553
2579	if (!am_transparent \|\| !am_pixmap_trans)	2554	if (!am_transparent \|\| !am_pixmap_trans)
2580	pchanged = 1;	2555	pchanged = 1;
2581		2556
2582	am_transparent = am_pixmap_trans = 1;	2557	am_transparent = am_pixmap_trans = 1;
2583	}	2558	}
2584	}	2559	}
2585		2560
2586	if (am_pixmap_trans)	2561	if (am_pixmap_trans)
2587	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2562	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2588	else	2563	else
2589	{	2564	{
2590	unsigned int n;	2565	unsigned int n;
2591	/*	2566	/*
2592	* InheritPixmap transparency	2567	* InheritPixmap transparency
2593	*/	2568	*/
2594	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2569	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2595	{	2570	{
2596	oldp = parent[i];	2571	oldp = parent[i];
2597	XQueryTree (disp, parent[i - 1], &root,	2572	XQueryTree (xdisp, parent[i - 1], &root,
2598	&parent[i], &list, &n);	2573	&parent[i], &list, &n);
2599	XFree (list);	2574	XFree (list);
2600		2575
2601	if (parent[i] == display->root)	2576	if (parent[i] == display->root)
2602	{	2577	{
…		…
2614		2589
2615	if (pchanged)	2590	if (pchanged)
2616	{	2591	{
2617	for (; n < (unsigned int)i; n++)	2592	for (; n < (unsigned int)i; n++)
2618	{	2593	{
2619	XGetWindowAttributes (disp, parent[n], &wattr);	2594	XGetWindowAttributes (xdisp, parent[n], &wattr);
2620	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)	2595	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2621	{	2596	{
2622	n = (int) (sizeof (parent) / sizeof (Window)) + 1;	2597	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2623	break;	2598	break;
2624	}	2599	}
2625	}	2600	}
2626	}	2601	}
2627		2602
2628	if (n > (int) (sizeof (parent) / sizeof (parent[0])))	2603	if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2629	{	2604	{
2630	XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);	2605	XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2631	XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);	2606	XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2632	am_transparent = 0;	2607	am_transparent = 0;
2633	/* XXX: also turn off Opt_transparent? */	2608	/* XXX: also turn off Opt_transparent? */
2634	}	2609	}
2635	else	2610	else
2636	{	2611	{
2637	for (n = 0; n < (unsigned int)i; n++)	2612	for (n = 0; n < (unsigned int)i; n++)
2638	{	2613	{
2639	XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);	2614	XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2640	XClearWindow (disp, parent[n]);	2615	XClearWindow (xdisp, parent[n]);
2641	}	2616	}
2642		2617
2643	XSetWindowBackgroundPixmap (disp, vt, ParentRelative);	2618	XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2644	am_transparent = 1;	2619	am_transparent = 1;
2645	}	2620	}
2646		2621
2647	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)	2622	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648	parent[i] = None;	2623	parent[i] = None;
2649	}	2624	}
2650		2625
2651	if (scrollBar.win)	2626	if (scrollBar.win)
2652	{	2627	{
2653	XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);	2628	XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2654	scrollBar.setIdle ();	2629	scrollBar.setIdle ();
2655	scrollbar_show (0);	2630	scrollbar_show (0);
2656	}	2631	}
2657		2632
2658	if (am_transparent)	2633	if (am_transparent)
…		…
3292	ndef = get_byte_array_bit (csi_defaults, i);	3267	ndef = get_byte_array_bit (csi_defaults, i);
3293	for (p = 0; p < nargs; p++)	3268	for (p = 0; p < nargs; p++)
3294	if (arg[p] == -1)	3269	if (arg[p] == -1)
3295	arg[p] = ndef;	3270	arg[p] = ndef;
3296		3271
3297	#ifdef DEBUG_CMD
3298	fprintf (stderr, "CSI ");
3299	for (p = 0; p < nargs; p++)
3300	fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3301	fprintf (stderr, "%c\n", ch);
3302	#endif
3303
3304	/*	3272	/*
3305	* private mode handling	3273	* private mode handling
3306	*/	3274	*/
3307	if (priv)	3275	if (priv)
3308	{	3276	{
3309	switch (priv)	3277	switch (priv)
3310	{	3278	{
3311	case '>':	3279	case '>':
3312	if (ch == CSI_DA) /* secondary device attributes */	3280	if (ch == CSI_DA) /* secondary device attributes */
3313	tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);	3281	{
		3282	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
		3283	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
		3284	//
		3285	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
		3286	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
		3287	// that we do not support xterm mouse reporting (should be 95 when we do).
		3288	//
		3289	tt_printf ("\033[>%d;94;0c", 'U');
		3290	}
3314	break;	3291	break;
3315	case '?':	3292	case '?':
3316	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')	3293	if (ch == 'h' \|\| ch == 'l' \|\| ch == 'r' \|\| ch == 's' \|\| ch == 't')
3317	process_terminal_mode (ch, priv, nargs, arg);	3294	process_terminal_mode (ch, priv, nargs, arg);
3318	break;	3295	break;
…		…
3546	rxvt_term::process_window_ops (const int *args, unsigned int nargs)	3523	rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3547	{	3524	{
3548	int x, y;	3525	int x, y;
3549	XWindowAttributes wattr;	3526	XWindowAttributes wattr;
3550	Window wdummy;	3527	Window wdummy;
3551	dDisp;	3528
		3529	dLocal (Display *, xdisp);
3552		3530
3553	if (nargs == 0)	3531	if (nargs == 0)
3554	return;	3532	return;
3555		3533
3556	switch (args[0])	3534	switch (args[0])
3557	{	3535	{
3558	/*	3536	/*
3559	* commands	3537	* commands
3560	*/	3538	*/
3561	case 1: /* deiconify window */	3539	case 1: /* deiconify window */
3562	XMapWindow (disp, parent[0]);	3540	XMapWindow (xdisp, parent[0]);
3563	break;	3541	break;
3564	case 2: /* iconify window */	3542	case 2: /* iconify window */
3565	XIconifyWindow (disp, parent[0], display->screen);	3543	XIconifyWindow (xdisp, parent[0], display->screen);
3566	break;	3544	break;
3567	case 3: /* set position (pixels) */	3545	case 3: /* set position (pixels) */
3568	XMoveWindow (disp, parent[0], args[1], args[2]);	3546	XMoveWindow (xdisp, parent[0], args[1], args[2]);
3569	break;	3547	break;
3570	case 4: /* set size (pixels) */	3548	case 4: /* set size (pixels) */
3571	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);	3549	set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3572	break;	3550	break;
3573	case 5: /* raise window */	3551	case 5: /* raise window */
3574	XRaiseWindow (disp, parent[0]);	3552	XRaiseWindow (xdisp, parent[0]);
3575	break;	3553	break;
3576	case 6: /* lower window */	3554	case 6: /* lower window */
3577	XLowerWindow (disp, parent[0]);	3555	XLowerWindow (xdisp, parent[0]);
3578	break;	3556	break;
3579	case 7: /* refresh window */	3557	case 7: /* refresh window */
3580	scr_touch (true);	3558	scr_touch (true);
3581	break;	3559	break;
3582	case 8: /* set size (chars) */	3560	case 8: /* set size (chars) */
…		…
3594		3572
3595	/*	3573	/*
3596	* reports - some output format copied from XTerm	3574	* reports - some output format copied from XTerm
3597	*/	3575	*/
3598	case 11: /* report window state */	3576	case 11: /* report window state */
3599	XGetWindowAttributes (disp, parent[0], &wattr);	3577	XGetWindowAttributes (xdisp, parent[0], &wattr);
3600	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);	3578	tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3601	break;	3579	break;
3602	case 13: /* report window position */	3580	case 13: /* report window position */
3603	XGetWindowAttributes (disp, parent[0], &wattr);	3581	XGetWindowAttributes (xdisp, parent[0], &wattr);
3604	XTranslateCoordinates (disp, parent[0], wattr.root,	3582	XTranslateCoordinates (xdisp, parent[0], wattr.root,
3605	-wattr.border_width, -wattr.border_width,	3583	-wattr.border_width, -wattr.border_width,
3606	&x, &y, &wdummy);	3584	&x, &y, &wdummy);
3607	tt_printf ("\033[3;%d;%dt", x, y);	3585	tt_printf ("\033[3;%d;%dt", x, y);
3608	break;	3586	break;
3609	case 14: /* report window size (pixels) */	3587	case 14: /* report window size (pixels) */
3610	XGetWindowAttributes (disp, parent[0], &wattr);	3588	XGetWindowAttributes (xdisp, parent[0], &wattr);
3611	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);	3589	tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3612	break;	3590	break;
3613	case 18: /* report text area size (chars) */	3591	case 18: /* report text area size (chars) */
3614	tt_printf ("\033[8;%d;%dt", nrow, ncol);	3592	tt_printf ("\033[8;%d;%dt", nrow, ncol);
3615	break;	3593	break;
…		…
3617	tt_printf ("\033[9;%d;%dt", nrow, ncol);	3595	tt_printf ("\033[9;%d;%dt", nrow, ncol);
3618	break;	3596	break;
3619	case 20: /* report icon label */	3597	case 20: /* report icon label */
3620	{	3598	{
3621	char *s;	3599	char *s;
3622	XGetIconName (disp, parent[0], &s);	3600	XGetIconName (xdisp, parent[0], &s);
3623	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3601	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624	XFree (s);	3602	XFree (s);
3625	}	3603	}
3626	break;	3604	break;
3627	case 21: /* report window title */	3605	case 21: /* report window title */
3628	{	3606	{
3629	char *s;	3607	char *s;
3630	XFetchName (disp, parent[0], &s);	3608	XFetchName (xdisp, parent[0], &s);
3631	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3609	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3632	XFree (s);	3610	XFree (s);
3633	}	3611	}
3634	break;	3612	break;
3635	}	3613	}
…		…
3737	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)	3715	rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3738	{	3716	{
3739	if (str[0] == '?' && !str[1])	3717	if (str[0] == '?' && !str[1])
3740	{	3718	{
3741	unsigned short r, g, b;	3719	unsigned short r, g, b;
3742	pix_colors_focused[color].get (display, r, g, b);	3720	pix_colors_focused[color].get (this, r, g, b);
3743	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);	3721	tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3744	}	3722	}
3745	else	3723	else
3746	set_window_color (color, str);	3724	set_window_color (color, str);
3747	}	3725	}
…		…
3754	{	3732	{
3755	int color;	3733	int color;
3756	char buf, name;	3734	char buf, name;
3757	bool query = str[0] == '?' && !str[1];	3735	bool query = str[0] == '?' && !str[1];
3758	int saveop = op;	3736	int saveop = op;
3759	dDisp;	3737
		3738	dLocal (Display *, xdisp);
3760		3739
3761	assert (str != NULL);	3740	assert (str != NULL);
3762	switch (op)	3741	switch (op)
3763	{	3742	{
3764	case XTerm_name:	3743	case XTerm_name:
…		…
3780	unsigned long bytes_after;	3759	unsigned long bytes_after;
3781	unsigned char *value = 0;	3760	unsigned char *value = 0;
3782	const char *str = "";	3761	const char *str = "";
3783		3762
3784	if (prop	3763	if (prop
3785	&& XGetWindowProperty (disp, parent[0],	3764	&& XGetWindowProperty (xdisp, parent[0],
3786	prop, 0, 1<<16, 0, AnyPropertyType,	3765	prop, 0, 1<<16, 0, AnyPropertyType,
3787	&actual_type, &actual_format,	3766	&actual_type, &actual_format,
3788	&nitems, &bytes_after, &value) == Success	3767	&nitems, &bytes_after, &value) == Success
3789	&& actual_type != None	3768	&& actual_type != None
3790	&& actual_format == 8)	3769	&& actual_format == 8)
3791	str = (const char *)(value);	3770	str = (const char *)(value);
3792		3771
3793	tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);	3772	tt_printf ("\033]%d;%s%c", op, str, resp);
3794		3773
3795	XFree (value);	3774	XFree (value);
3796	}	3775	}
3797	else	3776	else
3798	{	3777	{
…		…
3802	{	3781	{
3803	*eq = 0;	3782	*eq = 0;
3804	set_utf8_property (display->atom (str), eq + 1);	3783	set_utf8_property (display->atom (str), eq + 1);
3805	}	3784	}
3806	else	3785	else
3807	XDeleteProperty (disp, parent[0],	3786	XDeleteProperty (xdisp, parent[0],
3808	display->atom (str));	3787	display->atom (str));
3809	}	3788	}
3810	break;	3789	break;
3811		3790
3812	case XTerm_Color:	3791	case XTerm_Color:
…		…
3825	*buf++ = '\0';	3804	*buf++ = '\0';
3826		3805
3827	if (name[0] == '?' && !name[1])	3806	if (name[0] == '?' && !name[1])
3828	{	3807	{
3829	unsigned short r, g, b;	3808	unsigned short r, g, b;
3830	pix_colors_focused[color].get (display, r, g, b);	3809	pix_colors_focused[color].get (this, r, g, b);
3831	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);	3810	tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", op, color, r, g, b, resp);
3832	}	3811	}
3833	else	3812	else
3834	set_window_color (color, name);	3813	set_window_color (color, name);
3835	}	3814	}
3836	break;	3815	break;
3837	case XTerm_Color00:	3816	case XTerm_Color00:
3838	process_color_seq (XTerm_Color00, Color_fg, str, resp);	3817	process_color_seq (op, Color_fg, str, resp);
3839	break;	3818	break;
3840	case XTerm_Color01:	3819	case XTerm_Color01:
3841	process_color_seq (XTerm_Color01, Color_bg, str, resp);	3820	process_color_seq (op, Color_bg, str, resp);
3842	break;	3821	break;
3843	#ifndef NO_CURSORCOLOR	3822	#ifndef NO_CURSORCOLOR
3844	case XTerm_Color_cursor:	3823	case XTerm_Color_cursor:
3845	process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);	3824	process_color_seq (op, Color_cursor, str, resp);
3846	break;	3825	break;
3847	#endif	3826	#endif
3848	case XTerm_Color_pointer_fg:	3827	case XTerm_Color_pointer_fg:
3849	process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);	3828	process_color_seq (op, Color_pointer_fg, str, resp);
3850	break;	3829	break;
3851	case XTerm_Color_pointer_bg:	3830	case XTerm_Color_pointer_bg:
3852	process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);	3831	process_color_seq (op, Color_pointer_bg, str, resp);
3853	break;	3832	break;
3854	#ifndef NO_BOLD_UNDERLINE_REVERSE	3833	#ifndef NO_BOLD_UNDERLINE_REVERSE
3855	case XTerm_Color_RV:	3834	case XTerm_Color_RV:
3856	process_color_seq (XTerm_Color_RV, Color_RV, str, resp);	3835	process_color_seq (op, Color_RV, str, resp);
3857	break;	3836	break;
3858	case Rxvt_Color_BD:	3837	case Rxvt_Color_BD:
3859	case URxvt_Color_BD:	3838	case URxvt_Color_BD:
3860	process_color_seq (op, Color_BD, str, resp);	3839	process_color_seq (op, Color_BD, str, resp);
3861	break;	3840	break;
3862	case Rxvt_Color_UL:	3841	case Rxvt_Color_UL:
3863	case URxvt_Color_UL:	3842	case URxvt_Color_UL:
3864	process_color_seq (op, Color_UL, str, resp);	3843	process_color_seq (op, Color_UL, str, resp);
3865	break;	3844	break;
3866	case URxvt_Color_IT:	3845	case URxvt_Color_IT:
3867	process_color_seq (URxvt_Color_IT, Color_IT, str, resp);	3846	process_color_seq (op, Color_IT, str, resp);
3868	break;	3847	break;
3869	#endif	3848	#endif
3870	#if TRANSPARENT && TINTING	3849	#if TRANSPARENT && TINTING
3871	case URxvt_Color_tint:	3850	case URxvt_Color_tint:
3872	process_color_seq (URxvt_Color_tint, Color_tint, str, resp);	3851	process_color_seq (op, Color_tint, str, resp);
3873	check_our_parents ();	3852	check_our_parents ();
3874	if (am_transparent)	3853	if (am_transparent)
3875	want_full_refresh = want_refresh = 1;	3854	want_full_refresh = want_refresh = 1;
3876	break;	3855	break;
3877	#endif	3856	#endif
…		…
3951	allocated.push_back ((void *)res);	3930	allocated.push_back ((void *)res);
3952	set_fonts ();	3931	set_fonts ();
3953	}	3932	}
3954	break;	3933	break;
3955		3934
		3935	case URxvt_version:
		3936	if (query)
		3937	tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
		3938	op,
		3939	rs[Rs_name], VERSION[0], VERSION[2],
		3940	resp);
		3941	break;
		3942
3956	#if ENABLE_FRILLS	3943	#if ENABLE_FRILLS
3957	case URxvt_locale:	3944	case URxvt_locale:
3958	if (query)	3945	if (query)
3959	tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);	3946	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3960	else	3947	else
3961	{	3948	{
3962	set_locale (str);	3949	set_locale (str);
3963	pty->set_utf8_mode (enc_utf8);	3950	pty->set_utf8_mode (enc_utf8);
3964	init_xlocale ();	3951	init_xlocale ();

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.281 by root, Tue Jan 24 17:28:06 2006 UTC vs. Revision 1.290 by root, Sat Jan 28 20:41:38 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.281 by root, Tue Jan 24 17:28:06 2006 UTC vs.
Revision 1.290 by root, Sat Jan 28 20:41:38 2006 UTC