[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC vs.
Revision 1.118 by root, Sat Apr 15 23:25:00 2006 UTC

…		…
7		7
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $TOPLEVEL;	12	our $ROOT;
13	our $BUTTON_STATE;	13	our $BUTTON_STATE;
14		14
15	# class methods for events	15	# class methods for events
16	sub feed_sdl_key_down_event {	16	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	17	$FOCUS->key_down ($_[0]) if $FOCUS;
…		…
24	sub feed_sdl_button_down_event {	24	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	25	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27		27
28	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
29	my $widget = $TOPLEVEL->find_widget ($x, $y);	29	my $widget = $ROOT->find_widget ($x, $y);
30		30
31	$GRAB = $widget;	31	$GRAB = $widget;
32	$GRAB->update if $GRAB;	32	$GRAB->update if $GRAB;
33	}	33	}
34		34
35	$BUTTON_STATE \|= 1 << ($ev->button - 1);	35	$BUTTON_STATE \|= 1 << ($ev->button - 1);
36		36
37	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;	37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	38	}
39		39
40	sub feed_sdl_button_up_event {	40	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	41	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43		43
44	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	44	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
45		45
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
47		47
48	$GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;	48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		49
50	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	52	$grab->update if $grab;
53	$GRAB->update if $GRAB;	53	$GRAB->update if $GRAB;
…		…
56		56
57	sub feed_sdl_motion_event {	57	sub feed_sdl_motion_event {
58	my ($ev) = @_;	58	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60		60
61	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
62		62
63	if ($widget != $HOVER) {	63	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	64	my $hover = $HOVER; $HOVER = $widget;
65		65
66	$hover->update if $hover && $hover->{can_hover};	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	67	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}	68	}
69		69
70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;	70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
		71	}
		72
		73	# convert position array to integers
		74	sub harmonize {
		75	my ($vals) = @_;
		76
		77	my $rem = 0;
		78
		79	for (@$vals) {
		80	my $i = int $_ + $rem;
		81	$rem += $_ - $i;
		82	$_ = $i;
		83	}
71	}	84	}
72		85
73	#############################################################################	86	#############################################################################
74		87
75	package CFClient::UI::Base;	88	package CFClient::UI::Base;
…		…
99	$self	112	$self
100	}	113	}
101		114
102	sub move {	115	sub move {
103	my ($self, $x, $y, $z) = @_;	116	my ($self, $x, $y, $z) = @_;
104	$self->{x} = $x;	117	$self->{x} = int $x;
105	$self->{y} = $y;	118	$self->{y} = int $y;
106	$self->{z} = $z if defined $z;	119	$self->{z} = $z if defined $z;
107	}	120	}
108		121
109	sub needs_redraw {	122	sub needs_redraw {
110	0	123	0
…		…
133	my ($self, $x, $y, $w, $h) = @_;	146	my ($self, $x, $y, $w, $h) = @_;
134		147
135	$self->_size_allocate ($x, $y, $w, $h);	148	$self->_size_allocate ($x, $y, $w, $h);
136	}	149	}
137		150
		151	# return top left coordinates
		152	sub _topleft {
		153	my ($self, $x, $y) = @_;
		154
		155	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
		156	}
		157
