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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.295 by root, Tue Jun 6 09:19:28 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFClient;
10	use CFClient::Texture;	11	use CFClient::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
…		…
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->hide;
		28
		29	$TOOLTIP->{owner} = $widget;
		30
		31	return if $ENV{CFPLUS_DEBUG} & 8;
		32
		33	my $tip = $widget->{tooltip};
		34
		35	$tip = $tip->($widget) if CODE:: eq ref $tip;
		36
		37	$TOOLTIP->set_tooltip_from ($widget);
		38	$TOOLTIP->show;
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	});
20		49
21	sub get_layout {	50	sub get_layout {
22	my $layout;	51	my $layout;
23		52
24	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	68	my ($layout) = @_;
40		69
41	$LAYOUT = $layout;	70	$LAYOUT = $layout;
42	}	71	}
43		72
44	sub check_tooltip {
45	return if $ENV{CFPLUS_DEBUG} & 8;
46
47	if (!$GRAB) {
48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49	if (length $widget->{tooltip}) {
50	if ($TOOLTIP->{owner} != $widget) {
51	$TOOLTIP->hide;
52
53	$TOOLTIP->{owner} = $widget;
54
55	my $tip = $widget->{tooltip};
56
57	$tip = $tip->($widget) if CODE:: eq ref $tip;
58
59	$TOOLTIP->set_tooltip_from ($widget);
60	$TOOLTIP->show;
61	}
62
63	return;
64	}
65	}
66	}
67
68	$TOOLTIP->hide;
69	delete $TOOLTIP->{owner};
70	}
71
72	# class methods for events	73	# class methods for events
73	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	75	$FOCUS->emit (key_down => $_[0])
75	if $FOCUS;	76	if $FOCUS;
76	}	77	}
…		…
88	my $widget = $ROOT->find_widget ($x, $y);	89	my $widget = $ROOT->find_widget ($x, $y);
89		90
90	$GRAB = $widget;	91	$GRAB = $widget;
91	$GRAB->update if $GRAB;	92	$GRAB->update if $GRAB;
92		93
93	check_tooltip;	94	$TOOLTIP_WATCHER->cb->();
94	}	95	}
95		96
96	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);
97		98
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
…		…
113	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	116	$grab->update if $grab;
116	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
117		118
118	check_tooltip;	119	$TOOLTIP_WATCHER->cb->();
119	}	120	}
120	}	121	}
121		122
122	sub feed_sdl_motion_event {	123	sub feed_sdl_motion_event {
123	my ($ev) = @_;	124	my ($ev) = @_;
…		…
129	my $hover = $HOVER; $HOVER = $widget;	130	my $hover = $HOVER; $HOVER = $widget;
130		131
131	$hover->update if $hover && $hover->{can_hover};	132	$hover->update if $hover && $hover->{can_hover};
132	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
133		134
134	check_tooltip;	135	$TOOLTIP_WATCHER->start;
135	}	136	}
136		137
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	139	if $HOVER;
139	}	140	}
…		…
277	delete $self->{visible};	278	delete $self->{visible};
278		279
279	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
280	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
281		282
282	CFClient::UI::check_tooltip	283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
283	if $TOOLTIP->{owner} == $self;	284	if $TOOLTIP->{owner} == $self;
284		285
285	$self->focus_out;	286	$self->focus_out;
286		287
287	$self->emit (visibility_change => 0);	288	$self->emit (visibility_change => 0);
…		…
381	}	382	}
382		383
383	sub set_max_size {	384	sub set_max_size {
384	my ($self, $w, $h) = @_;	385	my ($self, $w, $h) = @_;
385		386
386	delete $self->{max_w}; $self->{max_w} = $w if $w;	387	$self->{max_w} = int $w if defined $w;
387	delete $self->{max_h}; $self->{max_h} = $h if $h;	388	$self->{max_h} = int $h if defined $h;
		389
		390	$self->realloc;
388	}	391	}
389		392
390	sub set_tooltip {	393	sub set_tooltip {
391	my ($self, $tooltip) = @_;	394	my ($self, $tooltip) = @_;
392		395
…		…
397		400
398	$self->{tooltip} = $tooltip;	401	$self->{tooltip} = $tooltip;
399		402
400	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401	delete $CFClient::UI::TOOLTIP->{owner};	404	delete $CFClient::UI::TOOLTIP->{owner};
402	CFClient::UI::check_tooltip;	405	$CFClient::UI::TOOLTIP_WATCHER->cb->();
403	}	406	}
404	}	407	}
405		408
406	# translate global coordinates to local coordinate system	409	# translate global coordinates to local coordinate system
407	sub coord2local {	410	sub coord2local {
…		…
855	my $tex = $self->{texture}	858	my $tex = $self->{texture}
856	or return;	859	or return;
857		860
858	glEnable GL_TEXTURE_2D;	861	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glEnable GL_BLEND;
861	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862	glColor 0, 0, 0, 1;	863	glColor 0, 0, 0, 1;
863		864
864	$tex->draw_quad (0, 0, $w, $h);	865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
865		866
866	glDisable GL_BLEND;
867	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
868	}	868	}
869		869
870	#############################################################################	870	#############################################################################
871		871
…		…
1539		1539
1540	delete $self->{texture};	1540	delete $self->{texture};
1541	$self->SUPER::update;	1541	$self->SUPER::update;
1542	}	1542	}
1543		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1544	sub set_text {	1551	sub set_text {
1545	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1546		1553
1547	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1548	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1549		1556
1550	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
1552		1559
		1560	delete $self->{size_req};
1553	$self->realloc;	1561	$self->realloc;
1554	$self->update;	1562	$self->update;
1555	}	1563	}
1556		1564
1557	sub set_markup {	1565	sub set_markup {
…		…
1563	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1564		1572
1565	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
1567		1575
		1576	delete $self->{size_req};
1568	$self->realloc;	1577	$self->realloc;
1569	$self->update;	1578	$self->update;
1570	}	1579	}
1571		1580
1572	sub size_request {	1581	sub size_request {
1573	my ($self) = @_;	1582	my ($self) = @_;
1574		1583
		1584	$self->{size_req} \|\|= do {
1575	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1576	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1586	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1577	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1578	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580		1590
1581	my ($w, $h) = $self->{layout}->size;	1591	my ($w, $h) = $self->{layout}->size;
1582		1592
1583	if (exists $self->{template}) {	1593	if (exists $self->{template}) {
1584	$self->{template}->set_font ($self->{font}) if $self->{font};	1594	$self->{template}->set_font ($self->{font}) if $self->{font};
1585	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586		1596
1587	my ($w2, $h2) = $self->{template}->size;	1597	my ($w2, $h2) = $self->{template}->size;
1588		1598
1589	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1590	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
		1601	}
		1602
		1603	[$w, $h]
1591	}	1604	};
1592		1605
1593	($w, $h)	1606	@{ $self->{size_req} }
1594	}	1607	}
1595		1608
1596	sub size_allocate {	1609	sub size_allocate {
1597	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1598		1611
…		…
1607		1620
1608	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1609	delete $self->{texture};	1622	delete $self->{texture};
1610		1623
1611	$self->realloc;	1624	$self->realloc;
		1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1612	}	1633	}
