Commit 3a34eccf678eb0a00670316f80a002ef89709e48 - gtkwave

Imported Upstream version 3.3.96 أحمد المحمودي (Ahmed El-Mahmoudy) 5 years ago

23 changed file(s) with 479 addition(s) and 315 deletion(s). Raw diff Collapse all Expand all

+14

-0

ChangeLog less more

1672	1672	Change integer type to "integer" in SST to differentiate it
1673	1673	from sv ints.
1674	1674	Premiminary support for enum tables embedded in FST files.
	1675	3.3.96 15nov18 Changed to standardized zoom in/out/full hotkeys.
	1676	Added time backtracking warning (for partial mode) to lxt2vcd.
	1677	VCD time backtracking fix (not for interactive mode).
	1678	Added drag_failed handling (can press ESC) to DnD operations.
	1679	Prevent missing file in savefile from causing savefile to be
	1680	read as VCD by mistake.
	1681	Changed to Dinotrace-like 0s/1s rendering for bit vectors so
	1682	values can be discerned without seeing the full value text.
	1683	Removed unneeded pango_layout_get_extents() inside call for
	1684	font_engine_draw_string().
	1685	Changed bsearch_trunc() to run in constant time when monospace
	1686	fonts are in use.
	1687	Added missing GDK_SCROLL_MASK to signal area (need for gtk3,
	1688	but not for other versions for some reason).

-1

LICENSE.TXT less more

0	0	##########################################################################
1	1
2		GTKWave 3.3.95 Wave Viewer is Copyright (C) 1999-2018 Tony Bybell.
	2	GTKWave 3.3.96 Wave Viewer is Copyright (C) 1999-2018 Tony Bybell.
3	3	Portions of GTKWave are Copyright (C) 1999-2018 Udi Finkelstein.
4	4	Context support is Copyright (C) 2007-2018 Kermin Elliott Fleming.
5	5	Trace group support is Copyright (C) 2009-2018 Donald Baltus.

+10

-10

configure less more

0	0	#! /bin/sh
1	1	# Guess values for system-dependent variables and create Makefiles.
2		# Generated by GNU Autoconf 2.69 for gtkwave 3.3.95.
	2	# Generated by GNU Autoconf 2.69 for gtkwave 3.3.96.
3	3	#
4	4	# Report bugs to <bybell@rocketmail.com>.
5	5	#

579	579	# Identity of this package.
580	580	PACKAGE_NAME='gtkwave'
581	581	PACKAGE_TARNAME='gtkwave'
582		PACKAGE_VERSION='3.3.95'
583		PACKAGE_STRING='gtkwave 3.3.95'
	582	PACKAGE_VERSION='3.3.96'
	583	PACKAGE_STRING='gtkwave 3.3.96'
584	584	PACKAGE_BUGREPORT='bybell@rocketmail.com'
585	585	PACKAGE_URL=''
586	586

