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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.293 by root, Tue Jun 6 03:05:16 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);
…		…
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 {
…		…
1553	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1554	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1555		1556
1556	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
		1559
1558	delete $self->{req_h};	1560	delete $self->{size_req};
1559
1560	$self->realloc;	1561	$self->realloc;
1561	$self->update;	1562	$self->update;
1562	}	1563	}
1563		1564
1564	sub set_markup {	1565	sub set_markup {
…		…
1569		1570
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);
		1575
1574	delete $self->{req_h};	1576	delete $self->{size_req};
1575
1576	$self->realloc;	1577	$self->realloc;
1577	$self->update;	1578	$self->update;
1578	}	1579	}
1579		1580
1580	sub size_request {	1581	sub size_request {
1581	my ($self) = @_;	1582	my ($self) = @_;
1582		1583
1583	if (exists $self->{req_h}) {	1584	$self->{size_req} \|\|= do {
1584	@$self{qw(req_w req_h)}
1585	} else {
1586	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1587	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1586	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1588	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1589	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
…		…
1599		1598
1600	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1601	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
1602	}	1601	}
1603		1602
1604	($w, $h)	1603	[$w, $h]
1605	}	1604	};
		1605
		1606	@{ $self->{size_req} }
1606	}	1607	}
1607		1608
1608	sub size_allocate {	1609	sub size_allocate {
1609	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1610		1611
…		…
1619		1620
1620	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1621	delete $self->{texture};	1622	delete $self->{texture};
1622		1623
1623	$self->realloc;	1624	$self->realloc;
		1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1624	}	1633	}
1625		1634
1626	sub _draw {	1635	sub _draw {
1627	my ($self) = @_;	1636	my ($self) = @_;
1628		1637
…		…
1648	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1649	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1650	};	1659	};
1651		1660
1652	glEnable GL_TEXTURE_2D;	1661	glEnable GL_TEXTURE_2D;
		1662
		1663	if ($tex->{format} == GL_ALPHA) {
		1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1665	glColor @{$self->{fg}};
		1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1667	} else {
1653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654
1655	glColor_premultiply @{$self->{fg}}
1656	if $tex->{format} == GL_ALPHA;
1657
1658	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1670	}
1659		1671
1660	glDisable GL_TEXTURE_2D;	1672	glDisable GL_TEXTURE_2D;
1661	}	1673	}
1662		1674
1663	#############################################################################	1675	#############################################################################
…		…
1679	can_hover => 1,	1691	can_hover => 1,
1680	can_focus => 1,	1692	can_focus => 1,
1681	valign => 0,	1693	valign => 0,
1682	can_events => 1,	1694	can_events => 1,
1683	#text => ...	1695	#text => ...
		1696	#hidden => "*",
