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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.294 by root, Tue Jun 6 03:19:26 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 {
…		…
1536		1539
1537	delete $self->{texture};	1540	delete $self->{texture};
1538	$self->SUPER::update;	1541	$self->SUPER::update;
1539	}	1542	}
1540		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1541	sub set_text {	1551	sub set_text {
1542	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1543		1553
1544	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1545	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1546		1556
1547	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
1549		1559
		1560	delete $self->{size_req};
1550	$self->realloc;	1561	$self->realloc;
1551	$self->update;	1562	$self->update;
1552	}	1563	}
1553		1564
1554	sub set_markup {	1565	sub set_markup {
…		…
1560	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1561		1572
1562	$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;
1563	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
1564		1575
		1576	delete $self->{size_req};
1565	$self->realloc;	1577	$self->realloc;
1566	$self->update;	1578	$self->update;
1567	}	1579	}
1568		1580
1569	sub size_request {	1581	sub size_request {
1570	my ($self) = @_;	1582	my ($self) = @_;
1571		1583
		1584	$self->{size_req} \|\|= do {
1572	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1573	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1586	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1574	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1575	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577		1590
1578	my ($w, $h) = $self->{layout}->size;	1591	my ($w, $h) = $self->{layout}->size;
1579		1592
1580	if (exists $self->{template}) {	1593	if (exists $self->{template}) {
1581	$self->{template}->set_font ($self->{font}) if $self->{font};	1594	$self->{template}->set_font ($self->{font}) if $self->{font};
1582	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583		1596
1584	my ($w2, $h2) = $self->{template}->size;	1597	my ($w2, $h2) = $self->{template}->size;
1585		1598
1586	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1587	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
		1601	}
		1602
		1603	[$w, $h]
1588	}	1604	};
1589		1605
1590	($w, $h)	1606	@{ $self->{size_req} }
1591	}	1607	}
1592		1608
1593	sub size_allocate {	1609	sub size_allocate {
1594	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1595		1611
…		…
1604		1620
1605	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1606	delete $self->{texture};	1622	delete $self->{texture};
1607		1623
1608	$self->realloc;	1624	$self->realloc;
		1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1609	}	1633	}
1610		1634
1611	sub _draw {	1635	sub _draw {
1612	my ($self) = @_;	1636	my ($self) = @_;
1613		1637
…		…
1633	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1634	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1635	};	1659	};
1636		1660
1637	glEnable GL_TEXTURE_2D;	1661	glEnable GL_TEXTURE_2D;
		1662
		1663	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1664	my $h = List::Util::min $self->{h} + 2, $tex->{h};
		1665
		1666	if ($tex->{format} == GL_ALPHA) {
		1667	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1668	glColor @{$self->{fg}};
		1669	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
		1670	} else {
1638	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1639
1640	glColor_premultiply @{$self->{fg}}
1641	if $tex->{format} == GL_ALPHA;
1642
1643	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1672	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
		1673	}
1644		1674
1645	glDisable GL_TEXTURE_2D;	1675	glDisable GL_TEXTURE_2D;
1646	}	1676	}
1647		1677
1648	#############################################################################	1678	#############################################################################
…		…
1664	can_hover => 1,	1694	can_hover => 1,
1665	can_focus => 1,	1695	can_focus => 1,
1666	valign => 0,	1696	valign => 0,
1667	can_events => 1,	1697	can_events => 1,
1668	#text => ...	1698	#text => ...
		1699	#hidden => "*",