138	# translate global coordinates to local coordinate system	158	# translate global coordinates to local coordinate system
139	sub translate {	159	sub coord2local {
140	my ($self, $x, $y) = @_;	160	my ($self, $x, $y) = @_;
141		161
142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	162	my ($X, $Y) = $self->_topleft;
		163	($x - $X, $y - $Y)
		164	}
		165
		166	# translate local coordinates to global coordinate system
		167	sub coord2global {
		168	my ($self, $x, $y) = @_;
		169
		170	my ($X, $Y) = $self->_topleft;
		171	($x + $X, $y + $Y)
143	}	172	}
144		173
145	sub focus_in {	174	sub focus_in {
146	my ($self) = @_;	175	my ($self) = @_;
147		176
…		…
220		249
221	()	250	()
222	}	251	}
223		252
224	sub set_parent {	253	sub set_parent {
225	my ($self, $par) = @_;	254	my ($self, $parent) = @_;
226		255
227	$self->{parent} = $par;
228	Scalar::Util::weaken $self->{parent};	256	Scalar::Util::weaken ($self->{parent} = $parent);
229	}
230
231	sub get_parent {
232	$_[0]->{parent}
233	}	257	}
234		258
235	sub update {	259	sub update {
236	my ($self) = @_;	260	my ($self) = @_;
237		261
…		…
326		350
327	$self	351	$self
328	}	352	}
329		353
330	sub add {	354	sub add {
331	my ($self, $chld) = @_;	355	my ($self, $child) = @_;
332		356
333	$chld->set_parent ($self);	357	$child->set_parent ($self);
		358
		359	use sort 'stable';
334		360
335	$self->{children} = [	361	$self->{children} = [
336	sort { $a->{z} <=> $b->{z} }	362	sort { $a->{z} <=> $b->{z} }
337	@{$self->{children}}, $chld	363	@{$self->{children}}, $child
338	];	364	];
339		365
340	$self->{w} = $self->{h} = -1;	366	$self->{w} = $self->{h} = -1;
341	$self->update;	367	$self->update;
342	}	368	}
…		…
539	# TODO: user_x, user_y, overwrite moveto?	565	# TODO: user_x, user_y, overwrite moveto?
540		566
541	$class->SUPER::new (	567	$class->SUPER::new (
542	bg => [1, 1, 1, 1],	568	bg => [1, 1, 1, 1],
543	border_bg => [1, 1, 1, 1],	569	border_bg => [1, 1, 1, 1],
544	border => $::FONTSIZE * 0.8,	570	border => int $::FONTSIZE * 0.8,
545	@_	571	@_
546	)	572	)
547	}	573	}
548		574
549	sub size_request {	575	sub size_request {
…		…
672	@_	698	@_
673	)	699	)
674	}	700	}
675		701
676	sub add {	702	sub add {
677	my ($self, $x, $y, $chld) = @_;	703	my ($self, $x, $y, $child) = @_;
678		704
		705	$child->set_parent ($self);
679	$self->{children}[$y][$x] = $chld;	706	$self->{children}[$y][$x] = $child;
680	$chld->set_parent ($self);
681		707
682	$self->{w} = $self->{h} = -1;	708	$self->{w} = $self->{h} = -1;
		709	$self->update;
		710	}
		711
		712	# TODO: move to container class maybe? send childs a signal on removal?
		713	sub clear {
		714	my ($self) = @_;
		715
		716	delete $self->{children};
683	$self->update;	717	$self->update;
684	}	718	}
685		719
686	sub get_wh {	720	sub get_wh {
687	my ($self) = @_;	721	my ($self) = @_;
…		…
733		767
734	# linearly scale sizes	768	# linearly scale sizes
735	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	769	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	770	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
737		771
738	$_ = int $_ for @$ws; #TODO: avoid rounding problems	772	CFClient::UI::harmonize $ws;
739	$_ = int $_ for @$hs; #TODO: avoid rounding problems	773	CFClient::UI::harmonize $hs;
740		774
741	my $y;	775	my $y;
742		776
743	for my $r (0 .. $#{$self->{children}}) {	777	for my $r (0 .. $#{$self->{children}}) {
744	my $row = $self->{children}[$r]	778	my $row = $self->{children}[$r]
…		…
832	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	866	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833	$h[$_] = $alloc_h;	867	$h[$_] = $alloc_h;
834	}	868	}
835	}	869	}
836		870
		871	CFClient::UI::harmonize \@h;
		872
837	my $y = 0;	873	my $y = 0;
838	for (0 .. $#$children) {	874	for (0 .. $#$children) {
839	my $child = $children->[$_];	875	my $child = $children->[$_];
840	my $h = int $h[$_];	876	my $h = $h[$_];
841	$child->size_allocate ($y, 0, $h, $w);	877	$child->size_allocate ($y, 0, $h, $w);
842		878
843	$y += $h;	879	$y += $h;
844	}	880	}
845	}	881	}
…		…
886		922
887	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	923	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888	}	924	}
889	}	925	}
890		926
		927	CFClient::UI::harmonize \@h;
		928