1613		1634
1614	sub _draw {	1635	sub _draw {
1615	my ($self) = @_;	1636	my ($self) = @_;
1616		1637
…		…
1636	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1637	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1638	};	1659	};
1639		1660
1640	glEnable GL_TEXTURE_2D;	1661	glEnable GL_TEXTURE_2D;
1641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1662
		1663	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1664	my $h = List::Util::min $self->{h} + 2, $tex->{h};
1642		1665
1643	if ($tex->{format} == GL_ALPHA) {	1666	if ($tex->{format} == GL_ALPHA) {
		1667	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1644	glColor @{$self->{fg}};	1668	glColor @{$self->{fg}};
1645	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1669	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1646	} else {	1670	} else {
		1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1672	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1648	}	1673	}
1649		1674
1650	glDisable GL_TEXTURE_2D;	1675	glDisable GL_TEXTURE_2D;
1651	}	1676	}
1652		1677
…		…
1669	can_hover => 1,	1694	can_hover => 1,
1670	can_focus => 1,	1695	can_focus => 1,
1671	valign => 0,	1696	valign => 0,
1672	can_events => 1,	1697	can_events => 1,
1673	#text => ...	1698	#text => ...
		1699	#hidden => "*",
1674	@_	1700	@_
1675	)	1701	)
1676	}	1702	}
1677		1703
1678	sub _set_text {	1704	sub _set_text {
…		…
1685	$self->{last_activity} = $::NOW;	1711	$self->{last_activity} = $::NOW;
1686	$self->{text} = $text;	1712	$self->{text} = $text;
1687		1713
1688	$text =~ s/./*/g if $self->{hidden};	1714	$text =~ s/./*/g if $self->{hidden};
1689	$self->{layout}->set_text ("$text ");	1715	$self->{layout}->set_text ("$text ");
		1716	delete $self->{size_req};
1690		1717
1691	$self->_emit (changed => $self->{text});	1718	$self->_emit (changed => $self->{text});
		1719
		1720	$self->realloc;
1692	$self->update;	1721	$self->update;
1693	}	1722	}
1694		1723
1695	sub set_text {	1724	sub set_text {
1696	my ($self, $text) = @_;	1725	my ($self, $text) = @_;
1697		1726
1698	$self->{cursor} = length $text;	1727	$self->{cursor} = length $text;
1699	$self->_set_text ($text);	1728	$self->_set_text ($text);
1700
1701	$self->realloc;
1702	}	1729	}
1703		1730
1704	sub get_text {	1731	sub get_text {
1705	$_[0]{text}	1732	$_[0]{text}
1706	}	1733	}
…		…
1913	}	1940	}
1914		1941
1915	sub _draw {	1942	sub _draw {
1916	my ($self) = @_;	1943	my ($self) = @_;
1917		1944
1918	local $self->{fg} = $self->{fg};	1945	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920	if ($GRAB == $self) {
1921	$self->{fg} = $self->{active_fg};
1922	}
1923		1946
1924	glEnable GL_TEXTURE_2D;	1947	glEnable GL_TEXTURE_2D;
1925	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1948	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926	glColor 0, 0, 0, 1;	1949	glColor 0, 0, 0, 1;
1927		1950
…		…
2284	sub set_range {	2307	sub set_range {
2285	my ($self, $range) = @_;	2308	my ($self, $range) = @_;
2286		2309
2287	($range, $self->{range}) = ($self->{range}, $range);	2310	($range, $self->{range}) = ($self->{range}, $range);
2288		2311
2289	$self->update
2290	if "@$range" ne "@{$self->{range}}";	2312	if ("@$range" ne "@{$self->{range}}") {
		2313	$self->update;
		2314	$self->set_value ($self->{range}[0]);
		2315	}
2291	}	2316	}
2292		2317
2293	sub set_value {	2318	sub set_value {
2294	my ($self, $value) = @_;	2319	my ($self, $value) = @_;
2295		2320
…		…
2454	my $class = shift;	2479	my $class = shift;
2455		2480
2456	my $self = $class->SUPER::new (	2481	my $self = $class->SUPER::new (
2457	fontsize => 1,	2482	fontsize => 1,
2458	can_events => 0,	2483	can_events => 0,
		2484	indent => 0,
2459	#font => default_font	2485	#font => default_font
2460	@_,	2486	@_,
2461		2487
2462	layout => (new CFClient::Layout 1),	2488	layout => (new CFClient::Layout 1),
2463	par => [],	2489	par => [],
…		…
2486	$self->SUPER::size_allocate ($w, $h);	2512	$self->SUPER::size_allocate ($w, $h);
2487		2513
2488	$self->{layout}->set_font ($self->{font}) if $self->{font};	2514	$self->{layout}->set_font ($self->{font}) if $self->{font};
2489	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2515	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490	$self->{layout}->set_width ($self->{children}[0]{w});	2516	$self->{layout}->set_width ($self->{children}[0]{w});
		2517	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491		2518
2492	$self->reflow;	2519	$self->reflow;
2493	}	2520	}
2494		2521
2495	sub text_size {	2522	sub text_size {
…		…
2497		2524
2498	my $layout = $self->{layout};	2525	my $layout = $self->{layout};
2499		2526
2500	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2527	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501	$layout->set_width ($self->{children}[0]{w} - $indent);	2528	$layout->set_width ($self->{children}[0]{w} - $indent);
		2529	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502	$layout->set_markup ($text);	2530	$layout->set_markup ($text);
2503		2531
2504	$layout->size	2532	$layout->size
2505	}	2533	}
2506		2534
…		…
2545		2573
2546	return unless $self->{h} > 0;	2574	return unless $self->{h} > 0;
2547		2575
2548	delete $self->{texture};	2576	delete $self->{texture};
2549		2577
2550	$ROOT->on_post_alloc ($self, sub {	2578	$ROOT->on_post_alloc ($self => sub {
2551	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2579	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552		2580
2553	if (delete $self->{need_reflow}) {	2581	if (delete $self->{need_reflow}) {
2554	my $height = 0;	2582	my $height = 0;
2555		2583
…		…
2558	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2586	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559		2587
2560	for (@{$self->{par}}) {	2588	for (@{$self->{par}}) {
2561	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2589	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2562	$layout->set_width ($W - $_->[3]);	2590	$layout->set_width ($W - $_->[3]);
		2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2563	$layout->set_markup ($_->[4]);	2592	$layout->set_markup ($_->[4]);
2564	my ($w, $h) = $layout->size;	2593	my ($w, $h) = $layout->size;
2565	$_->[0] = $w + $_->[3];	2594	$_->[0] = $w + $_->[3];
2566	$_->[1] = $h;	2595	$_->[1] = $h;
2567	}	2596	}
…		…
2570	}	2599	}
2571		2600
2572	$self->{height} = $height;	2601	$self->{height} = $height;
2573		2602
2574	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2603	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2575		2604
2576	delete $self->{texture};	2605	delete $self->{texture};
2577	}	2606	}
2578		2607
2579	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2608	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2580	glClearColor 0.5, 0.5, 0.5, 0;	2609	glClearColor 0, 0, 0, 0;
2581	glClear GL_COLOR_BUFFER_BIT;	2610	glClear GL_COLOR_BUFFER_BIT;
2582		2611
2583	my $top = int $self->{children}[1]{range}[0];	2612	my $top = int $self->{children}[1]{range}[0];
2584		2613
2585	my $y0 = $top;	2614	my $y0 = $top;
…		…
2599	my $h = $par->[1];	2628	my $h = $par->[1];
2600		2629
2601	if ($y0 < $y + $h && $y < $y1) {	2630	if ($y0 < $y + $h && $y < $y1) {
2602	$layout->set_foreground (@{ $par->[2] });	2631	$layout->set_foreground (@{ $par->[2] });
2603	$layout->set_width ($W - $par->[3]);	2632	$layout->set_width ($W - $par->[3]);
		2633	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2604	$layout->set_markup ($par->[4]);	2634	$layout->set_markup ($par->[4]);
2605		2635
2606	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2636	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2607		2637
2608	glRasterPos $par->[3], $y - $y0;	2638	glRasterPos $par->[3], $y - $y0;
…		…
2620	sub _draw {	2650	sub _draw {
2621	my ($self) = @_;	2651	my ($self) = @_;
2622		2652
2623	glEnable GL_TEXTURE_2D;	2653	glEnable GL_TEXTURE_2D;
2624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2654	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625	glColor 1, 1, 1, 1;	2655	glColor 0, 0, 0, 1;
2626	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2656	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627	glDisable GL_TEXTURE_2D;	2657	glDisable GL_TEXTURE_2D;
2628		2658
2629	$self->{children}[1]->draw;	2659	$self->{children}[1]->draw;
2630		2660
2631	}	2661	}
…		…
2858	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2888	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2859		2889
2860	if ($tex) {	2890	if ($tex) {
2861	glEnable GL_TEXTURE_2D;	2891	glEnable GL_TEXTURE_2D;
2862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2892	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863	glColor 1, 1, 1, 1;	2893	glColor 0, 0, 0, 1;
2864	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2894	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865	glDisable GL_TEXTURE_2D;	2895	glDisable GL_TEXTURE_2D;
2866	}	2896	}
2867	}	2897	}
2868		2898
…		…
2901	);	2931	);
2902		2932
2903	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2933	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2904		2934
2905	for my $item (@{ $self->{items} }) {	2935	for my $item (@{ $self->{items} }) {
2906	my ($widget, $cb) = @$item;	2936	my ($widget, $cb, $tooltip) = @$item;
2907		2937
2908	# handle various types of items, only text for now	2938	# handle various types of items, only text for now
2909	if (!ref $widget) {	2939	if (!ref $widget) {
2910	$widget = new CFClient::UI::Label	2940	$widget = new CFClient::UI::Label
2911	can_hover => 1,	2941	can_hover => 1,
2912	can_events => 1,	2942	can_events => 1,
2913	text => $widget;	2943	text => $widget,
		2944	tooltip => $tooltip
2914	}	2945	}
2915		2946
2916	$self->{item}{$widget} = $item;	2947	$self->{item}{$widget} = $item;
2917		2948
2918	$self->{vbox}->add ($widget);	2949	$self->{vbox}->add ($widget);
…		…
3069	$self->_emit (page_changed => $self->{multiplexer}{current});	3100	$self->_emit (page_changed => $self->{multiplexer}{current});
3070	}	3101	}
3071		3102
3072	#############################################################################	3103	#############################################################################
3073		3104
3074	package CFClient::UI::Statusbox;	3105	package CFClient::UI::Combobox;
3075		3106
		3107	use utf8;
		3108
3076	our @ISA = CFClient::UI::VBox::;	3109	our @ISA = CFClient::UI::Button::;
3077		3110
3078	sub new {	3111	sub new {
3079	my $class = shift;	3112	my $class = shift;
3080		3113
3081	$class->SUPER::new (	3114	my $self = $class->SUPER::new (
		3115	options => [], # [title, value, tooltip], ...
		3116	value => undef,
		3117	@_,
		3118	);
		3119
		3120	$self->_set_value ($self->{value});
		3121
		3122	$self
		3123	}
		3124
		3125	sub button_down {
		3126	my ($self, $ev) = @_;
		3127
		3128	my @menu_items;
		3129
		3130	for (@{ $self->{options} }) {
		3131	my ($title, $value, $tooltip) = @$_;
		3132
		3133	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
		3134	}
		3135
		3136	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3137	}
		3138
		3139	sub _set_value {
		3140	my ($self, $value) = @_;
		3141
		3142	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
		3143	or return;
		3144
		3145	$self->{value} = $item->[1];
		3146	$self->set_markup ("$item->[0] ⇓");
		3147	$self->set_tooltip ($item->[2]);
		3148	}
		3149
		3150	sub set_value {
		3151	my ($self, $value) = @_;
		3152
		3153	return unless $self->{value} ne $value;
		3154
		3155	$self->_set_value ($value);
		3156	$self->_emit (changed => $value);
		3157	}
		3158
		3159	#############################################################################
		3160
		3161	package CFClient::UI::Statusbox;
		3162
		3163	our @ISA = CFClient::UI::VBox::;
		3164
		3165	sub new {
		3166	my $class = shift;
		3167
		3168	my $self = $class->SUPER::new (
3082	fontsize => 0.8,	3169	fontsize => 0.8,
3083	@_,	3170	@_,
3084	)	3171	);
		3172
		3173	Scalar::Util::weaken (my $this = $self);
		3174
		3175	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3176
		3177	$self
3085	}	3178	}
3086		3179
3087	sub reorder {	3180	sub reorder {
3088	my ($self) = @_;	3181	my ($self) = @_;
3089	my $NOW = time;	3182	my $NOW = Time::HiRes::time;
		3183
		3184	# freeze display when hovering over any label
		3185	return if $CFClient::UI::TOOLTIP->{owner}
		3186	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3187	values %{ $self->{item} };
3090		3188
3091	while (my ($k, $v) = each %{ $self->{item} }) {	3189	while (my ($k, $v) = each %{ $self->{item} }) {
3092	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3190	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093	}	3191	}
3094		3192
…		…
3097	my @items = sort {	3195	my @items = sort {
3098	$a->{pri} <=> $b->{pri}	3196	$a->{pri} <=> $b->{pri}
3099	or $b->{id} <=> $a->{id}	3197	or $b->{id} <=> $a->{id}
3100	} values %{ $self->{item} };	3198	} values %{ $self->{item} };
3101		3199
		3200	$self->{timer}->interval (1);
		3201
3102	my $count = 10 + 1;	3202	my $count = 10 + 1;
3103	for my $item (@items) {	3203	for my $item (@items) {
3104	last unless --$count;	3204	last unless --$count;
3105		3205
3106	push @widgets, $item->{label} \|\|= do {	3206	my $label = $item->{label} \|\|= do {
3107	# TODO: doesn't handle markup well (read as: at all)	3207	# TODO: doesn't handle markup well (read as: at all)
3108	my $short = $item->{count} > 1	3208	my $short = $item->{count} > 1
3109	? "<b>$item->{count} ×</b> $item->{text}"	3209	? "<b>$item->{count} ×</b> $item->{text}"
3110	: $item->{text};	3210	: $item->{text};
3111		3211
…		…
3119	tooltip => $item->{tooltip},	3219	tooltip => $item->{tooltip},
3120	tooltip_font => $::FONT_PROP,	3220	tooltip_font => $::FONT_PROP,
3121	tooltip_width => 0.67,	3221	tooltip_width => 0.67,
3122	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3222	fontsize => $item->{fontsize} \|\| $self->{fontsize},
3123	max_w => $::WIDTH * 0.44,	3223	max_w => $::WIDTH * 0.44,
3124	fg => $item->{fg},	3224	fg => [@{ $item->{fg} }],
3125	can_events => 1,	3225	can_events => 1,
3126	can_hover => 1	3226	can_hover => 1
3127	};	3227	};
		3228
		3229	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3230	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3231	$label->update;
		3232	$label->set_max_size (undef, $label->{req_h} * $diff)
		3233	if $diff < 1;
		3234	$self->{timer}->interval (1/30);
		3235	} else {
		3236	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3237	}
		3238
		3239	push @widgets, $label;
3128	}	3240	}
3129		3241
3130	$self->clear;	3242	$self->clear;
3131	$self->SUPER::add (reverse @widgets);	3243	$self->SUPER::add (reverse @widgets);
3132	}	3244	}
…		…
3137	$text =~ s/^\s+//;	3249	$text =~ s/^\s+//;
3138	$text =~ s/\s+$//;	3250	$text =~ s/\s+$//;
3139		3251
3140	return unless $text;	3252	return unless $text;
3141		3253
3142	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3254	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
3143		3255
3144	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3256	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145		3257
3146	if (my $item = $self->{item}{$group}) {	3258	if (my $item = $self->{item}{$group}) {
3147	if ($item->{text} eq $text) {	3259	if ($item->{text} eq $text) {
…		…
3177		3289
3178	$self->reorder;	3290	$self->reorder;
3179	$self->SUPER::reconfigure;	3291	$self->SUPER::reconfigure;
3180	}	3292	}
3181		3293
		3294	sub DESTROY {
		3295	my ($self) = @_;
		3296
		3297	$self->{timer}->cancel;
		3298
		3299	$self->SUPER::DESTROY;
		3300	}
		3301
3182	#############################################################################	3302	#############################################################################
3183		3303
3184	package CFClient::UI::Inventory;	3304	package CFClient::UI::Inventory;
3185		3305
3186	our @ISA = CFClient::UI::ScrolledWindow::;	3306	our @ISA = CFClient::UI::ScrolledWindow::;
…		…
3432	commands => [],	3552	commands => [],
3433	@_,	3553	@_,
3434	)	3554	)
3435	}	3555	}
3436		3556
3437	# XXX: Do sorting? Argl...	3557	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3558	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
		3559	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3560	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
		3561	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3562	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
		3563
		3564	sub rebuild_spell_list {
		3565	my ($self) = @_;
		3566
		3567	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3568	$self->clear;
		3569
		3570	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
		3571	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3572	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3573	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3574
		3575	my $row = 0;
		3576
		3577	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3578	my $spell = $self->{spell}{$_};
		3579
		3580	$row++;
		3581
		3582	$self->add (0, $row, new CFClient::UI::Face
		3583	face => $spell->{face},
		3584	can_hover => 1,
		3585	can_events => 1,
		3586	tooltip => $spell->{message},
		3587	);
		3588
		3589	$self->add (1, $row, new CFClient::UI::Label
		3590	expand => 1,
		3591	text => $spell->{name},
		3592	can_hover => 1,
		3593	can_events => 1,
		3594	tooltip => $spell->{message},
		3595	);
		3596
		3597	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3598	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} \|\| $spell->{grace}, @TOOLTIP_SP);
		3599	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3600
		3601	# TODO: should be done via popup
		3602	$self->add (5, $row, new CFClient::UI::Button
		3603	text => "bind",
		3604	tooltip => "bind spell readying (cast command) to key",
		3605	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
		3606	);
		3607	}
		3608	});
		3609	}
		3610