1669	@_	1700	@_
1670	)	1701	)
1671	}	1702	}
1672		1703
1673	sub _set_text {	1704	sub _set_text {
…		…
1680	$self->{last_activity} = $::NOW;	1711	$self->{last_activity} = $::NOW;
1681	$self->{text} = $text;	1712	$self->{text} = $text;
1682		1713
1683	$text =~ s/./*/g if $self->{hidden};	1714	$text =~ s/./*/g if $self->{hidden};
1684	$self->{layout}->set_text ("$text ");	1715	$self->{layout}->set_text ("$text ");
		1716	delete $self->{size_req};
1685		1717
1686	$self->_emit (changed => $self->{text});	1718	$self->_emit (changed => $self->{text});
		1719
		1720	$self->realloc;
1687	$self->update;	1721	$self->update;
1688	}	1722	}
1689		1723
1690	sub set_text {	1724	sub set_text {
1691	my ($self, $text) = @_;	1725	my ($self, $text) = @_;
1692		1726
1693	$self->{cursor} = length $text;	1727	$self->{cursor} = length $text;
1694	$self->_set_text ($text);	1728	$self->_set_text ($text);
1695
1696	$self->realloc;
1697	}	1729	}
1698		1730
1699	sub get_text {	1731	sub get_text {
1700	$_[0]{text}	1732	$_[0]{text}
1701	}	1733	}
…		…
2445	my $class = shift;	2477	my $class = shift;
2446		2478
2447	my $self = $class->SUPER::new (	2479	my $self = $class->SUPER::new (
2448	fontsize => 1,	2480	fontsize => 1,
2449	can_events => 0,	2481	can_events => 0,
		2482	indent => 0,
2450	#font => default_font	2483	#font => default_font
2451	@_,	2484	@_,
2452		2485
2453	layout => (new CFClient::Layout 1),	2486	layout => (new CFClient::Layout 1),
2454	par => [],	2487	par => [],
…		…
2477	$self->SUPER::size_allocate ($w, $h);	2510	$self->SUPER::size_allocate ($w, $h);
2478		2511
2479	$self->{layout}->set_font ($self->{font}) if $self->{font};	2512	$self->{layout}->set_font ($self->{font}) if $self->{font};
2480	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2513	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481	$self->{layout}->set_width ($self->{children}[0]{w});	2514	$self->{layout}->set_width ($self->{children}[0]{w});
		2515	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2482		2516
2483	$self->reflow;	2517	$self->reflow;
2484	}	2518	}
2485		2519
2486	sub text_size {	2520	sub text_size {
…		…
2488		2522
2489	my $layout = $self->{layout};	2523	my $layout = $self->{layout};
2490		2524
2491	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2525	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492	$layout->set_width ($self->{children}[0]{w} - $indent);	2526	$layout->set_width ($self->{children}[0]{w} - $indent);
		2527	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2493	$layout->set_markup ($text);	2528	$layout->set_markup ($text);
2494		2529
2495	$layout->size	2530	$layout->size
2496	}	2531	}
2497		2532
…		…
2549	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2584	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550		2585
2551	for (@{$self->{par}}) {	2586	for (@{$self->{par}}) {
2552	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2587	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2553	$layout->set_width ($W - $_->[3]);	2588	$layout->set_width ($W - $_->[3]);
		2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2554	$layout->set_markup ($_->[4]);	2590	$layout->set_markup ($_->[4]);
2555	my ($w, $h) = $layout->size;	2591	my ($w, $h) = $layout->size;
2556	$_->[0] = $w + $_->[3];	2592	$_->[0] = $w + $_->[3];
2557	$_->[1] = $h;	2593	$_->[1] = $h;
2558	}	2594	}
…		…
2590	my $h = $par->[1];	2626	my $h = $par->[1];
2591		2627
2592	if ($y0 < $y + $h && $y < $y1) {	2628	if ($y0 < $y + $h && $y < $y1) {
2593	$layout->set_foreground (@{ $par->[2] });	2629	$layout->set_foreground (@{ $par->[2] });
2594	$layout->set_width ($W - $par->[3]);	2630	$layout->set_width ($W - $par->[3]);
		2631	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2595	$layout->set_markup ($par->[4]);	2632	$layout->set_markup ($par->[4]);
2596		2633
2597	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2634	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2598		2635
2599	glRasterPos $par->[3], $y - $y0;	2636	glRasterPos $par->[3], $y - $y0;
…		…
2892	);	2929	);
2893		2930
2894	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2931	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2895		2932
2896	for my $item (@{ $self->{items} }) {	2933	for my $item (@{ $self->{items} }) {
2897	my ($widget, $cb) = @$item;	2934	my ($widget, $cb, $tooltip) = @$item;
2898		2935
2899	# handle various types of items, only text for now	2936	# handle various types of items, only text for now
2900	if (!ref $widget) {	2937	if (!ref $widget) {
2901	$widget = new CFClient::UI::Label	2938	$widget = new CFClient::UI::Label
2902	can_hover => 1,	2939	can_hover => 1,
2903	can_events => 1,	2940	can_events => 1,
2904	text => $widget;	2941	text => $widget,
		2942	tooltip => $tooltip
2905	}	2943	}
2906		2944
2907	$self->{item}{$widget} = $item;	2945	$self->{item}{$widget} = $item;
2908		2946
2909	$self->{vbox}->add ($widget);	2947	$self->{vbox}->add ($widget);
…		…
3060	$self->_emit (page_changed => $self->{multiplexer}{current});	3098	$self->_emit (page_changed => $self->{multiplexer}{current});
3061	}	3099	}
3062		3100
3063	#############################################################################	3101	#############################################################################
3064		3102
3065	package CFClient::UI::Statusbox;	3103	package CFClient::UI::Combobox;
3066		3104
		3105	use utf8;
		3106
