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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.103 by elmex, Fri Apr 14 13:51:36 2006 UTC vs.
Revision 1.114 by root, Sat Apr 15 13:56:25 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;	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $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;
…		…
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	}
…		…
439	}	465	}
440		466
441	sub render_chld {	467	sub render_chld {
442	my ($self) = @_;	468	my ($self) = @_;
443		469
444	$self->{texture} =	470	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445	CFClient::Texture->new_from_opengl (	471	glClearColor 0, 0, 0, 1;
446	$self->{w}, $self->{h}, sub { $self->child->draw }	472	glClear GL_COLOR_BUFFER_BIT;
447	);	473	$self->child->draw;
		474	};
448	}	475	}
449		476
450	sub size_allocate {	477	sub size_allocate {
451	my ($self, $x, $y, $w, $h) = @_;	478	my ($self, $x, $y, $w, $h) = @_;
452		479
…		…
671	@_	698	@_
672	)	699	)
673	}	700	}
674		701
675	sub add {	702	sub add {
676	my ($self, $x, $y, $chld) = @_;	703	my ($self, $x, $y, $child) = @_;
677		704
		705	$child->set_parent ($self);
678	$self->{children}[$y][$x] = $chld;	706	$self->{children}[$y][$x] = $child;
679	$chld->set_parent ($self);
680		707
681	$self->{w} = $self->{h} = -1;	708	$self->{w} = $self->{h} = -1;
682	$self->update;	709	$self->update;
683	}	710	}
684		711
…		…
731	my $col_expand = (sum @col_expand) \|\| 1;	758	my $col_expand = (sum @col_expand) \|\| 1;
732		759
733	# linearly scale sizes	760	# linearly scale sizes
734	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	761	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	762	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
		763
		764	CFClient::UI::harmonize $ws;
		765	CFClient::UI::harmonize $hs;
736		766
737	my $y;	767	my $y;
738		768
739	for my $r (0 .. $#{$self->{children}}) {	769	for my $r (0 .. $#{$self->{children}}) {
740	my $row = $self->{children}[$r]	770	my $row = $self->{children}[$r]
…		…
828	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	858	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829	$h[$_] = $alloc_h;	859	$h[$_] = $alloc_h;
830	}	860	}
831	}	861	}
832		862
		863	CFClient::UI::harmonize \@h;
		864
833	my $y = 0;	865	my $y = 0;
834	for (0 .. $#$children) {	866	for (0 .. $#$children) {
835	my $child = $children->[$_];	867	my $child = $children->[$_];
836	my $h = $h[$_];	868	my $h = $h[$_];
837	$child->size_allocate ($y, 0, $h, $w);	869	$child->size_allocate ($y, 0, $h, $w);
…		…
882		914
883	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	915	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
884	}	916	}
885	}	917	}
886		918
		919	CFClient::UI::harmonize \@h;
		920
