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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.298 by root, Wed Jun 7 07:00:30 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);
…		…
314	}	315	}
315		316
316	sub move_abs {	317	sub move_abs {
317	my ($self, $x, $y, $z) = @_;	318	my ($self, $x, $y, $z) = @_;
318		319
319	$self->{x} = List::Util::max 0, int $x;	320	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320	$self->{y} = List::Util::max 0, int $y;	321	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321	$self->{z} = $z if defined $z;	322	$self->{z} = $z if defined $z;
322		323
323	$self->update;	324	$self->update;
324	}	325	}
325		326
…		…
399		400
400	$self->{tooltip} = $tooltip;	401	$self->{tooltip} = $tooltip;
401		402
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	404	delete $CFClient::UI::TOOLTIP->{owner};
404	CFClient::UI::check_tooltip;	405	$CFClient::UI::TOOLTIP_WATCHER->cb->();
405	}	406	}
406	}	407	}
407		408
408	# translate global coordinates to local coordinate system	409	# translate global coordinates to local coordinate system
409	sub coord2local {	410	sub coord2local {
…		…
1542		1543
1543	sub realloc {	1544	sub realloc {
1544	my ($self) = @_;	1545	my ($self) = @_;
1545		1546
1546	delete $self->{ox};	1547	delete $self->{ox};
1547	delete $self->{req_h};
1548	$self->SUPER::realloc;	1548	$self->SUPER::realloc;
1549	}	1549	}
1550		1550
1551	sub set_text {	1551	sub set_text {
1552	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
…		…
1555	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1556		1556
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
1559		1559
		1560	delete $self->{size_req};
1560	$self->realloc;	1561	$self->realloc;
1561	$self->update;	1562	$self->update;
1562	}	1563	}
1563		1564
1564	sub set_markup {	1565	sub set_markup {
…		…
1570	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1571		1572
1572	$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;
1573	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
1574		1575
		1576	delete $self->{size_req};
1575	$self->realloc;	1577	$self->realloc;
1576	$self->update;	1578	$self->update;
1577	}	1579	}
1578		1580
1579	sub size_request {	1581	sub size_request {
1580	my ($self) = @_;	1582	my ($self) = @_;
1581		1583
1582	if (exists $self->{req_h}) {	1584	$self->{size_req} \|\|= do {
1583	@$self{qw(req_w req_h)}
1584	} else {
1585	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1586	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1586	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1587	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
…		…
1598		1598
1599	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1600	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
1601	}	1601	}
1602		1602
1603	($w, $h)	1603	[$w, $h]
1604	}	1604	};
		1605
		1606	@{ $self->{size_req} }
1605	}	1607	}
1606		1608
1607	sub size_allocate {	1609	sub size_allocate {
1608	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1609		1611
…		…
1618		1620
1619	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1620	delete $self->{texture};	1622	delete $self->{texture};
1621		1623
1622	$self->realloc;	1624	$self->realloc;
		1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1623	}	1633	}
1624		1634
1625	sub _draw {	1635	sub _draw {
1626	my ($self) = @_;	1636	my ($self) = @_;
1627		1637
…		…
1647	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1648	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1649	};	1659	};
1650		1660
1651	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 {
1652	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1653
1654	glColor_premultiply @{$self->{fg}}
1655	if $tex->{format} == GL_ALPHA;
1656
1657	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1672	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
		1673	}
1658		1674
1659	glDisable GL_TEXTURE_2D;	1675	glDisable GL_TEXTURE_2D;
1660	}	1676	}
1661		1677
1662	#############################################################################	1678	#############################################################################
…		…
1678	can_hover => 1,	1694	can_hover => 1,
1679	can_focus => 1,	1695	can_focus => 1,
1680	valign => 0,	1696	valign => 0,
1681	can_events => 1,	1697	can_events => 1,
1682	#text => ...	1698	#text => ...
		1699	#hidden => "*",