891	my $y = 0;	929	my $y = 0;
892	for (0 .. $#$children) {	930	for (0 .. $#$children) {
893	my $child = $children->[$_];	931	my $child = $children->[$_];
894	my $h = int $h[$_];	932	my $h = $h[$_];
895	$child->size_allocate (0, $y, $w, $h);	933	$child->size_allocate (0, $y, $w, $h);
896		934
897	$y += $h;	935	$y += $h;
898	}	936	}
899	}	937	}
…		…
912	my $self = $class->SUPER::new (	950	my $self = $class->SUPER::new (
913	fg => [1, 1, 1],	951	fg => [1, 1, 1],
914	fontsize => $::FONTSIZE,	952	fontsize => $::FONTSIZE,
915	text => "",	953	text => "",
916	align => -1,	954	align => -1,
		955	valign => -1,
917	padding => 2,	956	padding => 2,
918	layout => new CFClient::Layout,	957	layout => new CFClient::Layout,
919	%arg	958	%arg
920	);	959	);
921		960
…		…
998	my $x =	1037	my $x =
999	$self->{align} < 0 ? $self->{padding}	1038	$self->{align} < 0 ? $self->{padding}
1000	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1039	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001	: ($self->{w} - $tex->{w}) * 0.5;	1040	: ($self->{w} - $tex->{w}) * 0.5;
1002		1041
1003	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);	1042	my $y =
		1043	$self->{valign} < 0 ? $self->{padding}
		1044	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1045	: ($self->{h} - $tex->{h}) * 0.5;
		1046
		1047	$tex->draw_quad (int $x, int $y);
1004		1048
1005	glDisable GL_TEXTURE_2D;	1049	glDisable GL_TEXTURE_2D;
1006	glDisable GL_BLEND;	1050	glDisable GL_BLEND;
1007	}	1051	}
1008		1052
…		…
1023	bg => [0, 0, 0, 0.2],	1067	bg => [0, 0, 0, 0.2],
1024	active_bg => [1, 1, 1, 0.5],	1068	active_bg => [1, 1, 1, 0.5],
1025	active_fg => [0, 0, 0],	1069	active_fg => [0, 0, 0],
1026	can_hover => 1,	1070	can_hover => 1,
1027	can_focus => 1,	1071	can_focus => 1,
		1072	valign => 0,
1028	@_	1073	@_
1029	)	1074	)
1030	}	1075	}
1031		1076
1032	sub _set_text {	1077	sub _set_text {
…		…
1427	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1472	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1428	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1473	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1429		1474
1430	my ($value, $lo, $hi, $page) = @{$self->{range}};	1475	my ($value, $lo, $hi, $page) = @{$self->{range}};
1431		1476
		1477	$hi = $value + 1 if $lo == $hi;
		1478
1432	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	1479	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1433	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1480	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1434		1481
1435	$page = int $page * $inner_w / ($hi - $lo);	1482	$page = int $page * $inner_w / ($hi - $lo);
1436	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1483	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
…		…
1482	(new CFClient::UI::Empty expand => 1),	1529	(new CFClient::UI::Empty expand => 1),
1483	(new CFClient::UI::Slider vertical => 1),	1530	(new CFClient::UI::Slider vertical => 1),
1484	],	1531	],
1485	);	1532	);
1486		1533
		1534	$self->{children}[1]->connect (changed => sub {
		1535	$self->update;
		1536	});
		1537