3067	our @ISA = CFClient::UI::VBox::;	3107	our @ISA = CFClient::UI::Button::;
3068		3108
3069	sub new {	3109	sub new {
3070	my $class = shift;	3110	my $class = shift;
3071		3111
3072	$class->SUPER::new (	3112	my $self = $class->SUPER::new (
		3113	options => [], # [title, value, tooltip], ...
		3114	value => undef,
		3115	@_,
		3116	);
		3117
		3118	$self->_set_value ($self->{value});
		3119
		3120	$self
		3121	}
		3122
		3123	sub button_down {
		3124	my ($self, $ev) = @_;
		3125
		3126	my @menu_items;
		3127
		3128	for (@{ $self->{options} }) {
		3129	my ($title, $value, $tooltip) = @$_;
		3130
		3131	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
		3132	}
		3133
		3134	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3135	}
		3136
		3137	sub _set_value {
		3138	my ($self, $value) = @_;
		3139
		3140	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
		3141	or return;
		3142
		3143	$self->{value} = $item->[1];
		3144	$self->set_markup ("$item->[0] ⇓");
		3145	$self->set_tooltip ($item->[2]);
		3146	}
		3147
		3148	sub set_value {
		3149	my ($self, $value) = @_;
		3150
		3151	return unless $self->{value} ne $value;
		3152
		3153	$self->_set_value ($value);
		3154	$self->_emit (changed => $value);
		3155	}
		3156
		3157	#############################################################################
		3158
		3159	package CFClient::UI::Statusbox;
		3160
		3161	our @ISA = CFClient::UI::VBox::;
		3162
		3163	sub new {
		3164	my $class = shift;
		3165
		3166	my $self = $class->SUPER::new (
3073	fontsize => 0.8,	3167	fontsize => 0.8,
3074	@_,	3168	@_,
3075	)	3169	);
		3170
		3171	Scalar::Util::weaken (my $this = $self);
		3172
		3173	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3174
		3175	$self
3076	}	3176	}
3077		3177
3078	sub reorder {	3178	sub reorder {
3079	my ($self) = @_;	3179	my ($self) = @_;
3080	my $NOW = time;	3180	my $NOW = Time::HiRes::time;
		3181
		3182	# freeze display when hovering over any label
		3183	return if $CFClient::UI::TOOLTIP->{owner}
		3184	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3185	values %{ $self->{item} };
3081		3186
3082	while (my ($k, $v) = each %{ $self->{item} }) {	3187	while (my ($k, $v) = each %{ $self->{item} }) {
3083	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3188	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084	}	3189	}
3085		3190
…		…
3088	my @items = sort {	3193	my @items = sort {
3089	$a->{pri} <=> $b->{pri}	3194	$a->{pri} <=> $b->{pri}
3090	or $b->{id} <=> $a->{id}	3195	or $b->{id} <=> $a->{id}
3091	} values %{ $self->{item} };	3196	} values %{ $self->{item} };
3092		3197
		3198	$self->{timer}->interval (1);
		3199
3093	my $count = 10 + 1;	3200	my $count = 10 + 1;
3094	for my $item (@items) {	3201	for my $item (@items) {
3095	last unless --$count;	3202	last unless --$count;
3096		3203
3097	push @widgets, $item->{label} \|\|= do {	3204	my $label = $item->{label} \|\|= do {
3098	# TODO: doesn't handle markup well (read as: at all)	3205	# TODO: doesn't handle markup well (read as: at all)
3099	my $short = $item->{count} > 1	3206	my $short = $item->{count} > 1
3100	? "<b>$item->{count} ×</b> $item->{text}"	3207	? "<b>$item->{count} ×</b> $item->{text}"
3101	: $item->{text};	3208	: $item->{text};
3102		3209
…		…
3110	tooltip => $item->{tooltip},	3217	tooltip => $item->{tooltip},
3111	tooltip_font => $::FONT_PROP,	3218	tooltip_font => $::FONT_PROP,
3112	tooltip_width => 0.67,	3219	tooltip_width => 0.67,
3113	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3220	fontsize => $item->{fontsize} \|\| $self->{fontsize},
3114	max_w => $::WIDTH * 0.44,	3221	max_w => $::WIDTH * 0.44,
3115	fg => $item->{fg},	3222	fg => [@{ $item->{fg} }],
3116	can_events => 1,	3223	can_events => 1,
3117	can_hover => 1	3224	can_hover => 1
3118	};	3225	};
		3226
		3227	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3228	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3229	$label->update;
		3230	$label->set_max_size (undef, $label->{req_h} * $diff)
		3231	if $diff < 1;
		3232	$self->{timer}->interval (1/30);
		3233	} else {
		3234	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3235	}
		3236
		3237	push @widgets, $label;
3119	}	3238	}
3120		3239
3121	$self->clear;	3240	$self->clear;
3122	$self->SUPER::add (reverse @widgets);	3241	$self->SUPER::add (reverse @widgets);
3123	}	3242	}
…		…
3128	$text =~ s/^\s+//;	3247	$text =~ s/^\s+//;
3129	$text =~ s/\s+$//;	3248	$text =~ s/\s+$//;
3130		3249
3131	return unless $text;	3250	return unless $text;
3132		3251
3133	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3252	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
3134		3253
3135	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3254	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136		3255
3137	if (my $item = $self->{item}{$group}) {	3256	if (my $item = $self->{item}{$group}) {
3138	if ($item->{text} eq $text) {	3257	if ($item->{text} eq $text) {
…		…
3168		3287
3169	$self->reorder;	3288	$self->reorder;
3170	$self->SUPER::reconfigure;	3289	$self->SUPER::reconfigure;
3171	}	3290	}
3172		3291
		3292	sub DESTROY {
		3293	my ($self) = @_;
		3294
		3295	$self->{timer}->cancel;
		3296
		3297	$self->SUPER::DESTROY;
		3298	}
		3299
3173	#############################################################################	3300	#############################################################################
3174		3301
3175	package CFClient::UI::Inventory;	3302	package CFClient::UI::Inventory;
3176		3303
3177	our @ISA = CFClient::UI::ScrolledWindow::;	3304	our @ISA = CFClient::UI::ScrolledWindow::;
…		…
3423	commands => [],	3550	commands => [],
3424	@_,	3551	@_,
3425	)	3552	)
3426	}	3553	}
3427		3554
3428	# XXX: Do sorting? Argl...	3555	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3556	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
		3557	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3558	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
		3559	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3560	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
		3561
		3562	sub rebuild_spell_list {
		3563	my ($self) = @_;
		3564
		3565	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3566	$self->clear;
		3567
		3568	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
		3569	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3570	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3571	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3572
		3573	my $row = 0;
		3574
		3575	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3576	my $spell = $self->{spell}{$_};
		3577
		3578	$row++;
		3579
		3580	$self->add (0, $row, new CFClient::UI::Face
		3581	face => $spell->{face},
		3582	can_hover => 1,
		3583	can_events => 1,
		3584	tooltip => $spell->{message},
		3585	);
		3586
		3587	$self->add (1, $row, new CFClient::UI::Label
		3588	expand => 1,
		3589	text => $spell->{name},
		3590	can_hover => 1,
		3591	can_events => 1,
		3592	tooltip => $spell->{message},
		3593	);
		3594
		3595	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3596	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} \|\| $spell->{grace}, @TOOLTIP_SP);
		3597	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3598
		3599	# TODO: should be done via popup
		3600	$self->add (5, $row, new CFClient::UI::Button
		3601	text => "bind",
		3602	tooltip => "bind spell readying (cast command) to key",
		3603	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
		3604	);
		3605	}
		3606	});
		3607	}
		3608