1683	@_	1700	@_
1684	)	1701	)
1685	}	1702	}
1686		1703
1687	sub _set_text {	1704	sub _set_text {
…		…
1694	$self->{last_activity} = $::NOW;	1711	$self->{last_activity} = $::NOW;
1695	$self->{text} = $text;	1712	$self->{text} = $text;
1696		1713
1697	$text =~ s/./*/g if $self->{hidden};	1714	$text =~ s/./*/g if $self->{hidden};
1698	$self->{layout}->set_text ("$text ");	1715	$self->{layout}->set_text ("$text ");
		1716	delete $self->{size_req};
1699		1717
1700	$self->_emit (changed => $self->{text});	1718	$self->_emit (changed => $self->{text});
		1719
		1720	$self->realloc;
1701	$self->update;	1721	$self->update;
1702	}	1722	}
1703		1723
1704	sub set_text {	1724	sub set_text {
1705	my ($self, $text) = @_;	1725	my ($self, $text) = @_;
1706		1726
1707	$self->{cursor} = length $text;	1727	$self->{cursor} = length $text;
1708	$self->_set_text ($text);	1728	$self->_set_text ($text);
1709
1710	$self->realloc;
1711	}	1729	}
1712		1730
1713	sub get_text {	1731	sub get_text {
1714	$_[0]{text}	1732	$_[0]{text}
1715	}	1733	}
…		…
2289	sub set_range {	2307	sub set_range {
2290	my ($self, $range) = @_;	2308	my ($self, $range) = @_;
2291		2309
2292	($range, $self->{range}) = ($self->{range}, $range);	2310	($range, $self->{range}) = ($self->{range}, $range);
2293		2311
2294	$self->update
2295	if "@$range" ne "@{$self->{range}}";	2312	if ("@$range" ne "@{$self->{range}}") {
		2313	$self->update;
		2314	$self->set_value ($self->{range}[0]);
		2315	}
2296	}	2316	}
2297		2317
2298	sub set_value {	2318	sub set_value {
2299	my ($self, $value) = @_;	2319	my ($self, $value) = @_;
2300		2320
…		…
2447	sub set_range { shift->{slider}->set_range (@_) }	2467	sub set_range { shift->{slider}->set_range (@_) }
2448	sub set_value { shift->{slider}->set_value (@_) }	2468	sub set_value { shift->{slider}->set_value (@_) }
2449		2469
2450	#############################################################################	2470	#############################################################################
2451		2471
2452	package CFClient::UI::TextView;	2472	package CFClient::UI::TextScroller;
2453		2473
2454	our @ISA = CFClient::UI::HBox::;	2474	our @ISA = CFClient::UI::HBox::;
2455		2475
2456	use CFClient::OpenGL;	2476	use CFClient::OpenGL;
2457		2477
…		…
2459	my $class = shift;	2479	my $class = shift;
2460		2480
2461	my $self = $class->SUPER::new (	2481	my $self = $class->SUPER::new (
2462	fontsize => 1,	2482	fontsize => 1,
2463	can_events => 0,	2483	can_events => 0,
		2484	indent => 0,
2464	#font => default_font	2485	#font => default_font
2465	@_,	2486	@_,
2466		2487
2467	layout => (new CFClient::Layout 1),	2488	layout => (new CFClient::Layout 1),
2468	par => [],	2489	par => [],
…		…
2491	$self->SUPER::size_allocate ($w, $h);	2512	$self->SUPER::size_allocate ($w, $h);
2492		2513
2493	$self->{layout}->set_font ($self->{font}) if $self->{font};	2514	$self->{layout}->set_font ($self->{font}) if $self->{font};
2494	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2515	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2495	$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});
2496		2518
2497	$self->reflow;	2519	$self->reflow;
2498	}	2520	}
2499		2521
2500	sub text_size {	2522	sub text_size {
…		…
2502		2524
2503	my $layout = $self->{layout};	2525	my $layout = $self->{layout};
2504		2526
2505	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2527	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506	$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});
2507	$layout->set_markup ($text);	2530	$layout->set_markup ($text);
2508		2531
2509	$layout->size	2532	$layout->size
2510	}	2533	}
2511		2534
…		…
2550		2573
2551	return unless $self->{h} > 0;	2574	return unless $self->{h} > 0;
2552		2575
2553	delete $self->{texture};	2576	delete $self->{texture};
2554		2577
2555	$ROOT->on_post_alloc ($self, sub {	2578	$ROOT->on_post_alloc ($self => sub {
2556	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2579	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557		2580
2558	if (delete $self->{need_reflow}) {	2581	if (delete $self->{need_reflow}) {
2559	my $height = 0;	2582	my $height = 0;
2560		2583
…		…
2563	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2586	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564		2587
2565	for (@{$self->{par}}) {	2588	for (@{$self->{par}}) {
2566	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2589	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2567	$layout->set_width ($W - $_->[3]);	2590	$layout->set_width ($W - $_->[3]);
		2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2568	$layout->set_markup ($_->[4]);	2592	$layout->set_markup ($_->[4]);
2569	my ($w, $h) = $layout->size;	2593	my ($w, $h) = $layout->size;
2570	$_->[0] = $w + $_->[3];	2594	$_->[0] = $w + $_->[3];
2571	$_->[1] = $h;	2595	$_->[1] = $h;
2572	}	2596	}
…		…
2575	}	2599	}
2576		2600
2577	$self->{height} = $height;	2601	$self->{height} = $height;
2578		2602
2579	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2603	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2580		2604
2581	delete $self->{texture};	2605	delete $self->{texture};
2582	}	2606	}
2583		2607
2584	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2608	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2585	glClearColor 0, 0, 0, 0;	2609	glClearColor 0, 0, 0, 0;
…		…
2604	my $h = $par->[1];	2628	my $h = $par->[1];
2605		2629
2606	if ($y0 < $y + $h && $y < $y1) {	2630	if ($y0 < $y + $h && $y < $y1) {
2607	$layout->set_foreground (@{ $par->[2] });	2631	$layout->set_foreground (@{ $par->[2] });
2608	$layout->set_width ($W - $par->[3]);	2632	$layout->set_width ($W - $par->[3]);
		2633	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2609	$layout->set_markup ($par->[4]);	2634	$layout->set_markup ($par->[4]);
2610		2635
2611	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2636	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2612		2637
2613	glRasterPos $par->[3], $y - $y0;	2638	glRasterPos $par->[3], $y - $y0;
…		…
2727	$tooltip .= "\n\n" . (ref $widget) . "\n"	2752	$tooltip .= "\n\n" . (ref $widget) . "\n"
2728	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2753	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729	. "req $widget->{req_w} $widget->{req_h}\n"	2754	. "req $widget->{req_w} $widget->{req_h}\n"
2730	. "visible $widget->{visible}";	2755	. "visible $widget->{visible}";
2731	}	2756	}
		2757
		2758	$tooltip =~ s/^\n+//;
		2759	$tooltip =~ s/\n+$//;
2732		2760
2733	$self->add (new CFClient::UI::Label	2761	$self->add (new CFClient::UI::Label
2734	markup => $tooltip,	2762	markup => $tooltip,
2735	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2763	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2736	fontsize => 0.8,	2764	fontsize => 0.8,
…		…
2764	or return;	2792	or return;
2765		2793
2766	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2794	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767		2795
2768	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2796	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769	if $x + $self->{w} > $::WIDTH;	2797	if $x + $self->{w} > $self->{root}{w};
2770		2798
2771	$self->move_abs ($x, $y);	2799	$self->move_abs ($x, $y);
2772	});	2800	});
2773	}	2801	}
2774		2802
…		…
2906	);	2934	);
2907		2935
2908	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2936	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2909		2937
2910	for my $item (@{ $self->{items} }) {	2938	for my $item (@{ $self->{items} }) {
2911	my ($widget, $cb) = @$item;	2939	my ($widget, $cb, $tooltip) = @$item;
2912		2940
2913	# handle various types of items, only text for now	2941	# handle various types of items, only text for now
2914	if (!ref $widget) {	2942	if (!ref $widget) {
2915	$widget = new CFClient::UI::Label	2943	$widget = new CFClient::UI::Label
2916	can_hover => 1,	2944	can_hover => 1,
2917	can_events => 1,	2945	can_events => 1,
2918	text => $widget;	2946	markup => $widget,
		2947	tooltip => $tooltip
2919	}	2948	}
2920		2949
2921	$self->{item}{$widget} = $item;	2950	$self->{item}{$widget} = $item;
2922		2951
2923	$self->{vbox}->add ($widget);	2952	$self->{vbox}->add ($widget);
…		…
3070	sub set_current_page {	3099	sub set_current_page {
3071	my ($self, $page) = @_;	3100	my ($self, $page) = @_;
3072		3101
3073	$self->{multiplexer}->set_current_page ($page);	3102	$self->{multiplexer}->set_current_page ($page);
3074	$self->_emit (page_changed => $self->{multiplexer}{current});	3103	$self->_emit (page_changed => $self->{multiplexer}{current});
		3104	}
		3105
		3106	#############################################################################
		3107
		3108	package CFClient::UI::Combobox;
		3109
		3110	use utf8;
		3111
		3112	our @ISA = CFClient::UI::Button::;
		3113
		3114	sub new {
		3115	my $class = shift;
		3116
		3117	my $self = $class->SUPER::new (
		3118	options => [], # [value, title, longdesc], ...
		3119	value => undef,
		3120	@_,
		3121	);
		3122
		3123	$self->_set_value ($self->{value});
		3124
		3125	$self
		3126	}
		3127
		3128	sub button_down {
		3129	my ($self, $ev) = @_;
		3130
		3131	my @menu_items;
		3132
		3133	for (@{ $self->{options} }) {
		3134	my ($value, $title, $tooltip) = @$_;
		3135
		3136	push @menu_items, [$tooltip \|\| $title, sub { $self->set_value ($value) }];
		3137	}
		3138
		3139	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3140	}
		3141
		3142	sub _set_value {
		3143	my ($self, $value) = @_;
		3144
		3145	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3146	or return;
		3147
		3148	$self->{value} = $item->[0];
		3149	$self->set_markup ("$item->[1] ⇓");
		3150	$self->set_tooltip ($item->[2]);
		3151	}
		3152
		3153	sub set_value {
		3154	my ($self, $value) = @_;
		3155
		3156	return unless $self->{value} ne $value;
		3157
		3158	$self->_set_value ($value);
		3159	$self->_emit (changed => $value);
3075	}	3160	}
3076		3161
3077	#############################################################################	3162	#############################################################################
3078		3163
3079	package CFClient::UI::Statusbox;	3164	package CFClient::UI::Statusbox;
…		…
3470	commands => [],	3555	commands => [],
3471	@_,	3556	@_,
3472	)	3557	)
3473	}	3558	}
3474		3559
3475	# XXX: Do sorting? Argl...	3560	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3561
		3562	my @TOOLTIP_NAME = (align => 0, can_events => 1, can_hover => 1, tooltip =>
		3563	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3564	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3565	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3566	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3567	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3568	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3569	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3570
		3571	sub rebuild_spell_list {
		3572	my ($self) = @_;
		3573
		3574	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3575	$self->clear;
		3576
		3577	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3578	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3579	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3580	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3581
		3582	my $row = 0;
		3583
		3584	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3585	my $spell = $self->{spell}{$_};
		3586
		3587	$row++;
		3588
		3589	my $spell_cb = sub {
		3590	my ($widget, $ev) = @_;
		3591
		3592	if ($ev->{button} == 1) {
		3593	$::CONN->user_send ("cast $spell->{name}");
		3594	} elsif ($ev->{button} == 2) {
		3595	$::CONN->user_send ("invoke $spell->{name}");
		3596	} elsif ($ev->{button} == 3) {
		3597	(new CFClient::UI::Menu
		3598	items => [
		3599	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3600	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3601	],
		3602	)->popup ($ev);
		3603	} else {
		3604	return 0;
		3605	}
		3606
		3607	1
		3608	};
		3609
		3610	$self->add (0, $row, new CFClient::UI::Face
		3611	face => $spell->{face},
		3612	can_hover => 1,
		3613	can_events => 1,
		3614	tooltip => $spell->{message},
		3615	on_button_down => $spell_cb,
		3616	);
		3617
		3618	$self->add (1, $row, new CFClient::UI::Label
		3619	expand => 1,
		3620	text => $spell->{name},
		3621	can_hover => 1,
		3622	can_events => 1,
		3623	tooltip => "$spell->{message}$TOOLTIP_ALL",
		3624	on_button_down => $spell_cb,
		3625	);
		3626
		3627	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3628	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} \|\| $spell->{grace}, @TOOLTIP_SP);
		3629	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3630	}
		3631	});
		3632	}
		3633