887	my $y = 0;	921	my $y = 0;
888	for (0 .. $#$children) {	922	for (0 .. $#$children) {
889	my $child = $children->[$_];	923	my $child = $children->[$_];
890	my $h = $h[$_];	924	my $h = $h[$_];
891	$child->size_allocate (0, $y, $w, $h);	925	$child->size_allocate (0, $y, $w, $h);
…		…
904		938
905	sub new {	939	sub new {
906	my ($class, %arg) = @_;	940	my ($class, %arg) = @_;
907		941
908	my $self = $class->SUPER::new (	942	my $self = $class->SUPER::new (
909	fg => [1, 1, 1],	943	fg => [1, 1, 1],
910	height => $::FONTSIZE,	944	fontsize => $::FONTSIZE,
911	text => "",	945	text => "",
912	align => -1,	946	align => -1,
913	padding => 2,	947	padding => 2,
914	layout => new CFClient::Layout,	948	layout => new CFClient::Layout,
915	%arg	949	%arg
916	);	950	);
917		951
918	$self->set_text ($self->{text});	952	$self->set_text ($self->{text});
919		953
…		…
949		983
950	sub size_request {	984	sub size_request {
951	my ($self) = @_;	985	my ($self) = @_;
952		986
953	$self->{layout}->set_width;	987	$self->{layout}->set_width;
954	$self->{layout}->set_height ($self->{height});	988	$self->{layout}->set_height ($self->{fontsize});
955	my ($w, $h) = $self->{layout}->size;	989	my ($w, $h) = $self->{layout}->size;
956		990
957	(	991	(
958	$w + $self->{padding} * 2,	992	$w + $self->{padding} * 2,
959	$h + $self->{padding} * 2,	993	$h + $self->{padding} * 2,
…		…
978	sub _draw {	1012	sub _draw {
979	my ($self) = @_;	1013	my ($self) = @_;
980		1014
981	my $tex = $self->{texture} \|\|= do {	1015	my $tex = $self->{texture} \|\|= do {
982	$self->{layout}->set_width ($self->{w});	1016	$self->{layout}->set_width ($self->{w});
983	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1017	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
984	new_from_layout CFClient::Texture $self->{layout}	1018	new_from_layout CFClient::Texture $self->{layout}
985	};	1019	};
986		1020
987	glEnable GL_BLEND;	1021	glEnable GL_BLEND;
988	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1022	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989	glEnable GL_TEXTURE_2D;	1023	glEnable GL_TEXTURE_2D;
990	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1024	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
991		1025
992	glColor @{$self->{fg}};	1026	glColor @{$self->{fg}};
993		1027
994	my $x =	1028	my $x =
995	$self->{align} < 0 ? $self->{padding}	1029	$self->{align} < 0 ? $self->{padding}
996	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1030	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997	: ($self->{w} - $tex->{w}) * 0.5;	1031	: ($self->{w} - $tex->{w}) * 0.5;
998		1032
999	glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;	1033	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1000	$tex->draw_quad (0, 0);
1001		1034
1002	glDisable GL_TEXTURE_2D;	1035	glDisable GL_TEXTURE_2D;
1003	glDisable GL_BLEND;	1036	glDisable GL_BLEND;
1004	}	1037	}
1005		1038
…		…
1033		1066
1034	$self->{last_activity} = $::NOW;	1067	$self->{last_activity} = $::NOW;
1035		1068
1036	$self->{text} = $text;	1069	$self->{text} = $text;
1037	$self->{layout}->set_width ($self->{w});	1070	$self->{layout}->set_width ($self->{w});
1038	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1071	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1039		1072
1040	$text =~ s/./*/g if $self->{hidden};	1073	$text =~ s/./*/g if $self->{hidden};
1041		1074
1042	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1075	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043		1076
…		…
1424	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1457	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1458	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426		1459
1427	my ($value, $lo, $hi, $page) = @{$self->{range}};	1460	my ($value, $lo, $hi, $page) = @{$self->{range}};
1428		1461
		1462	$hi = $value + 1 if $lo == $hi;
		1463
1429	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	1464	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1465	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431		1466
1432	$page = int $page * $inner_w / ($hi - $lo);	1467	$page = int $page * $inner_w / ($hi - $lo);
1433	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1468	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
…		…
1465		1500
1466	sub new {	1501	sub new {
1467	my $class = shift;	1502	my $class = shift;
1468		1503
1469	my $self = $class->SUPER::new (	1504	my $self = $class->SUPER::new (
		1505	req_w => $::WIDTH / 6,
		1506	req_h => $::HEIGHT / 6,
		1507	fontsize => $::FONTSIZE,
		1508	@_,
		1509
		1510	layout => (new CFClient::Layout),
1470	par => [],	1511	par => [],
1471	@_,	1512	height => 0,
1472	children => [	1513	children => [
1473	(new CFClient::UI::Empty expand => 1),	1514	(new CFClient::UI::Empty expand => 1),
1474	(new CFClient::UI::Slider vertical => 1),	1515	(new CFClient::UI::Slider vertical => 1),
1475	],	1516	],
1476	);	1517	);
1477		1518
		1519	$self->{children}[1]->connect (changed => sub {
		1520	$self->update;
		1521	});
		1522
1478	$self	1523	$self
		1524	}
		1525
		1526	sub set_fontsize {
		1527	my ($self, $fontsize) = @_;
		1528
		1529	$self->{fontsize} = $fontsize;
		1530	$self->reflow;
		1531	}
		1532
		1533	sub text_height {
		1534	my ($self, $text) = @_;
		1535
		1536	my $layout = $self->{layout};
		1537
		1538	$layout->set_height ($self->{fontsize});
		1539	$layout->set_width ($self->{w});
		1540	$layout->set_text ($text);
		1541
		1542	($layout->size)[1]
		1543	}
		1544
		1545	sub reflow {
		1546	my ($self) = @_;
		1547
		1548	$self->{need_reflow}++;
		1549	$self->update;
		1550	}
		1551
		1552	sub size_request {
		1553	my ($self) = @_;
		1554
		1555	($self->{req_w}, $self->{req_h})
		1556	}
		1557
		1558	sub size_allocate {
		1559	my ($self, $x, $y, $w, $h) = @_;
		1560
		1561	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1562
		1563	$self->{layout}->set_height ($self->{fontsize});
		1564	$self->{layout}->set_width ($self->{w});
		1565
		1566	$self->reflow;
1479	}	1567	}
1480		1568
1481	sub add_paragraph {	1569	sub add_paragraph {
1482	my ($self, $color, $text) = @_;	1570	my ($self, $color, $text) = @_;
1483		1571
		1572	#TODO: intelligently "reformat" paragraph
		1573
		1574	my $height = $self->text_height ($text);
		1575
		1576	$self->{height} += $height;
		1577
1484	push @{$self->{par}}, [$color, $text];	1578	push @{$self->{par}}, [$height, $color, $text];
1485	my $count = scalar @{$self->{par}};	1579
1486	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];	1580	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1487	$self->{children}[1]->update;	1581	$self->{children}[1]->update;
1488	}	1582	}
1489		1583
		1584	sub update {
		1585	my ($self) = @_;
		1586
		1587	$self->SUPER::update;
		1588
		1589	return unless $self->{h} > 0;
		1590
		1591	delete $self->{texture};
		1592
		1593	$ROOT->on_refresh ($self, sub {
		1594	if (delete $self->{need_reflow}) {
		1595	my $height = 0;
		1596
		1597	$height += $_->[0] = $self->text_height ($_->[2])
		1598	for @{$self->{par}};
		1599
		1600	$self->{height} = $height;
		1601
		1602	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1603
		1604	delete $self->{texture};
		1605	}
		1606
		1607	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1608	glClearColor 0, 0, 0, 1;
		1609	glClear GL_COLOR_BUFFER_BIT;
		1610
		1611	glEnable GL_BLEND;
		1612	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1613	glEnable GL_TEXTURE_2D;
		1614	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1615
		1616	my $top = int $self->{children}[1]{range}[0];
		1617
		1618	my $y0 = $top;
		1619	my $y1 = $top + $self->{h};
		1620
		1621	my $y = 0;
		1622
		1623	my $layout = $self->{layout};
		1624
		1625	for my $par (@{$self->{par}}) {
		1626	my $h = $par->[0];
		1627
		1628	if ($y0 < $y + $h && $y < $y1) {
		1629	$layout->set_text ($par->[2]);
		1630
		1631	glColor @{ $par->[1] };
		1632	my ($W, $H) = $layout->size;
		1633	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1634	}
		1635
		1636	$y += $h;
		1637	}
		1638
		1639	glDisable GL_TEXTURE_2D;
		1640	glDisable GL_BLEND;
		1641	};
		1642	});
		1643	}
		1644
1490	sub _draw {	1645	sub _draw {
1491	my ($self) = @_;	1646	my ($self) = @_;
1492		1647
1493	my $par = $self->{par};	1648	if ($self->{texture}) {
1494
1495	my $bottom = (scalar @$par) - 1;
1496
1497	my $w = $self->{children}[0]{w};
1498	my $y = $self->{h};
1499
1500	glEnable GL_BLEND;
1501	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1502	glEnable GL_TEXTURE_2D;	1649	glEnable GL_TEXTURE_2D;
1503	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1650	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1504		1651	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1505	# TODO: everything!
1506	while ($y > 0 && $bottom >= 0) {
1507	my $par = $par->[$bottom--];
1508
1509	my $layout = new CFClient::Layout;
1510
1511	$layout->set_height ($::FONTSIZE);
1512	$layout->set_width ($w);
1513	$layout->set_text ($par->[1]);
1514	my $tex = new_from_layout CFClient::Texture $layout;
1515	$y -= $tex->{h};
1516
1517	glColor @{ $par->[0] };
1518	$tex->draw_quad (0, $y);
1519	}
1520
1521	glDisable GL_TEXTURE_2D;	1652	glDisable GL_TEXTURE_2D;
1522	glDisable GL_BLEND;	1653	}
		1654
		1655	$self->{children}[1]->draw;
		1656
1523	}	1657	}
1524		1658
1525	#############################################################################	1659	#############################################################################
1526		1660
1527	package CFClient::UI::MapWidget;	1661	package CFClient::UI::MapWidget;
…		…
1551	}	1685	}
1552		1686
1553	sub key_up {	1687	sub key_up {
1554	}	1688	}
1555		1689
		1690	sub button_down {
		1691	my ($self, $ev, $x, $y) = @_;
		1692
		1693	$self->focus_in;
		1694
		1695	if ($ev->button == 2) {
		1696	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1697	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1698
		1699	$self->{motion} = sub {
		1700	my ($ev, $x, $y) = @_;
		1701
		1702	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1703
		1704	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1705	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1706
		1707	$self->update;
		1708	};
		1709	}
		1710	}
		1711
		1712	sub button_up {
		1713	my ($self, $ev, $x, $y) = @_;
		1714
		1715	delete $self->{motion};
		1716	}
		1717
		1718	sub mouse_motion {
		1719	my ($self, $ev, $x, $y) = @_;
		1720
		1721	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1722	}
		1723
1556	sub size_request {	1724	sub size_request {
1557	(	1725	(
1558	1 + 32 * int $::WIDTH / 32,	1726	1 + 32 * int $::WIDTH / 32,
1559	1 + 32 * int $::HEIGHT / 32,	1727	1 + 32 * int $::HEIGHT / 32,
1560	)	1728	)
…		…
1568	}	1736	}
1569		1737
1570	sub draw {	1738	sub draw {
1571	my ($self) = @_;	1739	my ($self) = @_;
1572		1740
1573	$self->{need_update}++;#d#
1574	if (delete $self->{need_update}) {	1741	if (delete $self->{need_update}) {
1575	glNewList $self->{list}, GL_COMPILE;	1742	glNewList $self->{list}, GL_COMPILE;
1576		1743
1577	my $sw = int $::WIDTH / 32;
1578	my $sh = int $::HEIGHT / 32;
1579
1580	if ($::MAP) {	1744	if ($::MAP) {
		1745	my $sw = int $::WIDTH / 32;
		1746	my $sh = int $::HEIGHT / 32;
		1747
		1748	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1749	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1750
		1751	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1752
1581	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1753	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1582		1754
1583	if ($::CFG->{fow_enable}) {	1755	if ($::CFG->{fow_enable}) {
1584	if ($::CFG->{fow_smooth}) { # smooth fog of war	1756	if ($::CFG->{fow_smooth}) { # smooth fog of war
1585	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1757	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1586	glConvolutionFilter2D	1758	glConvolutionFilter2D
…		…
1604	format => GL_ALPHA;	1776	format => GL_ALPHA;
1605		1777
1606	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1778	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1607		1779
1608	glEnable GL_BLEND;	1780	glEnable GL_BLEND;
		1781	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1609	glEnable GL_TEXTURE_2D;	1782	glEnable GL_TEXTURE_2D;
1610	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1783	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1611		1784
1612	glColor +($::CFG->{fow_intensity}) x 3, 1;	1785	glColor +($::CFG->{fow_intensity}) x 3, 1;
1613	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1786	$tex->draw_quad (0, 0, $w * 32, $h * 32);
1614		1787
1615	glDisable GL_TEXTURE_2D;	1788	glDisable GL_TEXTURE_2D;
1616	glDisable GL_BLEND;	1789	glDisable GL_BLEND;
1617	}	1790	}
		1791
		1792	# HACK BEGIN
		1793	{
		1794	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1795	my ($w, $h) = (250, 250);
		1796
		1797	glEnable GL_BLEND;
		1798	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1799	glEnable GL_TEXTURE_2D;
		1800	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1801
		1802	CFClient::Texture->new (
		1803	w => $w,
		1804	h => $h,
		1805	data => $::MAP->mapmap ($w, $h),
		1806	type => GL_UNSIGNED_INT_8_8_8_8_REV
		1807	)->draw_quad (100, 100);
		1808
		1809	glDisable GL_TEXTURE_2D;
		1810	glDisable GL_BLEND;
		1811	}
		1812	# HACK END
1618	}	1813	}
1619		1814
1620	glEndList;	1815	glEndList;
1621	}	1816	}
1622		1817
		1818	glPushMatrix;
1623	glCallList $self->{list};	1819	glCallList $self->{list};
		1820	glPopMatrix;
1624		1821
1625	if ($FOCUS != $self) {	1822	if ($FOCUS != $self) {
1626	glColor 64/255, 64/255, 64/255;	1823	glColor 64/255, 64/255, 64/255;
1627	glLogicOp GL_AND;	1824	glLogicOp GL_AND;
1628	glEnable GL_COLOR_LOGIC_OP;	1825	glEnable GL_COLOR_LOGIC_OP;
…		…
1662	$::CONN->user_send ("command stay fire");	1859	$::CONN->user_send ("command stay fire");
1663	} elsif ($sym == SDLK_a) {	1860	} elsif ($sym == SDLK_a) {
1664	$::CONN->user_send ("command apply");	1861	$::CONN->user_send ("command apply");
1665	} elsif ($sym == SDLK_QUOTE) {	1862	} elsif ($sym == SDLK_QUOTE) {
1666	$self->emit ('activate_console');	1863	$self->emit ('activate_console');
		1864	} elsif ($sym == SDLK_SLASH) {
		1865	$self->emit ('activate_console' => '/');
1667	} elsif (exists $DIR{$sym}) {	1866	} elsif (exists $DIR{$sym}) {
1668	if ($mod & KMOD_SHIFT) {	1867	if ($mod & KMOD_SHIFT) {
1669	$self->{shft}++;	1868	$self->{shft}++;
1670	$::CONN->user_send ("command fire $DIR{$sym}[0]");	1869	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1671	} elsif ($mod & KMOD_CTRL) {	1870	} elsif ($mod & KMOD_CTRL) {
…		…
1759	sub toggle_flopper {	1958	sub toggle_flopper {
1760	my ($self) = @_;	1959	my ($self) = @_;
1761		1960
1762	# TODO: use animation	1961	# TODO: use animation
1763	if ($self->{state} = !$self->{state}) {	1962	if ($self->{state} = !$self->{state}) {
1764	$CFClient::UI::TOPLEVEL->add ($self->{other});	1963	$CFClient::UI::ROOT->add ($self->{other});
1765	$self->{other}->move (	1964	$self->{other}->move ($self->coord2global (0, $self->{h}));
1766	($::WIDTH - $self->{other}{w}) * 0.5,	1965	$self->emit ("open");
1767	($::HEIGHT - $self->{other}{h}) * 0.5,
1768	);
1769	} else {	1966	} else {
1770	$CFClient::UI::TOPLEVEL->remove ($self->{other});	1967	$CFClient::UI::ROOT->remove ($self->{other});
		1968	$self->emit ("close");
1771	}	1969	}
1772	}
1773		1970
1774	#############################################################################	1971	$self->emit (changed => $self->{state});
		1972	}
1775		1973
		1974	#############################################################################
		1975
1776	package CFClient::UI::Toplevel;	1976	package CFClient::UI::Root;
1777		1977
1778	our @ISA = CFClient::UI::Container::;	1978	our @ISA = CFClient::UI::Container::;
		1979
		1980	use SDL::OpenGL;
1779		1981
1780	sub size_request {	1982	sub size_request {
1781	($::WIDTH, $::HEIGHT)	1983	($::WIDTH, $::HEIGHT)
1782	}	1984	}
1783		1985
…		…
1788		1990
1789	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	1991	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1790	for @{$self->{children}};	1992	for @{$self->{children}};
1791	}	1993	}
1792		1994
1793	sub translate {	1995	sub _topleft {
1794	my ($self, $x, $y) = @_;	1996	my ($self, $x, $y) = @_;
1795		1997
1796	($x, $y)	1998	($x, $y)
1797	}	1999	}
1798		2000
…		…
1809	$self->SUPER::add ($widget);	2011	$self->SUPER::add ($widget);
1810		2012
1811	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2013	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1812	}	2014	}
1813		2015
		2016	sub on_refresh {
		2017	my ($self, $id, $cb) = @_;
		2018
		2019	$self->{refresh_hook}{$id} = $cb;
		2020	}
		2021
1814	sub draw {	2022	sub draw {
1815	my ($self) = @_;	2023	my ($self) = @_;
1816		2024
		2025	while (my $rcb = delete $self->{refresh_hook}) {
		2026	$_->() for values %$rcb;
		2027	}
		2028
		2029	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2030	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2031	glClear GL_COLOR_BUFFER_BIT;
		2032
		2033	glMatrixMode GL_PROJECTION;
		2034	glLoadIdentity;
		2035	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2036	glMatrixMode GL_MODELVIEW;
		2037	glLoadIdentity;
		2038
1817	$self->_draw;	2039	$self->_draw;
1818	}	2040	}
1819		2041
1820	#############################################################################	2042	#############################################################################
1821		2043
1822	package CFClient::UI;	2044	package CFClient::UI;
1823		2045
1824	$TOPLEVEL = new CFClient::UI::Toplevel;	2046	$ROOT = new CFClient::UI::Root;
1825		2047
1826	1	2048	1
1827		2049

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.103 by elmex, Fri Apr 14 13:51:36 2006 UTC vs. Revision 1.114 by root, Sat Apr 15 13:56:25 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.103 by elmex, Fri Apr 14 13:51:36 2006 UTC vs.
Revision 1.114 by root, Sat Apr 15 13:56:25 2006 UTC