3438	sub add_spell {	3611	sub add_spell {
3439	my ($self, $spell) = @_;	3612	my ($self, $spell) = @_;
		3613
3440	$self->{spells}->{$spell->{name}} = $spell;	3614	$self->{spell}->{$spell->{name}} = $spell;
3441		3615	$self->rebuild_spell_list;
3442	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3443	face => $spell->{face},
3444	can_hover => 1,
3445	can_events => 1,
3446	tooltip => $spell->{message});
3447
3448	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449	text => $spell->{name},
3450	can_hover => 1,
3451	can_events => 1,
3452	tooltip => $spell->{message},
3453	expand => 1);
3454
3455	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3458	expand => 1);
3459
3460	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461	text => "bind to key",
3462	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463	}
3464
3465	sub rebuild_spell_list {
3466	my ($self) = @_;
3467	$self->{tbl_idx} = 0;
3468	$self->add_spell ($_) for values %{$self->{spells}};
3469	}	3616	}
3470		3617
3471	sub remove_spell {	3618	sub remove_spell {
3472	my ($self, $spell) = @_;	3619	my ($self, $spell) = @_;
		3620
3473	delete $self->{spells}->{$spell->{name}};	3621	delete $self->{spell}->{$spell->{name}};
3474	$self->rebuild_spell_list;	3622	$self->rebuild_spell_list;
3475	}	3623	}
3476		3624
3477	#############################################################################	3625	#############################################################################
3478		3626
3479	package CFClient::UI::Root;	3627	package CFClient::UI::Root;
3480		3628
3481	our @ISA = CFClient::UI::Container::;	3629	our @ISA = CFClient::UI::Container::;
		3630
		3631	use List::Util qw(min max);
3482		3632
3483	use CFClient::OpenGL;	3633	use CFClient::OpenGL;
3484		3634
3485	sub new {	3635	sub new {
3486	my $class = shift;	3636	my $class = shift;
…		…
3621		3771
3622	delete $queue{$widget+0};	3772	delete $queue{$widget+0};
3623		3773
3624	my ($w, $h) = $widget->size_request;	3774	my ($w, $h) = $widget->size_request;
3625		3775
3626	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3776	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3777	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3778
		3779	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3780	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628		3781
3629	$w = $widget->{force_w} if exists $widget->{force_w};	3782	$w = $widget->{force_w} if exists $widget->{force_w};
3630	$h = $widget->{force_h} if exists $widget->{force_h};	3783	$h = $widget->{force_h} if exists $widget->{force_h};
3631		3784
3632	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3785	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC vs. Revision 1.295 by root, Tue Jun 6 09:19:28 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.295 by root, Tue Jun 6 09:19:28 2006 UTC