3476	sub add_spell {	3634	sub add_spell {
3477	my ($self, $spell) = @_;	3635	my ($self, $spell) = @_;
		3636
3478	$self->{spells}->{$spell->{name}} = $spell;	3637	$self->{spell}->{$spell->{name}} = $spell;
3479		3638	$self->rebuild_spell_list;
3480	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481	face => $spell->{face},
3482	can_hover => 1,
3483	can_events => 1,
3484	tooltip => $spell->{message});
3485
3486	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487	text => $spell->{name},
3488	can_hover => 1,
3489	can_events => 1,
3490	tooltip => $spell->{message},
3491	expand => 1);
3492
3493	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3496	expand => 1);
3497
3498	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499	text => "bind to key",
3500	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501	}
3502
3503	sub rebuild_spell_list {
3504	my ($self) = @_;
3505	$self->{tbl_idx} = 0;
3506	$self->add_spell ($_) for values %{$self->{spells}};
3507	}	3639	}
3508		3640
3509	sub remove_spell {	3641	sub remove_spell {
3510	my ($self, $spell) = @_;	3642	my ($self, $spell) = @_;
		3643
3511	delete $self->{spells}->{$spell->{name}};	3644	delete $self->{spell}->{$spell->{name}};
3512	$self->rebuild_spell_list;	3645	$self->rebuild_spell_list;
3513	}	3646	}
3514		3647
3515	#############################################################################	3648	#############################################################################
3516		3649

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.282 by root, Mon Jun 5 02:25:10 2006 UTC vs. Revision 1.298 by root, Wed Jun 7 07:00:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.298 by root, Wed Jun 7 07:00:30 2006 UTC