1404	1404	# Omit some internal or obsolete options to make the list less imposing.
1405	1405	# This message is too long to be a string in the A/UX 3.1 sh.
1406	1406	cat <<_ACEOF
1407		\`configure' configures gtkwave 3.3.95 to adapt to many kinds of systems.
	1407	\`configure' configures gtkwave 3.3.96 to adapt to many kinds of systems.
1408	1408
1409	1409	Usage: $0 [OPTION]... [VAR=VALUE]...
1410	1410

1470	1470
1471	1471	if test -n "$ac_init_help"; then
1472	1472	case $ac_init_help in
1473		short \| recursive ) echo "Configuration of gtkwave 3.3.95:";;
	1473	short \| recursive ) echo "Configuration of gtkwave 3.3.96:";;
1474	1474	esac
1475	1475	cat <<\_ACEOF
1476	1476

1629	1629	test -n "$ac_init_help" && exit $ac_status
1630	1630	if $ac_init_version; then
1631	1631	cat <<\_ACEOF
1632		gtkwave configure 3.3.95
	1632	gtkwave configure 3.3.96
1633	1633	generated by GNU Autoconf 2.69
1634	1634
1635	1635	Copyright (C) 2012 Free Software Foundation, Inc.

2273	2273	This file contains any messages produced by compilers while
2274	2274	running configure, to aid debugging if configure makes a mistake.
2275	2275
2276		It was created by gtkwave $as_me 3.3.95, which was
	2276	It was created by gtkwave $as_me 3.3.96, which was
2277	2277	generated by GNU Autoconf 2.69. Invocation command line was
2278	2278
2279	2279	$ $0 $@

3140	3140
3141	3141	# Define the identity of the package.
3142	3142	PACKAGE='gtkwave'
3143		VERSION='3.3.95'
	3143	VERSION='3.3.96'
3144	3144
3145	3145
3146	3146	cat >>confdefs.h <<_ACEOF

11498	11498	# report actual input values of CONFIG_FILES etc. instead of their
11499	11499	# values after options handling.
11500	11500	ac_log="
11501		This file was extended by gtkwave $as_me 3.3.95, which was
	11501	This file was extended by gtkwave $as_me 3.3.96, which was
11502	11502	generated by GNU Autoconf 2.69. Invocation command line was
11503	11503
11504	11504	CONFIG_FILES = $CONFIG_FILES

11564	11564	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
11565	11565	ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
11566	11566	ac_cs_version="\\
11567		gtkwave config.status 3.3.95
	11567	gtkwave config.status 3.3.96
11568	11568	configured by $0, generated by GNU Autoconf 2.69,
11569	11569	with options \\"\$ac_cs_config\\"
11570	11570

-1

configure.ac less more

1	1	# Process this file with autoconf to produce a configure script.
2	2
3	3	AC_PREREQ(2.59)
4		AC_INIT(gtkwave, 3.3.95, bybell@rocketmail.com)
	4	AC_INIT(gtkwave, 3.3.96, bybell@rocketmail.com)
5	5	AC_CONFIG_SRCDIR([src/vcd.c])
6	6	AM_INIT_AUTOMAKE
7	7	AC_CONFIG_HEADER([config.h])

-3

contrib/bundle_for_osx/Info-gtkwave.plist less more

7	7	<key>CFBundleExecutable</key>
8	8	<string>gtkwave</string>
9	9	<key>CFBundleGetInfoString</key>
10		<string>3.3.95, (C) 1999-2018 Tony Bybell http://gtkwave.sourceforge.net</string>
	10	<string>3.3.96, (C) 1999-2018 Tony Bybell http://gtkwave.sourceforge.net</string>
11	11	<key>CFBundleIconFile</key>
12	12	<string>gtkwave.icns</string>
13	13	<key>CFBundleIdentifier</key>

17	17	<key>CFBundlePackageType</key>
18	18	<string>APPL</string>
19	19	<key>CFBundleShortVersionString</key>
20		<string>3.3.95</string>
	20	<string>3.3.96</string>
21	21	<key>CFBundleSignature</key>
22	22	<string>????</string>
23	23	<key>CFBundleVersion</key>
24		<string>3.3.95</string>
	24	<string>3.3.96</string>
25	25	<key>NSHumanReadableCopyright</key>
26	26	<string>Copyright 1999 - 2018 Tony Bybell, GNU General Public License.</string>
27	27	<key>LSMinimumSystemVersion</key>

+207

-205

contrib/rtlbrowse/vlex.c less more

997	997
998	998	static int v_preproc(char *buf, int max_size)
999	999	{
	1000	(void)max_size;
	1001
1000	1002	int ch;
1001	1003
1002	1004	if(!v_preproc_initialized)

1024	1026
1025	1027
1026	1028
1027		#line 1029 "vlex.c"
	1029	#line 1031 "vlex.c"
1028	1030
1029	1031	#define INITIAL 0
1030	1032	#define CMNT 1

1208	1210	register char yy_cp, yy_bp;
1209	1211	register int yy_act;
1210	1212
1211		#line 65 "vlex.l"
1212
1213		#line 1215 "vlex.c"
	1213	#line 67 "vlex.l"
	1214
	1215	#line 1217 "vlex.c"
1214	1216
1215	1217	if ( !(yy_init) )
1216	1218	{

1295	1297
1296	1298	case 1:
1297	1299	YY_RULE_SETUP
1298		#line 66 "vlex.l"
	1300	#line 68 "vlex.l"
1299	1301	{ BEGIN CMNT; return V_CMT; }
1300	1302	YY_BREAK
1301	1303	case 2:
1302		YY_RULE_SETUP
1303		#line 67 "vlex.l"
1304		{ return V_CMT; }
1305		YY_BREAK
1306		case 3:
1307		YY_RULE_SETUP
1308		#line 68 "vlex.l"
1309		{ BEGIN INITIAL; return V_CMT; }
1310		YY_BREAK
1311		case 4:
1312	1304	YY_RULE_SETUP
1313	1305	#line 69 "vlex.l"
1314	1306	{ return V_CMT; }
1315	1307	YY_BREAK
	1308	case 3:
	1309	YY_RULE_SETUP
	1310	#line 70 "vlex.l"
	1311	{ BEGIN INITIAL; return V_CMT; }
	1312	YY_BREAK
	1313	case 4:
	1314	YY_RULE_SETUP
	1315	#line 71 "vlex.l"
	1316	{ return V_CMT; }
	1317	YY_BREAK
1316	1318	case 5:
1317	1319	YY_RULE_SETUP
1318		#line 70 "vlex.l"
	1320	#line 72 "vlex.l"
1319	1321	{ return V_CMT; }
1320	1322	YY_BREAK
1321	1323	case 6:
1322	1324	/* rule 6 can match eol */
1323	1325	YY_RULE_SETUP
1324		#line 71 "vlex.l"
	1326	#line 73 "vlex.l"
1325	1327	{ my_yylineno++; return V_CMT; }
1326	1328	YY_BREAK
1327	1329	case 7:
1328	1330	YY_RULE_SETUP
1329		#line 73 "vlex.l"
	1331	#line 75 "vlex.l"
1330	1332	{ return V_KW; }
1331	1333	YY_BREAK
1332	1334	case 8:
1333	1335	YY_RULE_SETUP
1334		#line 74 "vlex.l"
	1336	#line 76 "vlex.l"
1335	1337	{ return V_KW; }
1336	1338	YY_BREAK
1337	1339	case 9:
1338	1340	YY_RULE_SETUP
1339		#line 75 "vlex.l"
	1341	#line 77 "vlex.l"
1340	1342	{ return V_KW; }
1341	1343	YY_BREAK
1342	1344	case 10:
1343	1345	YY_RULE_SETUP
1344		#line 76 "vlex.l"
	1346	#line 78 "vlex.l"
1345	1347	{ return V_KW; }
1346	1348	YY_BREAK
1347	1349	case 11:
1348	1350	YY_RULE_SETUP
1349		#line 77 "vlex.l"
	1351	#line 79 "vlex.l"
1350	1352	{ return V_KW; }
1351	1353	YY_BREAK
1352	1354	case 12:
1353	1355	YY_RULE_SETUP
1354		#line 78 "vlex.l"
	1356	#line 80 "vlex.l"
1355	1357	{ return V_KW; }
1356	1358	YY_BREAK
1357	1359	case 13:
1358	1360	YY_RULE_SETUP
1359		#line 79 "vlex.l"
	1361	#line 81 "vlex.l"
1360	1362	{ return V_KW; }
1361	1363	YY_BREAK
1362	1364	case 14:
1363	1365	YY_RULE_SETUP
1364		#line 80 "vlex.l"
	1366	#line 82 "vlex.l"
1365	1367	{ return V_KW; }
1366	1368	YY_BREAK
1367	1369	case 15:
1368	1370	YY_RULE_SETUP
1369		#line 81 "vlex.l"
	1371	#line 83 "vlex.l"
1370	1372	{ return V_KW; }
1371	1373	YY_BREAK
1372	1374	case 16:
1373	1375	YY_RULE_SETUP
1374		#line 82 "vlex.l"
	1376	#line 84 "vlex.l"
1375	1377	{ return V_KW; }
1376	1378	YY_BREAK
1377	1379	case 17:
1378	1380	YY_RULE_SETUP
1379		#line 83 "vlex.l"
	1381	#line 85 "vlex.l"
1380	1382	{ return V_KW; }
1381	1383	YY_BREAK
1382	1384	case 18:
1383	1385	YY_RULE_SETUP
1384		#line 84 "vlex.l"
	1386	#line 86 "vlex.l"
1385	1387	{ return V_KW; }
1386	1388	YY_BREAK
1387	1389	case 19:
1388	1390	YY_RULE_SETUP
1389		#line 85 "vlex.l"
	1391	#line 87 "vlex.l"
1390	1392	{ return V_KW; }
1391	1393	YY_BREAK
1392	1394	case 20:
1393	1395	YY_RULE_SETUP
1394		#line 86 "vlex.l"
	1396	#line 88 "vlex.l"
1395	1397	{ return V_KW; }
1396	1398	YY_BREAK
1397	1399	case 21:
1398	1400	YY_RULE_SETUP
1399		#line 87 "vlex.l"
	1401	#line 89 "vlex.l"
1400	1402	{ return V_KW; }
1401	1403	YY_BREAK
1402	1404	case 22:
1403	1405	YY_RULE_SETUP
1404		#line 88 "vlex.l"
	1406	#line 90 "vlex.l"
1405	1407	{ return V_KW; }
1406	1408	YY_BREAK
1407	1409	case 23:
1408	1410	YY_RULE_SETUP
1409		#line 89 "vlex.l"
	1411	#line 91 "vlex.l"
1410	1412	{ return V_KW; }
1411	1413	YY_BREAK
1412	1414	case 24:
1413	1415	YY_RULE_SETUP
1414		#line 90 "vlex.l"
	1416	#line 92 "vlex.l"
1415	1417	{ return V_KW; }
1416	1418	YY_BREAK
1417	1419	case 25:
1418	1420	YY_RULE_SETUP
1419		#line 91 "vlex.l"
	1421	#line 93 "vlex.l"
1420	1422	{ return V_KW; }
1421	1423	YY_BREAK
1422	1424	case 26:
1423	1425	YY_RULE_SETUP
1424		#line 92 "vlex.l"
	1426	#line 94 "vlex.l"
1425	1427	{ return V_KW; }
1426	1428	YY_BREAK
1427	1429	case 27:
1428	1430	YY_RULE_SETUP
1429		#line 93 "vlex.l"
	1431	#line 95 "vlex.l"
1430	1432	{ return V_KW; }
1431	1433	YY_BREAK
1432	1434	case 28:
1433	1435	YY_RULE_SETUP
1434		#line 94 "vlex.l"
	1436	#line 96 "vlex.l"
1435	1437	{ return V_KW; }
1436	1438	YY_BREAK
1437	1439	case 29:
1438	1440	YY_RULE_SETUP
1439		#line 95 "vlex.l"
	1441	#line 97 "vlex.l"
1440	1442	{ return V_KW; }
1441	1443	YY_BREAK
1442	1444	case 30:
1443	1445	YY_RULE_SETUP
1444		#line 96 "vlex.l"
	1446	#line 98 "vlex.l"
1445	1447	{ return V_KW; }
1446	1448	YY_BREAK
1447	1449	case 31:
1448	1450	YY_RULE_SETUP
1449		#line 97 "vlex.l"
	1451	#line 99 "vlex.l"
1450	1452	{ return V_KW; }
1451	1453	YY_BREAK
1452	1454	case 32:
1453	1455	YY_RULE_SETUP
1454		#line 98 "vlex.l"
	1456	#line 100 "vlex.l"
1455	1457	{ return V_KW; }
1456	1458	YY_BREAK
1457	1459	case 33:
1458	1460	YY_RULE_SETUP
1459		#line 99 "vlex.l"
	1461	#line 101 "vlex.l"
1460	1462	{ return V_KW; }
1461	1463	YY_BREAK
1462	1464	case 34:
1463	1465	YY_RULE_SETUP
1464		#line 100 "vlex.l"
	1466	#line 102 "vlex.l"
1465	1467	{ return V_KW; }
1466	1468	YY_BREAK
1467	1469	case 35:
1468	1470	YY_RULE_SETUP
1469		#line 101 "vlex.l"
	1471	#line 103 "vlex.l"
1470	1472	{ return V_KW; }
1471	1473	YY_BREAK
1472	1474	case 36:
1473	1475	YY_RULE_SETUP
1474		#line 102 "vlex.l"
	1476	#line 104 "vlex.l"
1475	1477	{ return V_KW; }
1476	1478	YY_BREAK
1477	1479	case 37:
1478	1480	YY_RULE_SETUP
1479		#line 103 "vlex.l"
	1481	#line 105 "vlex.l"
1480	1482	{ return V_KW; }
1481	1483	YY_BREAK
1482	1484	case 38:
1483	1485	YY_RULE_SETUP
1484		#line 104 "vlex.l"
	1486	#line 106 "vlex.l"
1485	1487	{ return V_KW; }
1486	1488	YY_BREAK
1487	1489	case 39:
1488	1490	YY_RULE_SETUP
1489		#line 105 "vlex.l"
	1491	#line 107 "vlex.l"
1490	1492	{ return V_KW; }
1491	1493	YY_BREAK
1492	1494	case 40:
1493	1495	YY_RULE_SETUP
1494		#line 106 "vlex.l"
	1496	#line 108 "vlex.l"
1495	1497	{ return V_KW; }
1496	1498	YY_BREAK
1497	1499	case 41:
1498	1500	YY_RULE_SETUP
1499		#line 107 "vlex.l"
	1501	#line 109 "vlex.l"
1500	1502	{ return V_KW; }
1501	1503	YY_BREAK
1502	1504	case 42:
1503	1505	YY_RULE_SETUP
1504		#line 108 "vlex.l"
	1506	#line 110 "vlex.l"
1505	1507	{ return V_KW; }
1506	1508	YY_BREAK
1507	1509	case 43:
1508	1510	YY_RULE_SETUP
1509		#line 109 "vlex.l"
	1511	#line 111 "vlex.l"
1510	1512	{ return V_KW; }
1511	1513	YY_BREAK
1512	1514	case 44:
1513	1515	YY_RULE_SETUP
1514		#line 110 "vlex.l"
	1516	#line 112 "vlex.l"
1515	1517	{ return V_KW; }
1516	1518	YY_BREAK
1517	1519	case 45:
1518	1520	YY_RULE_SETUP
1519		#line 111 "vlex.l"
	1521	#line 113 "vlex.l"
1520	1522	{ return V_KW; }
1521	1523	YY_BREAK
1522	1524	case 46:
1523	1525	YY_RULE_SETUP
1524		#line 112 "vlex.l"
	1526	#line 114 "vlex.l"
1525	1527	{ return V_KW; }
1526	1528	YY_BREAK
1527	1529	case 47:
1528	1530	YY_RULE_SETUP
1529		#line 113 "vlex.l"
	1531	#line 115 "vlex.l"
1530	1532	{ return V_KW; }
1531	1533	YY_BREAK
1532	1534	case 48:
1533	1535	YY_RULE_SETUP
1534		#line 114 "vlex.l"
	1536	#line 116 "vlex.l"
1535	1537	{ return V_KW; }
1536	1538	YY_BREAK
1537	1539	case 49:
1538	1540	YY_RULE_SETUP
1539		#line 115 "vlex.l"
	1541	#line 117 "vlex.l"
1540	1542	{ return V_KW; }
1541	1543	YY_BREAK
1542	1544	case 50:
1543	1545	YY_RULE_SETUP
1544		#line 116 "vlex.l"
	1546	#line 118 "vlex.l"
1545	1547	{ return V_KW; }
1546	1548	YY_BREAK
1547	1549	case 51:
1548	1550	YY_RULE_SETUP
1549		#line 117 "vlex.l"
	1551	#line 119 "vlex.l"
1550	1552	{ return V_KW; }
1551	1553	YY_BREAK
1552	1554	case 52:
1553	1555	YY_RULE_SETUP
1554		#line 118 "vlex.l"
	1556	#line 120 "vlex.l"
1555	1557	{ return V_KW; }
1556	1558	YY_BREAK
1557	1559	case 53:
1558	1560	YY_RULE_SETUP
1559		#line 119 "vlex.l"
	1561	#line 121 "vlex.l"
1560	1562	{ return V_KW; }
1561	1563	YY_BREAK
1562	1564	case 54:
1563	1565	YY_RULE_SETUP
1564		#line 120 "vlex.l"
	1566	#line 122 "vlex.l"
1565	1567	{ return V_KW; }
1566	1568	YY_BREAK
1567	1569	case 55:
1568	1570	YY_RULE_SETUP
1569		#line 121 "vlex.l"
	1571	#line 123 "vlex.l"
1570	1572	{ return V_KW; }
1571	1573	YY_BREAK
1572	1574	case 56:
1573	1575	YY_RULE_SETUP
1574		#line 122 "vlex.l"
	1576	#line 124 "vlex.l"
1575	1577	{ return V_KW; }
1576	1578	YY_BREAK
1577	1579	case 57:
1578	1580	YY_RULE_SETUP
1579		#line 123 "vlex.l"
	1581	#line 125 "vlex.l"
1580	1582	{ return V_KW; }
1581	1583	YY_BREAK
1582	1584	case 58:
1583	1585	YY_RULE_SETUP
1584		#line 124 "vlex.l"
	1586	#line 126 "vlex.l"
1585	1587	{ return V_KW; }
1586	1588	YY_BREAK
1587	1589	case 59:
1588	1590	YY_RULE_SETUP
1589		#line 125 "vlex.l"
	1591	#line 127 "vlex.l"
1590	1592	{ return V_KW; }
1591	1593	YY_BREAK
1592	1594	case 60:
1593	1595	YY_RULE_SETUP
1594		#line 126 "vlex.l"
	1596	#line 128 "vlex.l"
1595	1597	{ return V_KW; }
1596	1598	YY_BREAK
1597	1599	case 61:
1598	1600	YY_RULE_SETUP
1599		#line 127 "vlex.l"
	1601	#line 129 "vlex.l"
1600	1602	{ return V_KW; }
1601	1603	YY_BREAK
1602	1604	case 62:
1603	1605	YY_RULE_SETUP
1604		#line 128 "vlex.l"
	1606	#line 130 "vlex.l"
1605	1607	{ return V_KW; }
1606	1608	YY_BREAK
1607	1609	case 63:
1608	1610	YY_RULE_SETUP
1609		#line 129 "vlex.l"
	1611	#line 131 "vlex.l"
1610	1612	{ return V_KW; }
1611	1613	YY_BREAK
1612	1614	case 64:
1613	1615	YY_RULE_SETUP
1614		#line 130 "vlex.l"
	1616	#line 132 "vlex.l"
1615	1617	{ return V_KW; }
1616	1618	YY_BREAK
1617	1619	case 65:
1618	1620	YY_RULE_SETUP
1619		#line 131 "vlex.l"
	1621	#line 133 "vlex.l"
1620	1622	{ return V_KW; }
1621	1623	YY_BREAK
1622	1624	case 66:
1623	1625	YY_RULE_SETUP
1624		#line 132 "vlex.l"
	1626	#line 134 "vlex.l"
1625	1627	{ return V_KW; }
1626	1628	YY_BREAK
1627	1629	case 67:
1628	1630	YY_RULE_SETUP
1629		#line 133 "vlex.l"
	1631	#line 135 "vlex.l"
1630	1632	{ return V_KW; }
1631	1633	YY_BREAK
1632	1634	case 68:
1633	1635	YY_RULE_SETUP
1634		#line 134 "vlex.l"
	1636	#line 136 "vlex.l"
1635	1637	{ return V_KW; }
1636	1638	YY_BREAK
1637	1639	case 69:
1638	1640	YY_RULE_SETUP
1639		#line 135 "vlex.l"
	1641	#line 137 "vlex.l"
1640	1642	{ return V_KW; }
1641	1643	YY_BREAK
1642	1644	case 70:
1643	1645	YY_RULE_SETUP
1644		#line 136 "vlex.l"
	1646	#line 138 "vlex.l"
1645	1647	{ return V_KW; }
1646	1648	YY_BREAK
1647	1649	case 71:
1648	1650	YY_RULE_SETUP
1649		#line 137 "vlex.l"
	1651	#line 139 "vlex.l"
1650	1652	{ return V_KW; }
1651	1653	YY_BREAK
1652	1654	case 72:
1653	1655	YY_RULE_SETUP
1654		#line 138 "vlex.l"
	1656	#line 140 "vlex.l"
1655	1657	{ return V_KW; }
1656	1658	YY_BREAK
1657	1659	case 73:
1658	1660	YY_RULE_SETUP
1659		#line 139 "vlex.l"
	1661	#line 141 "vlex.l"
1660	1662	{ return V_KW; }
1661	1663	YY_BREAK
1662	1664	case 74:
1663	1665	YY_RULE_SETUP
1664		#line 140 "vlex.l"
	1666	#line 142 "vlex.l"
1665	1667	{ return V_KW; }
1666	1668	YY_BREAK
1667	1669	case 75:
1668	1670	YY_RULE_SETUP
1669		#line 141 "vlex.l"
	1671	#line 143 "vlex.l"
1670	1672	{ return V_KW; }
1671	1673	YY_BREAK
1672	1674	case 76:
1673	1675	YY_RULE_SETUP
1674		#line 142 "vlex.l"
	1676	#line 144 "vlex.l"
1675	1677	{ return V_KW; }
1676	1678	YY_BREAK
1677	1679	case 77:
1678	1680	YY_RULE_SETUP
1679		#line 143 "vlex.l"
	1681	#line 145 "vlex.l"
1680	1682	{ return V_KW; }
1681	1683	YY_BREAK
1682	1684	case 78:
1683	1685	YY_RULE_SETUP
1684		#line 144 "vlex.l"
	1686	#line 146 "vlex.l"
1685	1687	{ return V_KW; }
1686	1688	YY_BREAK
1687	1689	case 79:
1688	1690	YY_RULE_SETUP
1689		#line 145 "vlex.l"
	1691	#line 147 "vlex.l"
1690	1692	{ return V_KW; }
1691	1693	YY_BREAK
1692	1694	case 80:
1693	1695	YY_RULE_SETUP
1694		#line 146 "vlex.l"
	1696	#line 148 "vlex.l"
1695	1697	{ return V_KW; }
1696	1698	YY_BREAK
1697	1699	case 81:
1698	1700	YY_RULE_SETUP
1699		#line 147 "vlex.l"
	1701	#line 149 "vlex.l"
1700	1702	{ return V_KW; }
1701	1703	YY_BREAK
1702	1704	case 82:
1703	1705	YY_RULE_SETUP
1704		#line 148 "vlex.l"
	1706	#line 150 "vlex.l"
1705	1707	{ return V_KW; }
1706	1708	YY_BREAK
1707	1709	case 83:
1708	1710	YY_RULE_SETUP
1709		#line 149 "vlex.l"
	1711	#line 151 "vlex.l"
1710	1712	{ return V_KW; }
1711	1713	YY_BREAK
1712	1714	case 84:
1713	1715	YY_RULE_SETUP
1714		#line 150 "vlex.l"
	1716	#line 152 "vlex.l"
1715	1717	{ return V_KW; }
1716	1718	YY_BREAK
1717	1719	case 85:
1718	1720	YY_RULE_SETUP
1719		#line 151 "vlex.l"
	1721	#line 153 "vlex.l"
1720	1722	{ return V_KW; }
1721	1723	YY_BREAK
1722	1724	case 86:
1723	1725	YY_RULE_SETUP
1724		#line 152 "vlex.l"
	1726	#line 154 "vlex.l"
1725	1727	{ return V_KW; }
1726	1728	YY_BREAK
1727	1729	case 87:
1728	1730	YY_RULE_SETUP
1729		#line 153 "vlex.l"
	1731	#line 155 "vlex.l"
1730	1732	{ return V_KW; }
1731	1733	YY_BREAK
1732	1734	case 88:
1733	1735	YY_RULE_SETUP
1734		#line 154 "vlex.l"
	1736	#line 156 "vlex.l"
1735	1737	{ return V_KW; }
1736	1738	YY_BREAK
1737	1739	case 89:
1738	1740	YY_RULE_SETUP
1739		#line 155 "vlex.l"
	1741	#line 157 "vlex.l"
1740	1742	{ return V_KW; }
1741	1743	YY_BREAK
1742	1744	case 90:
1743	1745	YY_RULE_SETUP
1744		#line 156 "vlex.l"
	1746	#line 158 "vlex.l"
1745	1747	{ return V_KW; }
1746	1748	YY_BREAK
1747	1749	case 91:
1748	1750	YY_RULE_SETUP
1749		#line 157 "vlex.l"
	1751	#line 159 "vlex.l"
1750	1752	{ return V_KW; }
1751	1753	YY_BREAK
1752	1754	case 92:
1753	1755	YY_RULE_SETUP
1754		#line 158 "vlex.l"
	1756	#line 160 "vlex.l"
1755	1757	{ return V_KW; }
1756	1758	YY_BREAK
1757	1759	case 93:
1758	1760	YY_RULE_SETUP
1759		#line 159 "vlex.l"
	1761	#line 161 "vlex.l"
1760	1762	{ return V_KW; }
1761	1763	YY_BREAK
1762	1764	case 94:
1763	1765	YY_RULE_SETUP
1764		#line 160 "vlex.l"
	1766	#line 162 "vlex.l"
1765	1767	{ return V_KW; }
1766	1768	YY_BREAK
1767	1769	case 95:
1768	1770	YY_RULE_SETUP
1769		#line 162 "vlex.l"
	1771	#line 164 "vlex.l"
1770	1772	{ return V_KW; }
1771	1773	YY_BREAK
1772	1774	case 96:
1773	1775	YY_RULE_SETUP
1774		#line 163 "vlex.l"
	1776	#line 165 "vlex.l"
1775	1777	{ return V_KW; }
1776	1778	YY_BREAK
1777	1779	case 97:
1778	1780	YY_RULE_SETUP
1779		#line 164 "vlex.l"
	1781	#line 166 "vlex.l"
1780	1782	{ return V_KW; }
1781	1783	YY_BREAK
1782	1784	case 98:
1783	1785	YY_RULE_SETUP
1784		#line 165 "vlex.l"
	1786	#line 167 "vlex.l"
1785	1787	{ return V_KW; }
1786	1788	YY_BREAK
1787	1789	case 99:
1788	1790	YY_RULE_SETUP
1789		#line 166 "vlex.l"
	1791	#line 168 "vlex.l"
1790	1792	{ return V_KW; }
1791	1793	YY_BREAK
1792	1794	case 100:
1793	1795	YY_RULE_SETUP
1794		#line 167 "vlex.l"
	1796	#line 169 "vlex.l"
1795	1797	{ return V_KW; }
1796	1798	YY_BREAK
1797	1799	case 101:
1798	1800	YY_RULE_SETUP
1799		#line 168 "vlex.l"
	1801	#line 170 "vlex.l"
1800	1802	{ return V_KW; }
1801	1803	YY_BREAK
1802	1804	case 102:
1803	1805	YY_RULE_SETUP
1804		#line 169 "vlex.l"
	1806	#line 171 "vlex.l"
1805	1807	{ return V_KW; }
1806	1808	YY_BREAK
1807	1809	case 103:
1808		YY_RULE_SETUP
1809		#line 171 "vlex.l"
1810		{ return V_KW_2005; }
1811		YY_BREAK
1812		case 104:
1813		YY_RULE_SETUP
1814		#line 172 "vlex.l"
1815		{ return V_KW_2005; }
1816		YY_BREAK
1817		case 105:
1818	1810	YY_RULE_SETUP
1819	1811	#line 173 "vlex.l"
1820	1812	{ return V_KW_2005; }
1821	1813	YY_BREAK
1822		case 106:
	1814	case 104:
1823	1815	YY_RULE_SETUP
1824	1816	#line 174 "vlex.l"
1825	1817	{ return V_KW_2005; }
1826	1818	YY_BREAK
1827		case 107:
	1819	case 105:
1828	1820	YY_RULE_SETUP
1829	1821	#line 175 "vlex.l"
1830	1822	{ return V_KW_2005; }
1831	1823	YY_BREAK
1832		case 108:
	1824	case 106:
1833	1825	YY_RULE_SETUP
1834	1826	#line 176 "vlex.l"
1835	1827	{ return V_KW_2005; }
1836	1828	YY_BREAK
1837		case 109:
	1829	case 107:
1838	1830	YY_RULE_SETUP
1839	1831	#line 177 "vlex.l"
1840	1832	{ return V_KW_2005; }
1841	1833	YY_BREAK
1842		case 110:
	1834	case 108:
1843	1835	YY_RULE_SETUP
1844	1836	#line 178 "vlex.l"
1845	1837	{ return V_KW_2005; }
1846	1838	YY_BREAK
1847		case 111:
	1839	case 109:
1848	1840	YY_RULE_SETUP
1849	1841	#line 179 "vlex.l"
1850	1842	{ return V_KW_2005; }
1851	1843	YY_BREAK
1852		case 112:
	1844	case 110:
1853	1845	YY_RULE_SETUP
1854	1846	#line 180 "vlex.l"
1855	1847	{ return V_KW_2005; }
1856	1848	YY_BREAK
1857		case 113:
	1849	case 111:
1858	1850	YY_RULE_SETUP
1859	1851	#line 181 "vlex.l"
1860	1852	{ return V_KW_2005; }
1861	1853	YY_BREAK
1862		case 114:
	1854	case 112:
1863	1855	YY_RULE_SETUP
1864	1856	#line 182 "vlex.l"
1865	1857	{ return V_KW_2005; }
1866	1858	YY_BREAK
1867		case 115:
	1859	case 113:
1868	1860	YY_RULE_SETUP
1869	1861	#line 183 "vlex.l"
1870	1862	{ return V_KW_2005; }
1871	1863	YY_BREAK
1872		case 116:
	1864	case 114:
1873	1865	YY_RULE_SETUP
1874	1866	#line 184 "vlex.l"
1875	1867	{ return V_KW_2005; }
1876	1868	YY_BREAK
1877		case 117:
	1869	case 115:
1878	1870	YY_RULE_SETUP
1879	1871	#line 185 "vlex.l"
1880	1872	{ return V_KW_2005; }
1881	1873	YY_BREAK
1882		case 118:
	1874	case 116:
1883	1875	YY_RULE_SETUP
1884	1876	#line 186 "vlex.l"
1885	1877	{ return V_KW_2005; }
1886	1878	YY_BREAK
1887		case 119:
	1879	case 117:
1888	1880	YY_RULE_SETUP
1889	1881	#line 187 "vlex.l"
1890	1882	{ return V_KW_2005; }
1891	1883	YY_BREAK
1892		case 120:
	1884	case 118:
1893	1885	YY_RULE_SETUP
1894	1886	#line 188 "vlex.l"
1895	1887	{ return V_KW_2005; }
1896	1888	YY_BREAK
1897		case 121:
	1889	case 119:
1898	1890	YY_RULE_SETUP
1899	1891	#line 189 "vlex.l"
1900	1892	{ return V_KW_2005; }
1901	1893	YY_BREAK
1902		case 122:
	1894	case 120:
1903	1895	YY_RULE_SETUP
1904	1896	#line 190 "vlex.l"
1905	1897	{ return V_KW_2005; }
1906	1898	YY_BREAK
1907		case 123:
	1899	case 121:
1908	1900	YY_RULE_SETUP
1909	1901	#line 191 "vlex.l"
1910	1902	{ return V_KW_2005; }
1911	1903	YY_BREAK
1912		case 124:
	1904	case 122:
1913	1905	YY_RULE_SETUP
1914	1906	#line 192 "vlex.l"
1915	1907	{ return V_KW_2005; }
1916	1908	YY_BREAK
1917		case 125:
	1909	case 123:
1918	1910	YY_RULE_SETUP
1919	1911	#line 193 "vlex.l"
1920	1912	{ return V_KW_2005; }
1921	1913	YY_BREAK
1922		case 126:
	1914	case 124:
	1915	YY_RULE_SETUP
	1916	#line 194 "vlex.l"
	1917	{ return V_KW_2005; }
	1918	YY_BREAK
	1919	case 125:
1923	1920	YY_RULE_SETUP
1924	1921	#line 195 "vlex.l"
1925	1922	{ return V_KW_2005; }
1926	1923	YY_BREAK
1927		case 127:
1928		YY_RULE_SETUP
1929		#line 196 "vlex.l"
1930		{ return V_KW_2005; }
1931		YY_BREAK
1932		case 128:
	1924	case 126:
1933	1925	YY_RULE_SETUP
1934	1926	#line 197 "vlex.l"
1935	1927	{ return V_KW_2005; }
1936	1928	YY_BREAK
1937		case 129:
	1929	case 127:
1938	1930	YY_RULE_SETUP
1939	1931	#line 198 "vlex.l"
1940	1932	{ return V_KW_2005; }
1941	1933	YY_BREAK
1942		case 130:
	1934	case 128:
1943	1935	YY_RULE_SETUP
1944	1936	#line 199 "vlex.l"
1945	1937	{ return V_KW_2005; }
1946	1938	YY_BREAK
1947		case 131:
	1939	case 129:
1948	1940	YY_RULE_SETUP
1949	1941	#line 200 "vlex.l"
1950	1942	{ return V_KW_2005; }
1951	1943	YY_BREAK
1952		case 132:
	1944	case 130:
1953	1945	YY_RULE_SETUP
1954	1946	#line 201 "vlex.l"
1955	1947	{ return V_KW_2005; }
1956	1948	YY_BREAK
	1949	case 131:
	1950	YY_RULE_SETUP
	1951	#line 202 "vlex.l"
	1952	{ return V_KW_2005; }
	1953	YY_BREAK
	1954	case 132:
	1955	YY_RULE_SETUP
	1956	#line 203 "vlex.l"
	1957	{ return V_KW_2005; }
	1958	YY_BREAK
1957	1959	case 133:
1958		YY_RULE_SETUP
1959		#line 203 "vlex.l"
1960		{ return V_MODULE; }
1961		YY_BREAK
1962		case 134:
1963		YY_RULE_SETUP
1964		#line 204 "vlex.l"
1965		{ return V_MODULE; }
1966		YY_BREAK
1967		case 135:
1968	1960	YY_RULE_SETUP
1969	1961	#line 205 "vlex.l"
1970	1962	{ return V_MODULE; }
1971	1963	YY_BREAK
	1964	case 134:
	1965	YY_RULE_SETUP
	1966	#line 206 "vlex.l"
	1967	{ return V_MODULE; }
	1968	YY_BREAK
	1969	case 135:
	1970	YY_RULE_SETUP
	1971	#line 207 "vlex.l"
	1972	{ return V_MODULE; }
	1973	YY_BREAK
1972	1974	case 136:
1973	1975	YY_RULE_SETUP
1974		#line 207 "vlex.l"
	1976	#line 209 "vlex.l"
1975	1977	{ return V_ENDMODULE; }
1976	1978	YY_BREAK
1977	1979	case 137:
1978	1980	YY_RULE_SETUP
1979		#line 208 "vlex.l"
	1981	#line 210 "vlex.l"
1980	1982	{ return V_ENDMODULE; }
1981	1983	YY_BREAK
1982	1984	case 138:
1983	1985	YY_RULE_SETUP
1984		#line 210 "vlex.l"
	1986	#line 212 "vlex.l"
1985	1987	{ return V_PREPROC_WS; }
1986	1988	YY_BREAK
1987	1989	case 139:
1988	1990	/* rule 139 can match eol */
1989	1991	YY_RULE_SETUP
1990		#line 211 "vlex.l"
	1992	#line 213 "vlex.l"
1991	1993	{ my_yylineno++; BEGIN INITIAL; return V_WS; }
1992	1994	YY_BREAK
1993	1995	case 140:
1994	1996	YY_RULE_SETUP
1995		#line 213 "vlex.l"
	1997	#line 215 "vlex.l"
1996	1998	{
1997	1999	if(is_builtin_define (yytext+1, yyleng-1))
1998	2000	{

2005	2007	YY_BREAK
2006	2008	case 141:
2007	2009	YY_RULE_SETUP
2008		#line 224 "vlex.l"
2009		{ return V_ID; }
2010		YY_BREAK
2011		case 142:
2012		YY_RULE_SETUP
2013		#line 225 "vlex.l"
2014		{ return V_FUNC; }
2015		YY_BREAK
2016		case 143:
2017		YY_RULE_SETUP
2018	2010	#line 226 "vlex.l"
2019	2011	{ return V_ID; }
2020	2012	YY_BREAK
	2013	case 142:
	2014	YY_RULE_SETUP
	2015	#line 227 "vlex.l"
	2016	{ return V_FUNC; }
	2017	YY_BREAK
	2018	case 143:
	2019	YY_RULE_SETUP
	2020	#line 228 "vlex.l"
	2021	{ return V_ID; }
	2022	YY_BREAK
2021	2023	case 144:
2022	2024	YY_RULE_SETUP
2023		#line 227 "vlex.l"
	2025	#line 229 "vlex.l"
2024	2026	{ return V_ID; }
2025	2027	YY_BREAK
2026	2028	case 145:
2027	2029	YY_RULE_SETUP
2028		#line 228 "vlex.l"
	2030	#line 230 "vlex.l"
2029	2031	{ return V_PORT; }
2030	2032	YY_BREAK
2031	2033	case 146:
2032		YY_RULE_SETUP
2033		#line 229 "vlex.l"
2034		{ return V_NUMBER; }
2035		YY_BREAK
2036		case 147:
2037		YY_RULE_SETUP
2038		#line 230 "vlex.l"
2039		{ return V_NUMBER; }
2040		YY_BREAK
2041		case 148:
2042	2034	YY_RULE_SETUP
2043	2035	#line 231 "vlex.l"
2044	2036	{ return V_NUMBER; }
2045	2037	YY_BREAK
2046		case 149:
	2038	case 147:
2047	2039	YY_RULE_SETUP
2048	2040	#line 232 "vlex.l"
2049	2041	{ return V_NUMBER; }
2050	2042	YY_BREAK
2051		case 150:
	2043	case 148:
2052	2044	YY_RULE_SETUP
2053	2045	#line 233 "vlex.l"
2054	2046	{ return V_NUMBER; }
2055	2047	YY_BREAK
	2048	case 149:
	2049	YY_RULE_SETUP
	2050	#line 234 "vlex.l"
	2051	{ return V_NUMBER; }
	2052	YY_BREAK
	2053	case 150:
	2054	YY_RULE_SETUP
	2055	#line 235 "vlex.l"
	2056	{ return V_NUMBER; }
	2057	YY_BREAK
2056	2058	case 151:
2057	2059	YY_RULE_SETUP
2058		#line 234 "vlex.l"
	2060	#line 236 "vlex.l"
2059	2061	{ return V_IGNORE; }
2060	2062	YY_BREAK
2061	2063	case 152:
2062	2064	YY_RULE_SETUP
2063		#line 235 "vlex.l"
	2065	#line 237 "vlex.l"
2064	2066	{ return V_WS; }
2065	2067	YY_BREAK
2066	2068	case 153:
2067	2069	/* rule 153 can match eol */
2068	2070	YY_RULE_SETUP
2069		#line 236 "vlex.l"
	2071	#line 238 "vlex.l"
2070	2072	{ my_yylineno++; return V_WS; }
2071	2073	YY_BREAK
2072	2074	case 154:
2073	2075	YY_RULE_SETUP
2074		#line 237 "vlex.l"
	2076	#line 239 "vlex.l"
2075	2077	{ return V_CMT; }
2076	2078	YY_BREAK
2077	2079	case 155:
2078	2080	YY_RULE_SETUP
2079		#line 238 "vlex.l"
	2081	#line 240 "vlex.l"
2080	2082	{ return V_STRING; }
2081	2083	YY_BREAK
2082	2084	case 156:
2083	2085	YY_RULE_SETUP
2084		#line 239 "vlex.l"
	2086	#line 241 "vlex.l"
2085	2087	{ return V_IGNORE; }
2086	2088	YY_BREAK
2087	2089	case 157:
2088	2090	YY_RULE_SETUP
2089		#line 241 "vlex.l"
	2091	#line 243 "vlex.l"
2090	2092	ECHO;
2091	2093	YY_BREAK
2092		#line 2094 "vlex.c"
	2094	#line 2096 "vlex.c"
2093	2095	case YY_STATE_EOF(INITIAL):
2094	2096	case YY_STATE_EOF(CMNT):
2095	2097	case YY_STATE_EOF(PREPROC):

3085	3087
3086	3088	#define YYTABLES_NAME "yytables"
3087	3089
3088		#line 241 "vlex.l"
3089
3090
3091
	3090	#line 243 "vlex.l"
	3091
	3092
	3093

-0

contrib/rtlbrowse/vlex.l less more

31	31
32	32	static int v_preproc(char *buf, int max_size)
33	33	{
	34	(void)max_size;
	35
34	36	int ch;
35	37
36	38	if(!v_preproc_initialized)

doc/gtkwave.odt less more

Binary diff not shown

-3

examples/gtkwaverc less more

255	255	accel "/Time/Move To Time" F1
256	256	accel "/Time/Zoom/Zoom Amount" F2
257	257	accel "/Time/Zoom/Zoom Base" <Shift>F2
258		accel "/Time/Zoom/Zoom In" <Alt>Z
259		accel "/Time/Zoom/Zoom Out" <Shift><Alt>Z
260		accel "/Time/Zoom/Zoom Full" <Alt>F
	258	accel "/Time/Zoom/Zoom In" <Control>plus
	259	accel "/Time/Zoom/Zoom Out" <Control>minus
	260	accel "/Time/Zoom/Zoom Full" <Control>0
261	261	accel "/Time/Zoom/Zoom Best Fit" <Shift><Alt>F
262	262	accel "/Time/Zoom/Zoom To Start" Home
263	263	accel "/Time/Zoom/Zoom To End" End

+47

-49

src/baseconvert.c less more

895	895
896	896	int vtype(Trptr t, char *vec)
897	897	{
898		int i, nbits, res;
899		int an_u_encountered = 0;
	898	int i, nbits;
	899	char pch, ch;
900	900
901	901	if (vec == NULL)
902	902	return(AN_X);

904	904	nbits=t->n.nd->msi-t->n.nd->lsi;
905	905	if(nbits<0)nbits=-nbits;
906	906	nbits++;
907		res = AN_1;
908		for (i = 0; i < nbits; i++)
909		{
910		switch (*vec)
911		{
912		case AN_X:
913		case 'x':
914		case 'X':
915		return(AN_X);
916		case AN_U:
917		case 'u':
918		case 'U':
919		an_u_encountered = 1; break;
920		case AN_Z:
921		case 'z':
922		case 'Z':
923		if (res == AN_0) return(AN_X); vec++; res = AN_Z; break;
924		default: if (res == AN_Z) return(AN_X); vec++; res = AN_0; break;
925		}
926		}
927
928		return(!an_u_encountered ? res : AN_U);
	907	pch = ch = vec[0];
	908	for (i = 1; i < nbits; i++)
	909	{
	910	ch = vec[i];
	911	if(ch != pch) goto miscompare;
	912	}
	913
	914	return(ch);
	915
	916	miscompare:
	917	if((pch == AN_X) \|\| (pch == AN_U)) return(pch);
	918	if(pch == AN_Z) return(AN_X);
	919	for (; i < nbits; i++)
	920	{
	921	ch = vec[i];
	922	if((ch == AN_X) \|\| (ch == AN_U)) return(ch);
	923	if(ch == AN_Z) return(AN_X);
	924	}
	925
	926	return(AN_COUNT);
929	927	}
930	928
931	929	int vtype2(Trptr t, vptr v)
932	930	{
933		int i, nbits, res;
934		int an_u_encountered = 0;
	931	int i, nbits;
	932	char pch, ch;
935	933	char vec=(char )v->v;
936	934
937	935	if(!t->t_filter_converted)

941	939	}
942	940	else
943	941	{
944		return ( ((vec == NULL) \|\| (vec[0] == 0)) ? AN_Z : AN_0 );
	942	return ( ((vec == NULL) \|\| (vec[0] == 0)) ? AN_Z : AN_COUNT );
945	943	}
946	944
947	945	nbits=t->n.vec->nbits;
948		res = AN_1;
949		for (i = 0; i < nbits; i++)
950		{
951		switch (*vec)
952		{
953		case AN_X:
954		case 'x':
955		case 'X':
956		return(AN_X);
957		case AN_U:
958		case 'u':
959		case 'U':
960		an_u_encountered = 1; break;
961		case AN_Z:
962		case 'z':
963		case 'Z':
964		if (res == AN_0) return(AN_X); vec++; res = AN_Z; break;
965		default: if (res == AN_Z) return(AN_X); vec++; res = AN_0; break;
966		}
967		}
968
969		return(!an_u_encountered ? res : AN_U);
	946
	947	pch = ch = vec[0];
	948	for (i = 1; i < nbits; i++)
	949	{
	950	ch = vec[i];
	951	if(ch != pch) goto miscompare;
	952	}
	953
	954	return(ch);
	955
	956	miscompare:
	957	if((pch == AN_X) \|\| (pch == AN_U)) return(pch);
	958	if(pch == AN_Z) return(AN_X);
	959	for (; i < nbits; i++)
	960	{
	961	ch = vec[i];
	962	if((ch == AN_X) \|\| (ch == AN_U)) return(ch);
	963	if(ch == AN_Z) return(AN_X);
	964	}
	965
	966	return(AN_COUNT);
970	967	}
	968
971	969
972	970	/*
973	971	* convert trptr+hptr vectorstring into an ascii string

+21

-8

src/bsearch.c less more

0	0	/*
1		* Copyright (c) Tony Bybell 1999-2013.
	1	* Copyright (c) Tony Bybell 1999-2018.
2	2	*
3	3	* This program is free software; you can redistribute it and/or
4	4	* modify it under the terms of the GNU General Public License

220	220
221	221	if((maxlen<=0)\|\|(!ascii)\|\|(!(len=strlen(ascii)))) return(NULL);
222	222
223		GLOBALS->maxlen_trunc=0; GLOBALS->maxlen_trunc_pos_bsearch_c_1=NULL;
224
225		if(bsearch(&maxlen, GLOBALS->trunc_asciibase_bsearch_c_1=ascii, len, sizeof(char), compar_trunc))
226		{
227		/* nothing, all side effects are in bsearch */
228		}
	223	GLOBALS->maxlen_trunc_pos_bsearch_c_1=NULL;
	224
	225	if(GLOBALS->wavefont->is_mono)
	226	{
	227	int adjusted_len = maxlen / GLOBALS->wavefont->mono_width;
	228	if(adjusted_len) adjusted_len--;
	229	if(GLOBALS->wavefont->mono_width <= maxlen)
	230	{
	231	GLOBALS->maxlen_trunc_pos_bsearch_c_1 = ascii + adjusted_len;
	232	}
	233	}
	234	else
	235	{
	236	GLOBALS->maxlen_trunc=0;
	237
	238	if(bsearch(&maxlen, GLOBALS->trunc_asciibase_bsearch_c_1=ascii, len, sizeof(char), compar_trunc))
	239	{
	240	/* nothing, all side effects are in bsearch */
	241	}
	242	}
229	243
230	244	return(GLOBALS->maxlen_trunc_pos_bsearch_c_1);
231	245	}

293	307	rc=(struct symbol *)bsearch(ascii, GLOBALS->facs, GLOBALS->numfacs, sizeof(struct symbol ), compar_facs);
294	308	if(rc) return(*rc); else return(NULL);
295	309	}
296

-2

src/fonts.c less more

169	169	#if defined(WAVE_USE_GTK2) && !defined(GTK_ENABLE_BROKEN) && GTK_CHECK_VERSION(2,8,0)
170	170	else
171	171	{
172		PangoRectangle ink,logical;
	172	/* PangoRectangle ink,logical; */
173	173
174	174	pango_layout_set_text(GLOBALS->fonts_layout, string, -1);
175	175	pango_layout_set_font_description(GLOBALS->fonts_layout, font->desc);
176		pango_layout_get_extents(GLOBALS->fonts_layout,&ink,&logical);
	176	/* pango_layout_get_extents(GLOBALS->fonts_layout,&ink,&logical); */
177	177	gdk_draw_layout(drawable, gc, x, y-font->ascent, GLOBALS->fonts_layout);
178	178	}
179	179	#endif

-0

src/globals.c less more

1184	1184	NULL, /* varsplit_vcd_c_1 512 */
1185	1185	NULL, /* varsplitcurr */
1186	1186	0, /* var_prevch_vcd_c_1 513 */
	1187	0, /* vcd_already_backtracked */
1187	1188
1188	1189
1189	1190	/*

-0

src/globals.h less more

1173	1173	char varsplit_vcd_c_1; / from vcd.c 550 */
1174	1174	char vsplitcurr_vcd_c_1; / from vcd.c 551 */
1175	1175	int var_prevch_vcd_c_1; /* from vcd.c 552 */
	1176	char vcd_already_backtracked;
1176	1177
1177	1178
1178	1179	/*

-3

src/helpers/fst/fstapi.c less more

282	282	#if (defined(__MACH__) && defined(__APPLE__))
283	283	if(!resolved_path)
284	284	{
285		resolved_path = (unsigned char )malloc(PATH_MAX+1); / fixes bug on Leopard when resolved_path == NULL */
	285	resolved_path = (char )malloc(PATH_MAX+1); / fixes bug on Leopard when resolved_path == NULL */
286	286	}
287	287	#endif
288	288

292	292	#ifdef __MINGW32__
293	293	if(!resolved_path)
294	294	{
295		resolved_path = (unsigned char *)malloc(PATH_MAX+1);
	295	resolved_path = (char *)malloc(PATH_MAX+1);
296	296	}
297	297	return(_fullpath(resolved_path, path, PATH_MAX));
298	298	#else

2161	2161	#ifdef __MINGW32__
2162	2162	{
2163	2163	int flen = strlen(xc->filename);
2164		char *hf = calloc(1, flen + 6);
	2164	char hf = (char )calloc(1, flen + 6);
2165	2165	strcpy(hf, xc->filename);
2166	2166
2167	2167	if(xc->compress_hier)

-2

src/helpers/lxt2vcd.c less more

108	108
109	109
110	110	static lxtint64_t vcd_prevtime;
111		char vcd_blackout;
	111	char vcd_blackout = 0;
	112	static int backtrack_warning = 0;
112	113
113	114	void vcd_callback(struct lxt2_rd_trace *lt, lxtint64_t pnt_time, lxtint32_t pnt_facidx, char *pnt_value)
114	115	{

118	119
119	120	if(vcd_prevtime != *pnt_time)
120	121	{
	122	if((vcd_prevtime > *pnt_time) && (!backtrack_warning) && (vcd_prevtime != -1))
	123	{
	124	backtrack_warning = 1;
	125	fprintf(stderr, "LXTLOAD \| Time backtracking encountered: this VCD might load incorrectly in gtkwave.\n");
	126	}
	127
121	128	vcd_prevtime = *pnt_time;
122	129	fprintf(fv, "#"LXT2_RD_LLD"\n", *pnt_time);
123	130	}
124
	131
125	132	if(!(*pnt_value)[0])
126	133	{
127	134	if(!vcd_blackout)

+28

-0

src/main.c less more

1281	1281	GLOBALS->loaded_file_name = extracted_name;
1282	1282	}
1283	1283	}
	1284	else
	1285	{
	1286	char *dfn = NULL;
	1287	char *sfn = NULL;
	1288	off_t dumpsiz = -1;
	1289	time_t dumptim = -1;
	1290
	1291	read_save_helper(GLOBALS->loaded_file_name, &dfn, &sfn, &dumpsiz, &dumptim, &opt_vcd);
	1292
	1293	fprintf(stderr, "GTKWAVE \| Could not initialize '%s' found in '%s', exiting.\n", dfn ? dfn : "(null)", GLOBALS->loaded_file_name);
	1294	if(dfn) free_2(dfn);
	1295	if(sfn) free_2(sfn);
	1296	exit(255);
	1297	}
1284	1298	}
1285	1299	else /* same as above but with --save specified */
1286	1300	if((!GLOBALS->loaded_file_name) && wname)
1287	1301	{
1288	1302	GLOBALS->loaded_file_name = extract_dumpname_from_save_file(wname, &GLOBALS->dumpfile_is_modified, &opt_vcd);
1289	1303	/* still can be NULL if file not found... */
	1304	if(!GLOBALS->loaded_file_name)
	1305	{
	1306	char *dfn = NULL;
	1307	char *sfn = NULL;
	1308	off_t dumpsiz = -1;
	1309	time_t dumptim = -1;
	1310
	1311	read_save_helper(wname, &dfn, &sfn, &dumpsiz, &dumptim, &opt_vcd);
	1312
	1313	fprintf(stderr, "GTKWAVE \| Could not initialize '%s' found in '%s', exiting.\n", dfn ? dfn : "(null)", wname);
	1314	if(dfn) free_2(dfn);
	1315	if(sfn) free_2(sfn);
	1316	exit(255);
	1317	}
1290	1318	}
1291	1319
1292	1320

-5

src/menu.c less more

8061	8061	WAVE_GTKIFE("/Time/Move To Time", "F1", menu_movetotime, WV_MENU_TMTT, "<Item>"),
8062	8062	WAVE_GTKIFE("/Time/Zoom/Zoom Amount", "F2", menu_zoomsize, WV_MENU_TZZA, "<Item>"),
8063	8063	WAVE_GTKIFE("/Time/Zoom/Zoom Base", "<Shift>F2", menu_zoombase, WV_MENU_TZZB, "<Item>"),
8064		WAVE_GTKIFE("/Time/Zoom/Zoom In", "<Alt>Z", service_zoom_in_marshal, WV_MENU_TZZI, "<Item>"),
8065		WAVE_GTKIFE("/Time/Zoom/Zoom Out", "<Shift><Alt>Z", service_zoom_out_marshal, WV_MENU_TZZO, "<Item>"),
8066		WAVE_GTKIFE("/Time/Zoom/Zoom Full", "<Alt>F", service_zoom_full_marshal, WV_MENU_TZZBFL, "<Item>"),
	8064	WAVE_GTKIFE("/Time/Zoom/Zoom In", "<Control>plus", service_zoom_in_marshal, WV_MENU_TZZI, "<Item>"),
	8065	WAVE_GTKIFE("/Time/Zoom/Zoom Out", "<Control>minus", service_zoom_out_marshal, WV_MENU_TZZO, "<Item>"),
	8066	WAVE_GTKIFE("/Time/Zoom/Zoom Full", "<Control>0", service_zoom_full_marshal, WV_MENU_TZZBFL, "<Item>"),
8067	8067	WAVE_GTKIFE("/Time/Zoom/Zoom Best Fit", "<Shift><Alt>F", service_zoom_fit_marshal, WV_MENU_TZZBF, "<Item>"),
8068	8068	WAVE_GTKIFE("/Time/Zoom/Zoom To Start", "Home", service_zoom_left_marshal, WV_MENU_TZZTS, "<Item>"),
8069	8069	WAVE_GTKIFE("/Time/Zoom/Zoom To End", "End", service_zoom_right_marshal, WV_MENU_TZZTE, "<Item>"),

8939	8939	slashcount = 0;
8940	8940	while(*s)
8941	8941	{
8942		if(*s == '/') slashes[slashcount++] = s;;
	8942	if(*s == '/') slashes[slashcount++] = s;
8943	8943	s++;
8944	8944	}
8945	8945

9156	9156	gtkwave_mlist_t *mi = menu_items;
9157	9157	int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
9158	9158	GtkWidget *menubar;
9159		GtkAccelGroup *global_accel = gtk_accel_group_new();;
	9159	GtkAccelGroup *global_accel = gtk_accel_group_new();
9160	9160	int i;
9161	9161	GtkWidget *mw;
9162	9162

+49

-0

src/signalwindow.c less more

92	92	}
93	93
94	94	/*
	95	* DND "drag_failed" handler, this is called when a drag and drop has
	96	* failed (e.g., by pressing ESC).
	97	*/
	98	#ifdef WAVE_USE_GTK2
	99	static gboolean DNDFailedCB(
	100	GtkWidget widget, GdkDragContext context, GtkDragResult result)
	101	{
	102	(void)widget;
	103	(void)context;
	104	(void)result;
	105
	106	GLOBALS->dnd_cursor_timer = 0;
	107	GLOBALS->dnd_state = 0;
	108	GLOBALS->standard_trace_dnd_degate = 1;
	109
	110	MaxSignalLength();
	111	signalarea_configure_event(GLOBALS->signalarea, NULL);
	112	wavearea_configure_event(GLOBALS->wavearea, NULL);
	113
	114	return(FALSE);
	115	}
	116	#endif
	117
	118	/*
95	119	* DND "drag_end" handler, this is called when a drag and drop has
96	120	* completed. So this function is the last one to be called in
97	121	* any given DND operation.

118	142	GdkEventMotion event[1];
119	143	event[0].deviceid = GDK_CORE_POINTER;
120	144	#endif
	145
	146	if(!GLOBALS->dnd_state) goto bot;
121	147
122	148	if(GLOBALS->std_dnd_tgt_on_signalarea \|\| GLOBALS->std_dnd_tgt_on_wavearea)
123	149	{

445	471	GLOBALS->signalarea_event_box, widget, data);
446	472	#endif
447	473
	474	#ifdef WAVE_USE_GTK2
	475	if ( (event->keyval == GDK_KEY_equal) &&
	476	#ifdef MAC_INTEGRATION
	477	(event->state & GDK_META_MASK)
	478	#else
	479	(event->state & GDK_CONTROL_MASK)
	480	#endif
	481	)
	482	{
	483	service_zoom_in(NULL, NULL);
	484	rc = TRUE;
	485	}
	486	else
	487	#endif
448	488	if(GTK_WIDGET_HAS_FOCUS(GLOBALS->signalarea_event_box))
449	489	{
450	490	switch(event->keyval)

1579	1619	MaxSignalLength();
1580	1620
1581	1621	gtk_widget_set_events(GLOBALS->signalarea,
	1622	#ifdef WAVE_USE_GTK2
	1623	GDK_SCROLL_MASK \|
	1624	#endif
1582	1625	GDK_EXPOSURE_MASK \| GDK_BUTTON_PRESS_MASK \|
1583	1626	GDK_BUTTON_RELEASE_MASK \|
1584	1627	GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK

1614	1657	gtkwave_signal_connect(GTK_OBJECT(GLOBALS->signalarea), "drag_motion", GTK_SIGNAL_FUNC(DNDDragMotionCB), GTK_WIDGET(GLOBALS->signalarea));
1615	1658	gtkwave_signal_connect(GTK_OBJECT(GLOBALS->signalarea), "drag_begin", GTK_SIGNAL_FUNC(DNDBeginCB), GTK_WIDGET(GLOBALS->signalarea));
1616	1659	gtkwave_signal_connect(GTK_OBJECT(GLOBALS->signalarea), "drag_end", GTK_SIGNAL_FUNC(DNDEndCB), GTK_WIDGET(GLOBALS->signalarea));
	1660	#ifdef WAVE_USE_GTK2
	1661	gtkwave_signal_connect(GTK_OBJECT(GLOBALS->signalarea), "drag_failed", GTK_SIGNAL_FUNC(DNDFailedCB), GTK_WIDGET(GLOBALS->signalarea));
	1662	#endif
1617	1663
1618	1664	gtk_drag_dest_set(
1619	1665	GTK_WIDGET(GLOBALS->wavearea),

1627	1673	gtkwave_signal_connect(GTK_OBJECT(GLOBALS->wavearea), "drag_motion", GTK_SIGNAL_FUNC(DNDDragMotionCB), GTK_WIDGET(GLOBALS->wavearea));
1628	1674	gtkwave_signal_connect(GTK_OBJECT(GLOBALS->wavearea), "drag_begin", GTK_SIGNAL_FUNC(DNDBeginCB), GTK_WIDGET(GLOBALS->wavearea));
1629	1675	gtkwave_signal_connect(GTK_OBJECT(GLOBALS->wavearea), "drag_end", GTK_SIGNAL_FUNC(DNDEndCB), GTK_WIDGET(GLOBALS->wavearea));
	1676	#ifdef WAVE_USE_GTK2
	1677	gtkwave_signal_connect(GTK_OBJECT(GLOBALS->wavearea), "drag_failed", GTK_SIGNAL_FUNC(DNDFailedCB), GTK_WIDGET(GLOBALS->wavearea));
	1678	#endif
1630	1679
1631	1680	gtk_drag_source_set(GTK_WIDGET(GLOBALS->signalarea),
1632	1681	GDK_BUTTON1_MASK \| GDK_BUTTON2_MASK,

+24

-0

src/treesearch_gtk2.c less more

1813	1813	}
1814	1814
1815	1815	/*
	1816	* DND "drag_failed" handler, this is called when a drag and drop has
	1817	* failed (e.g., by pressing ESC).
	1818	*/
	1819	static gboolean DNDFailedCB(
	1820	GtkWidget widget, GdkDragContext context, GtkDragResult result)
	1821	{
	1822	(void)widget;
	1823	(void)context;
	1824	(void)result;
	1825
	1826	GLOBALS->dnd_state = 0;
	1827	GLOBALS->tree_dnd_begin = VIEW_DRAG_INACTIVE;
	1828	GLOBALS->tree_dnd_requested = 0;
	1829
	1830	MaxSignalLength();
	1831	signalarea_configure_event(GLOBALS->signalarea, NULL);
	1832	wavearea_configure_event(GLOBALS->wavearea, NULL);
	1833
	1834	return(FALSE);
	1835	}
	1836
	1837
	1838	/*
1816	1839	* DND "drag_end" handler, this is called when a drag and drop has
1817	1840	* completed. So this function is the last one to be called in
1818	1841	* any given DND operation.

2315	2338	gtkwave_signal_connect(GTK_OBJECT(src), "drag_end", GTK_SIGNAL_FUNC(DNDEndCB), win);
2316	2339	gtkwave_signal_connect(GTK_OBJECT(src), "drag_data_get", GTK_SIGNAL_FUNC(DNDDataRequestCB), win);
2317	2340	gtkwave_signal_connect(GTK_OBJECT(src), "drag_data_delete", GTK_SIGNAL_FUNC(DNDDataDeleteCB), win);
	2341	gtkwave_signal_connect(GTK_OBJECT(src), "drag_failed", GTK_SIGNAL_FUNC(DNDFailedCB), win);
2318	2342	}
2319	2343
2320	2344	if(enable_receive) gtkwave_signal_connect(GTK_OBJECT(w), "drag_data_received", GTK_SIGNAL_FUNC(DNDDataReceivedCB), win);

+13

-4

src/vcd.c less more

27	27	* use gperf for port vartypes 19feb07ajb
28	28	* MTI SV implicit-var fix 05apr07ajb
29	29	* MTI SV len=0 is real var 05apr07ajb
	30	* Backtracking fix 16oct18ajb
30	31	*/
31	32
32	33	/* AIX may need this for alloca to work */

1746	1747	{
1747	1748	GLOBALS->start_time_vcd_c_1=tim;
1748	1749	}
	1750	/* backtracking fix */
1749	1751	else
1750	1752	{
1751	1753	if(tim < GLOBALS->current_time_vcd_c_1) /* avoid backtracking time counts which can happen on malformed files */
1752	1754	{
	1755	if(!GLOBALS->vcd_already_backtracked)
	1756	{
	1757	GLOBALS->vcd_already_backtracked = 1;
	1758	fprintf(stderr, "VCDLOAD \| Time backtracking detected in VCD file!\n");
	1759	}
	1760	#if 0
1753	1761	tim = GLOBALS->current_time_vcd_c_1;
	1762	#endif
1754	1763	}
1755	1764	}
1756	1765

1850	1859
1851	1860	if((n->curr->v.h_val!=heval)\|\|(tim==GLOBALS->start_time_vcd_c_1)\|\|(n->vartype==ND_VCD_EVENT)\|\|(GLOBALS->vcd_preserve_glitches)) /* same region == go skip */
1852	1861	{
1853		if(n->curr->time==tim)
	1862	if(n->curr->time>=tim) /* backtracking fix */
1854	1863	{
1855	1864	DEBUG(printf("Warning: Glitch at time ["TTFormat"] Signal [%p], Value [%c->%c].\n",
1856	1865	tim, n, AN_STR[n->curr->v.h_val], ch));

1898	1907	{
1899	1908	if(regadd) { tim*=(GLOBALS->time_scale); }
1900	1909
1901		if(n->curr->time==tim)
	1910	if(n->curr->time>=tim) /* backtracking fix */
1902	1911	{
1903	1912	DEBUG(printf("Warning: String Glitch at time ["TTFormat"] Signal [%p].\n",
1904	1913	tim, n));

1961	1970	\|\|(GLOBALS->vcd_preserve_glitches)\|\|(GLOBALS->vcd_preserve_glitches_real)
1962	1971	) /* same region == go skip */
1963	1972	{
1964		if(n->curr->time==tim)
	1973	if(n->curr->time>=tim) /* backtracking fix */
1965	1974	{
1966	1975	DEBUG(printf("Warning: Real number Glitch at time ["TTFormat"] Signal [%p].\n",
1967	1976	tim, n));

2029	2038	\|\|(GLOBALS->vcd_preserve_glitches)
2030	2039	) /* same region == go skip */
2031	2040	{
2032		if(n->curr->time==tim)
	2041	if(n->curr->time>=tim) /* backtracking fix */
2033	2042	{
2034	2043	DEBUG(printf("Warning: Glitch at time ["TTFormat"] Signal [%p], Value [%c->%c].\n",
2035	2044	tim, n, AN_STR[n->curr->v.h_val], ch));

+12

-0

src/vcd_recoder.c less more

30	30	* MTI SV implicit-var fix 05apr07ajb
31	31	* MTI SV len=0 is real var 05apr07ajb
32	32	* VCD fastloading 05mar09ajb
	33	* Backtracking fix 16oct18ajb
33	34	*/
34	35	#include <config.h>
35	36	#include "globals.h"

2046	2047	}
2047	2048	else
2048	2049	{
	2050	/* backtracking fix */
	2051	if(tim < GLOBALS->current_time_vcd_recoder_c_3)
	2052	{
	2053	if(!GLOBALS->vcd_already_backtracked)
	2054	{
	2055	GLOBALS->vcd_already_backtracked = 1;
	2056	fprintf(stderr, "VCDLOAD \| Time backtracking detected in VCD file!\n");
	2057	}
	2058	}
	2059	#if 0
2049	2060	if(tim < GLOBALS->current_time_vcd_recoder_c_3) /* avoid backtracking time counts which can happen on malformed files */
2050	2061	{
2051	2062	tim = GLOBALS->current_time_vcd_recoder_c_3;
2052	2063	}
	2064	#endif
2053	2065
2054	2066	if(GLOBALS->time_vlist_vcd_recoder_write)
2055	2067	{

+23

-19

src/wavewindow.c less more

3712	3712	*/
3713	3713
3714	3714	/* draw trans */
3715		type = (!(h->flags&(HIST_REAL\|HIST_STRING))) ? vtype(t,h->v.h_vector) : AN_0;
	3715	type = (!(h->flags&(HIST_REAL\|HIST_STRING))) ? vtype(t,h->v.h_vector) : AN_COUNT;
3716	3716	tv = tv2 = mynan;
3717	3717
3718	3718	if(h->flags&HIST_REAL)

3796	3796	skipcnt = 0;
3797	3797	}
3798	3798
3799		if(type == AN_0)
	3799	if(type != AN_X)
3800	3800	{
3801	3801	c = GLOBALS->gc.gc_vbox_wavewindow_c_1;
3802	3802	}

4090	4090	else
4091	4091	{
4092	4092	/* s\000 ID is special "z" case */
4093		type = AN_0;
	4093	type = AN_COUNT;
4094	4094
4095	4095	if(h->flags&HIST_STRING)
4096	4096	{

4114	4114	}
4115	4115	}
4116	4116	}
4117		/* type = (!(h->flags&(HIST_REAL\|HIST_STRING))) ? vtype(t,h->v.h_vector) : AN_0; */
	4117	/* type = (!(h->flags&(HIST_REAL\|HIST_STRING))) ? vtype(t,h->v.h_vector) : AN_COUNT; */
4118	4118	if(_x0>-1) {
4119	4119	GdkGC gltype, gtype;
4120	4120

4137	4137	if (type == AN_Z) {
4138	4138	if (lasttype != -1) {
4139	4139	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gltype,_x0-1, _y0,_x0, yu);
4140		wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gltype,_x0, yu,_x0-1, _y1);
	4140	if(lasttype != AN_0) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gltype,_x0, yu,_x0-1, _y1);
4141	4141	}
4142	4142	} else
4143	4143	if (lasttype==AN_Z) {
4144	4144	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0+1, _y0,_x0, yu);
4145		wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0, yu,_x0+1, _y1);
	4145	if( type != AN_0) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0, yu,_x0+1, _y1);
4146	4146	} else {
4147	4147	if (lasttype != type) {
4148	4148	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gltype,_x0-1, _y0,_x0, yu);
4149		wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gltype,_x0, yu,_x0-1, _y1);
	4149	if(lasttype != AN_0) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gltype,_x0, yu,_x0-1, _y1);
4150	4150	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0+1, _y0,_x0, yu);
4151		wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0, yu,_x0+1, _y1);
	4151	if( type != AN_0) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0, yu,_x0+1, _y1);
4152	4152	} else {
4153	4153	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0-2, _y0,_x0+2, _y1);
4154	4154	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0+2, _y0,_x0-2, _y1);

4176	4176	}
4177	4177	else
4178	4178	{
4179		if(type == AN_0)
	4179	if(type != AN_X)
4180	4180	{
4181	4181	c = GLOBALS->gc.gc_vbox_wavewindow_c_1;
4182	4182	}

4188	4188	if(GLOBALS->use_roundcaps)
4189	4189	{
4190	4190	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0+2, _y0,_x1-2, _y0);
4191		wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0+2, _y1,_x1-2, _y1);
	4191	if(type != AN_0) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0+2, _y1,_x1-2, _y1);
	4192	if(type == AN_1) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0+2, _y1+1,_x1-2, _y1+1);
4192	4193	}
4193	4194	else
4194	4195	{
4195	4196	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0, _y0,_x1, _y0);
4196		wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0, _y1,_x1, _y1);
	4197	if(type != AN_0) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0, _y1,_x1, _y1);
	4198	if(type == AN_1) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0, _y1+1,_x1, _y1+1);
4197	4199	}
4198	4200
4199	4201	if(_x0<0) _x0=0; /* fixup left margin */

4612	4614	skipcnt = 0;
4613	4615	}
4614	4616
4615		if(type == AN_0)
	4617	if(type != AN_X)
4616	4618	{
4617	4619	c = GLOBALS->gc.gc_vbox_wavewindow_c_1;
4618	4620	}

4941	4943	if (lasttype != -1)
4942	4944	{
4943	4945	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gltype,_x0-1, _y0,_x0, yu);
4944		wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gltype,_x0, yu,_x0-1, _y1);
	4946	if(lasttype != AN_0) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gltype,_x0, yu,_x0-1, _y1);
4945	4947	}
4946	4948	}
4947	4949	else
4948	4950	if (lasttype==AN_Z)
4949	4951	{
4950	4952	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0+1, _y0,_x0, yu);
4951		wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0, yu,_x0+1, _y1);
	4953	if( type != AN_0) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0, yu,_x0+1, _y1);
4952	4954	}
4953	4955	else
4954	4956	{
4955	4957	if (lasttype != type)
4956	4958	{
4957	4959	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gltype,_x0-1, _y0,_x0, yu);
4958		wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gltype,_x0, yu,_x0-1, _y1);
	4960	if(lasttype != AN_0) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gltype,_x0, yu,_x0-1, _y1);
4959	4961	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0+1, _y0,_x0, yu);
4960		wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0, yu,_x0+1, _y1);
	4962	if( type != AN_0) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, gtype,_x0, yu,_x0+1, _y1);
4961	4963	}
4962	4964	else
4963	4965	{

4987	4989	}
4988	4990	else
4989	4991	{
4990		if(type == AN_0)
	4992	if(type != AN_X)
4991	4993	{
4992	4994	c = GLOBALS->gc.gc_vbox_wavewindow_c_1;
4993	4995	}

4999	5001	if(GLOBALS->use_roundcaps)
5000	5002	{
5001	5003	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0+2, _y0,_x1-2, _y0);
5002		wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0+2, _y1,_x1-2, _y1);
	5004	if(type != AN_0) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0+2, _y1,_x1-2, _y1);
	5005	if(type == AN_1) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0+2, _y1+1,_x1-2, _y1+1);
5003	5006	}
5004	5007	else
5005	5008	{
5006	5009	wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0, _y0,_x1, _y0);
5007		wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0, _y1,_x1, _y1);
	5010	if(type != AN_0) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0, _y1,_x1, _y1);
	5011	if(type == AN_1) wave_gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, c,_x0, _y1+1,_x1, _y1+1);
5008	5012	}
5009	5013
5010	5014