1487	$self	1538	$self
		1539	}
		1540
		1541	sub set_fontsize {
		1542	my ($self, $fontsize) = @_;
		1543
		1544	$self->{fontsize} = $fontsize;
		1545	$self->reflow;
1488	}	1546	}
1489		1547
1490	sub text_height {	1548	sub text_height {
1491	my ($self, $text) = @_;	1549	my ($self, $text) = @_;
1492		1550
…		…
1500	}	1558	}
1501		1559
1502	sub reflow {	1560	sub reflow {
1503	my ($self) = @_;	1561	my ($self) = @_;
1504		1562
1505	my $height = 0;	1563	$self->{need_reflow}++;
1506		1564	$self->update;
1507	for (@{$self->{par}}) {
1508	$height += $_->[0] = $self->text_height ($_->[2]);
1509	}
1510
1511	$self->{height} = $height;
1512
1513	$self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1514	}	1565	}
1515		1566
1516	sub size_request {	1567	sub size_request {
1517	my ($self) = @_;	1568	my ($self) = @_;
1518		1569
…		…
1526		1577
1527	$self->{layout}->set_height ($self->{fontsize});	1578	$self->{layout}->set_height ($self->{fontsize});
1528	$self->{layout}->set_width ($self->{w});	1579	$self->{layout}->set_width ($self->{w});
1529		1580
1530	$self->reflow;	1581	$self->reflow;
1531	$self->update;
1532	}	1582	}
1533		1583
1534	sub add_paragraph {	1584	sub add_paragraph {
1535	my ($self, $color, $text) = @_;	1585	my ($self, $color, $text) = @_;
1536		1586
…		…
1551		1601
1552	$self->SUPER::update;	1602	$self->SUPER::update;
1553		1603
1554	return unless $self->{h} > 0;	1604	return unless $self->{h} > 0;
1555		1605
		1606	delete $self->{texture};
		1607
		1608	$ROOT->on_refresh ($self, sub {
		1609	if (delete $self->{need_reflow}) {
		1610	my $height = 0;
		1611
		1612	$height += $_->[0] = $self->text_height ($_->[2])
		1613	for @{$self->{par}};
		1614
		1615	$self->{height} = $height;
		1616
		1617	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1618
		1619	delete $self->{texture};
		1620	}
		1621
1556	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	1622	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1557	glClearColor 0, 0, 0, 1;	1623	glClearColor 0, 0, 0, 1;
1558	glClear GL_COLOR_BUFFER_BIT;	1624	glClear GL_COLOR_BUFFER_BIT;
1559		1625
1560	my $y0 = $self->{height} - $self->{h};
1561	my $y1 = $self->{height};
1562
1563	glEnable GL_BLEND;	1626	glEnable GL_BLEND;
1564	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1627	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1565	glEnable GL_TEXTURE_2D;	1628	glEnable GL_TEXTURE_2D;
1566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1629	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567		1630
		1631	my $top = int $self->{children}[1]{range}[0];
		1632
		1633	my $y0 = $top;
		1634	my $y1 = $top + $self->{h};
		1635
1568	my $y = 0;	1636	my $y = 0;
1569		1637
1570	my $layout = $self->{layout};	1638	my $layout = $self->{layout};
1571		1639
1572	for my $par (@{$self->{par}}) {	1640	for my $par (@{$self->{par}}) {
1573	my $h = $par->[0];	1641	my $h = $par->[0];
1574		1642
1575	if ($y0 < $y + $h && $y < $y1) {	1643	if ($y0 < $y + $h && $y < $y1) {
1576	$layout->set_text ($par->[2]);	1644	$layout->set_text ($par->[2]);
1577		1645
1578	glColor @{ $par->[1] };	1646	glColor @{ $par->[1] };
1579	my ($W, $H) = $layout->size;	1647	my ($W, $H) = $layout->size;
1580	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	1648	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1649	}
		1650
		1651	$y += $h;
1581	}	1652	}
1582		1653
1583	$y += $h;
1584	}
1585
1586	glDisable GL_TEXTURE_2D;	1654	glDisable GL_TEXTURE_2D;
1587	glDisable GL_BLEND;	1655	glDisable GL_BLEND;
		1656	};
1588	};	1657	});
1589	}	1658	}
1590		1659
1591	sub _draw {	1660	sub _draw {
1592	my ($self) = @_;	1661	my ($self) = @_;
1593		1662
…		…
1631	}	1700	}
1632		1701
1633	sub key_up {	1702	sub key_up {
1634	}	1703	}
1635		1704
		1705	sub button_down {
		1706	my ($self, $ev, $x, $y) = @_;
		1707
		1708	$self->focus_in;
		1709
		1710	if ($ev->button == 2) {
		1711	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1712	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1713
		1714	$self->{motion} = sub {
		1715	my ($ev, $x, $y) = @_;
		1716
		1717	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1718
		1719	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1720	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1721
		1722	$self->update;
		1723	};
		1724	}
		1725	}
		1726
		1727	sub button_up {
		1728	my ($self, $ev, $x, $y) = @_;
		1729
		1730	delete $self->{motion};
		1731	}
		1732
		1733	sub mouse_motion {
		1734	my ($self, $ev, $x, $y) = @_;
		1735
		1736	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1737	}
		1738