1684	@_	1697	@_
1685	)	1698	)
1686	}	1699	}
1687		1700
1688	sub _set_text {	1701	sub _set_text {
…		…
1695	$self->{last_activity} = $::NOW;	1708	$self->{last_activity} = $::NOW;
1696	$self->{text} = $text;	1709	$self->{text} = $text;
1697		1710
1698	$text =~ s/./*/g if $self->{hidden};	1711	$text =~ s/./*/g if $self->{hidden};
1699	$self->{layout}->set_text ("$text ");	1712	$self->{layout}->set_text ("$text ");
1700	delete $self->{req_h};	1713	delete $self->{size_req};
1701		1714
1702	$self->_emit (changed => $self->{text});	1715	$self->_emit (changed => $self->{text});
1703		1716
1704	$self->realloc;	1717	$self->realloc;
1705	$self->update;	1718	$self->update;
…		…
2461	my $class = shift;	2474	my $class = shift;
2462		2475
2463	my $self = $class->SUPER::new (	2476	my $self = $class->SUPER::new (
2464	fontsize => 1,	2477	fontsize => 1,
2465	can_events => 0,	2478	can_events => 0,
		2479	indent => 0,
2466	#font => default_font	2480	#font => default_font
2467	@_,	2481	@_,
2468		2482
2469	layout => (new CFClient::Layout 1),	2483	layout => (new CFClient::Layout 1),
2470	par => [],	2484	par => [],
…		…
2493	$self->SUPER::size_allocate ($w, $h);	2507	$self->SUPER::size_allocate ($w, $h);
2494		2508
2495	$self->{layout}->set_font ($self->{font}) if $self->{font};	2509	$self->{layout}->set_font ($self->{font}) if $self->{font};
2496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2510	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497	$self->{layout}->set_width ($self->{children}[0]{w});	2511	$self->{layout}->set_width ($self->{children}[0]{w});
		2512	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498		2513
2499	$self->reflow;	2514	$self->reflow;
2500	}	2515	}
2501		2516
2502	sub text_size {	2517	sub text_size {
…		…
2504		2519
2505	my $layout = $self->{layout};	2520	my $layout = $self->{layout};
2506		2521
2507	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2522	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508	$layout->set_width ($self->{children}[0]{w} - $indent);	2523	$layout->set_width ($self->{children}[0]{w} - $indent);
		2524	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509	$layout->set_markup ($text);	2525	$layout->set_markup ($text);
2510		2526
2511	$layout->size	2527	$layout->size
2512	}	2528	}
2513		2529
…		…
2565	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2581	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566		2582
2567	for (@{$self->{par}}) {	2583	for (@{$self->{par}}) {
2568	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2584	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2569	$layout->set_width ($W - $_->[3]);	2585	$layout->set_width ($W - $_->[3]);
		2586	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2570	$layout->set_markup ($_->[4]);	2587	$layout->set_markup ($_->[4]);
2571	my ($w, $h) = $layout->size;	2588	my ($w, $h) = $layout->size;
2572	$_->[0] = $w + $_->[3];	2589	$_->[0] = $w + $_->[3];
2573	$_->[1] = $h;	2590	$_->[1] = $h;
2574	}	2591	}
…		…
2606	my $h = $par->[1];	2623	my $h = $par->[1];
2607		2624
2608	if ($y0 < $y + $h && $y < $y1) {	2625	if ($y0 < $y + $h && $y < $y1) {
2609	$layout->set_foreground (@{ $par->[2] });	2626	$layout->set_foreground (@{ $par->[2] });
2610	$layout->set_width ($W - $par->[3]);	2627	$layout->set_width ($W - $par->[3]);
		2628	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2611	$layout->set_markup ($par->[4]);	2629	$layout->set_markup ($par->[4]);
2612		2630
2613	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2631	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2614		2632
2615	glRasterPos $par->[3], $y - $y0;	2633	glRasterPos $par->[3], $y - $y0;
…		…
2908	);	2926	);
2909		2927
2910	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2928	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2911		2929
2912	for my $item (@{ $self->{items} }) {	2930	for my $item (@{ $self->{items} }) {
2913	my ($widget, $cb) = @$item;	2931	my ($widget, $cb, $tooltip) = @$item;
2914		2932
2915	# handle various types of items, only text for now	2933	# handle various types of items, only text for now
2916	if (!ref $widget) {	2934	if (!ref $widget) {
2917	$widget = new CFClient::UI::Label	2935	$widget = new CFClient::UI::Label
2918	can_hover => 1,	2936	can_hover => 1,
2919	can_events => 1,	2937	can_events => 1,
2920	text => $widget;	2938	text => $widget,
		2939	tooltip => $tooltip
2921	}	2940	}
2922		2941
2923	$self->{item}{$widget} = $item;	2942	$self->{item}{$widget} = $item;
2924		2943
2925	$self->{vbox}->add ($widget);	2944	$self->{vbox}->add ($widget);
…		…
3072	sub set_current_page {	3091	sub set_current_page {
3073	my ($self, $page) = @_;	3092	my ($self, $page) = @_;
3074		3093
3075	$self->{multiplexer}->set_current_page ($page);	3094	$self->{multiplexer}->set_current_page ($page);
3076	$self->_emit (page_changed => $self->{multiplexer}{current});	3095	$self->_emit (page_changed => $self->{multiplexer}{current});
		3096	}
		3097
		3098	#############################################################################
		3099
		3100	package CFClient::UI::Combobox;
		3101
		3102	use utf8;
		3103
		3104	our @ISA = CFClient::UI::Button::;
		3105
		3106	sub new {
		3107	my $class = shift;
		3108
		3109	my $self = $class->SUPER::new (
		3110	options => [], # [title, value, tooltip], ...
		3111	value => undef,
		3112	@_,
		3113	);
		3114
		3115	$self->_set_value ($self->{value});
		3116
		3117	$self
		3118	}
		3119
		3120	sub button_down {
		3121	my ($self, $ev) = @_;
		3122
		3123	my @menu_items;
		3124
		3125	for (@{ $self->{options} }) {
		3126	my ($title, $value, $tooltip) = @$_;
		3127
		3128	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
		3129	}
		3130
		3131	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3132	}
		3133
		3134	sub _set_value {
		3135	my ($self, $value) = @_;
		3136
		3137	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
		3138	or return;
		3139
		3140	$self->{value} = $item->[1];
		3141	$self->set_markup ("$item->[0] ⇓");
		3142	$self->set_tooltip ($item->[2]);
		3143	}
		3144
		3145	sub set_value {
		3146	my ($self, $value) = @_;
		3147
		3148	return unless $self->{value} ne $value;
		3149
		3150	$self->_set_value ($value);
		3151	$self->_emit (changed => $value);
3077	}	3152	}
3078		3153
3079	#############################################################################	3154	#############################################################################
3080		3155
3081	package CFClient::UI::Statusbox;	3156	package CFClient::UI::Statusbox;
…		…
3472	commands => [],	3547	commands => [],
3473	@_,	3548	@_,
3474	)	3549	)
3475	}	3550	}
3476		3551
3477	# XXX: Do sorting? Argl...	3552	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3553	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
		3554	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3555	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
		3556	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3557	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
		3558
		3559	sub rebuild_spell_list {
		3560	my ($self) = @_;
		3561
		3562	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3563	$self->clear;
		3564
		3565	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
		3566	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3567	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3568	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3569
		3570	my $row = 0;
		3571
		3572	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3573	my $spell = $self->{spell}{$_};
		3574
		3575	$row++;
		3576
		3577	$self->add (0, $row, new CFClient::UI::Face
		3578	face => $spell->{face},
		3579	can_hover => 1,
		3580	can_events => 1,
		3581	tooltip => $spell->{message},
		3582	);
		3583
		3584	$self->add (1, $row, new CFClient::UI::Label
		3585	expand => 1,
		3586	text => $spell->{name},
		3587	can_hover => 1,
		3588	can_events => 1,
		3589	tooltip => $spell->{message},
		3590	);
		3591
		3592	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3593	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} \|\| $spell->{grace}, @TOOLTIP_SP);
		3594	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3595
		3596	# TODO: should be done via popup
		3597	$self->add (5, $row, new CFClient::UI::Button
		3598	text => "bind",
		3599	tooltip => "bind spell readying (cast command) to key",
		3600	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
		3601	);
		3602	}
		3603	});
		3604	}
		3605