3429	sub add_spell {	3609	sub add_spell {
3430	my ($self, $spell) = @_;	3610	my ($self, $spell) = @_;
		3611
3431	$self->{spells}->{$spell->{name}} = $spell;	3612	$self->{spell}->{$spell->{name}} = $spell;
3432		3613	$self->rebuild_spell_list;
3433	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434	face => $spell->{face},
3435	can_hover => 1,
3436	can_events => 1,
3437	tooltip => $spell->{message});
3438
3439	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440	text => $spell->{name},
3441	can_hover => 1,
3442	can_events => 1,
3443	tooltip => $spell->{message},
3444	expand => 1);
3445
3446	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3449	expand => 1);
3450
3451	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452	text => "bind to key",
3453	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454	}
3455
3456	sub rebuild_spell_list {
3457	my ($self) = @_;
3458	$self->{tbl_idx} = 0;
3459	$self->add_spell ($_) for values %{$self->{spells}};
3460	}	3614	}
3461		3615
3462	sub remove_spell {	3616	sub remove_spell {
3463	my ($self, $spell) = @_;	3617	my ($self, $spell) = @_;
		3618
3464	delete $self->{spells}->{$spell->{name}};	3619	delete $self->{spell}->{$spell->{name}};
3465	$self->rebuild_spell_list;	3620	$self->rebuild_spell_list;
3466	}	3621	}
3467		3622
3468	#############################################################################	3623	#############################################################################
3469		3624
3470	package CFClient::UI::Root;	3625	package CFClient::UI::Root;
3471		3626
3472	our @ISA = CFClient::UI::Container::;	3627	our @ISA = CFClient::UI::Container::;
		3628
		3629	use List::Util qw(min max);
3473		3630
3474	use CFClient::OpenGL;	3631	use CFClient::OpenGL;
3475		3632
3476	sub new {	3633	sub new {
3477	my $class = shift;	3634	my $class = shift;
…		…
3612		3769
3613	delete $queue{$widget+0};	3770	delete $queue{$widget+0};
3614		3771
3615	my ($w, $h) = $widget->size_request;	3772	my ($w, $h) = $widget->size_request;
3616		3773
3617	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3774	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3775	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3776
		3777	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3778	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619		3779
3620	$w = $widget->{force_w} if exists $widget->{force_w};	3780	$w = $widget->{force_w} if exists $widget->{force_w};
3621	$h = $widget->{force_h} if exists $widget->{force_h};	3781	$h = $widget->{force_h} if exists $widget->{force_h};
3622		3782
3623	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3783	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.279 by root, Mon Jun 5 00:17:47 2006 UTC vs. Revision 1.294 by root, Tue Jun 6 03:19:26 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.294 by root, Tue Jun 6 03:19:26 2006 UTC