1636	sub size_request {	1739	sub size_request {
1637	(	1740	(
1638	1 + 32 * int $::WIDTH / 32,	1741	1 + 32 * int $::WIDTH / 32,
1639	1 + 32 * int $::HEIGHT / 32,	1742	1 + 32 * int $::HEIGHT / 32,
1640	)	1743	)
…		…
1648	}	1751	}
1649		1752
1650	sub draw {	1753	sub draw {
1651	my ($self) = @_;	1754	my ($self) = @_;
1652		1755
1653	$self->{need_update}++;#d#
1654	if (delete $self->{need_update}) {	1756	if (delete $self->{need_update}) {
1655	glNewList $self->{list}, GL_COMPILE;	1757	glNewList $self->{list}, GL_COMPILE;
1656		1758
1657	my $sw = int $::WIDTH / 32;
1658	my $sh = int $::HEIGHT / 32;
1659
1660	if ($::MAP) {	1759	if ($::MAP) {
		1760	my $sw = int $::WIDTH / 32;
		1761	my $sh = int $::HEIGHT / 32;
		1762
		1763	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1764	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1765
		1766	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1767
1661	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1768	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1662		1769
1663	if ($::CFG->{fow_enable}) {	1770	if ($::CFG->{fow_enable}) {
1664	if ($::CFG->{fow_smooth}) { # smooth fog of war	1771	if ($::CFG->{fow_smooth}) { # smooth fog of war
1665	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1772	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1666	glConvolutionFilter2D	1773	glConvolutionFilter2D
…		…
1674	0.1, 0.1, 0.1,	1781	0.1, 0.1, 0.1,
1675	;	1782	;
1676	glEnable GL_CONVOLUTION_2D;	1783	glEnable GL_CONVOLUTION_2D;
1677	}	1784	}
1678		1785
1679	my $tex = new CFClient::Texture	1786	$self->{fow_texture} = new CFClient::Texture
1680	w => $w,	1787	w => $w,
1681	h => $h,	1788	h => $h,
1682	data => $data,	1789	data => $data,
1683	internalformat => GL_ALPHA,	1790	internalformat => GL_ALPHA,
1684	format => GL_ALPHA;	1791	format => GL_ALPHA;
1685		1792
1686	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1793	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1687		1794
1688	glEnable GL_BLEND;	1795	glEnable GL_BLEND;
		1796	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1689	glEnable GL_TEXTURE_2D;	1797	glEnable GL_TEXTURE_2D;
1690	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1798	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1691		1799
1692	glColor +($::CFG->{fow_intensity}) x 3, 1;	1800	glColor +($::CFG->{fow_intensity}) x 3, 1;
1693	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1801	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1694		1802
1695	glDisable GL_TEXTURE_2D;	1803	glDisable GL_TEXTURE_2D;
1696	glDisable GL_BLEND;	1804	glDisable GL_BLEND;
1697	}	1805	}
		1806
		1807	# HACK BEGIN
		1808	{
		1809	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1810	my ($w, $h) = (250, 250);
		1811
		1812	glEnable GL_BLEND;
		1813	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1814	glEnable GL_TEXTURE_2D;
		1815	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1816
		1817	$self->{mapmap_texture} =
		1818	new CFClient::Texture
		1819	w => $w,
		1820	h => $h,
		1821	data => $::MAP->mapmap ($w, $h),
		1822	type => GL_UNSIGNED_INT_8_8_8_8_REV;
		1823
		1824	$self->{mapmap_texture}->draw_quad (100, 100);
		1825
		1826	glDisable GL_TEXTURE_2D;
		1827	glDisable GL_BLEND;
		1828	}
		1829	# HACK END
1698	}	1830	}
1699		1831
1700	glEndList;	1832	glEndList;
1701	}	1833	}
1702		1834
		1835	glPushMatrix;
1703	glCallList $self->{list};	1836	glCallList $self->{list};
		1837	glPopMatrix;
1704		1838
1705	if ($FOCUS != $self) {	1839	if ($FOCUS != $self) {
1706	glColor 64/255, 64/255, 64/255;	1840	glColor 64/255, 64/255, 64/255;
1707	glLogicOp GL_AND;	1841	glLogicOp GL_AND;
1708	glEnable GL_COLOR_LOGIC_OP;	1842	glEnable GL_COLOR_LOGIC_OP;
…		…
1841	sub toggle_flopper {	1975	sub toggle_flopper {
1842	my ($self) = @_;	1976	my ($self) = @_;
1843		1977
1844	# TODO: use animation	1978	# TODO: use animation
1845	if ($self->{state} = !$self->{state}) {	1979	if ($self->{state} = !$self->{state}) {
1846	$CFClient::UI::TOPLEVEL->add ($self->{other});	1980	$CFClient::UI::ROOT->add ($self->{other});
1847	$self->{other}->move (	1981	$self->{other}->move ($self->coord2global (0, $self->{h}));
1848	($::WIDTH - $self->{other}{w}) * 0.5,	1982	$self->emit ("open");
1849	($::HEIGHT - $self->{other}{h}) * 0.5,
1850	);
1851	} else {	1983	} else {
1852	$CFClient::UI::TOPLEVEL->remove ($self->{other});	1984	$CFClient::UI::ROOT->remove ($self->{other});
		1985	$self->emit ("close");
1853	}	1986	}
1854	}
1855		1987
1856	#############################################################################	1988	$self->emit (changed => $self->{state});
		1989	}
1857		1990
		1991	#############################################################################
		1992
1858	package CFClient::UI::Toplevel;	1993	package CFClient::UI::Root;
1859		1994
1860	our @ISA = CFClient::UI::Container::;	1995	our @ISA = CFClient::UI::Container::;
		1996
		1997	use SDL::OpenGL;
1861		1998
1862	sub size_request {	1999	sub size_request {
1863	($::WIDTH, $::HEIGHT)	2000	($::WIDTH, $::HEIGHT)
1864	}	2001	}
1865		2002
…		…
1870		2007
1871	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2008	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1872	for @{$self->{children}};	2009	for @{$self->{children}};
1873	}	2010	}
1874		2011
1875	sub translate {	2012	sub _topleft {
1876	my ($self, $x, $y) = @_;	2013	my ($self, $x, $y) = @_;
1877		2014
1878	($x, $y)	2015	($x, $y)
1879	}	2016	}
1880		2017
…		…
1888	sub add {	2025	sub add {
1889	my ($self, $widget) = @_;	2026	my ($self, $widget) = @_;
1890		2027
1891	$self->SUPER::add ($widget);	2028	$self->SUPER::add ($widget);
1892		2029
1893	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2030	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
		2031	}
		2032
		2033	sub on_refresh {
		2034	my ($self, $id, $cb) = @_;
		2035
		2036	$self->{refresh_hook}{$id} = $cb;
1894	}	2037	}
1895		2038
1896	sub draw {	2039	sub draw {
1897	my ($self) = @_;	2040	my ($self) = @_;
1898		2041
		2042	while (my $rcb = delete $self->{refresh_hook}) {
		2043	$_->() for values %$rcb;
		2044	}
		2045
		2046	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2047	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2048	glClear GL_COLOR_BUFFER_BIT;
		2049
		2050	glMatrixMode GL_PROJECTION;
		2051	glLoadIdentity;
		2052	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2053	glMatrixMode GL_MODELVIEW;
		2054	glLoadIdentity;
		2055
1899	$self->_draw;	2056	$self->_draw;
1900	}	2057	}
1901		2058
1902	#############################################################################	2059	#############################################################################
1903		2060
1904	package CFClient::UI;	2061	package CFClient::UI;
1905		2062
1906	$TOPLEVEL = new CFClient::UI::Toplevel;	2063	$ROOT = new CFClient::UI::Root;
1907		2064
1908	1	2065	1
1909		2066

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC vs. Revision 1.118 by root, Sat Apr 15 23:25:00 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC vs.
Revision 1.118 by root, Sat Apr 15 23:25:00 2006 UTC