3478	sub add_spell {	3606	sub add_spell {
3479	my ($self, $spell) = @_;	3607	my ($self, $spell) = @_;
		3608
3480	$self->{spells}->{$spell->{name}} = $spell;	3609	$self->{spell}->{$spell->{name}} = $spell;
3481		3610	$self->rebuild_spell_list;
3482	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483	face => $spell->{face},
3484	can_hover => 1,
3485	can_events => 1,
3486	tooltip => $spell->{message});
3487
3488	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489	text => $spell->{name},
3490	can_hover => 1,
3491	can_events => 1,
3492	tooltip => $spell->{message},
3493	expand => 1);
3494
3495	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3498	expand => 1);
3499
3500	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501	text => "bind to key",
3502	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503	}
3504
3505	sub rebuild_spell_list {
3506	my ($self) = @_;
3507	$self->{tbl_idx} = 0;
3508	$self->add_spell ($_) for values %{$self->{spells}};
3509	}	3611	}
3510		3612
3511	sub remove_spell {	3613	sub remove_spell {
3512	my ($self, $spell) = @_;	3614	my ($self, $spell) = @_;
		3615
3513	delete $self->{spells}->{$spell->{name}};	3616	delete $self->{spell}->{$spell->{name}};
3514	$self->rebuild_spell_list;	3617	$self->rebuild_spell_list;
3515	}	3618	}
3516		3619
3517	#############################################################################	3620	#############################################################################
3518		3621

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC vs. Revision 1.293 by root, Tue Jun 6 03:05:16 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.293 by root, Tue Jun 6 03:05:16 2006 UTC