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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 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;
388		389
389	$self->realloc;	390	$self->realloc;
390	}	391	}
391		392
392	sub set_tooltip {	393	sub set_tooltip {
…		…
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 {
…		…
1538		1539
1539	delete $self->{texture};	1540	delete $self->{texture};
1540	$self->SUPER::update;	1541	$self->SUPER::update;
1541	}	1542	}
1542		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1543	sub set_text {	1551	sub set_text {
1544	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1545		1553
1546	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1547	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1548		1556
1549	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
1551		1559
		1560	delete $self->{size_req};
1552	$self->realloc;	1561	$self->realloc;
1553	$self->update;	1562	$self->update;
1554	}	1563	}
1555		1564
1556	sub set_markup {	1565	sub set_markup {
…		…
1562	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1563		1572
1564	$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;
1565	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
1566		1575
		1576	delete $self->{size_req};
1567	$self->realloc;	1577	$self->realloc;
1568	$self->update;	1578	$self->update;
1569	}	1579	}
1570		1580
1571	sub size_request {	1581	sub size_request {
1572	my ($self) = @_;	1582	my ($self) = @_;
1573		1583
		1584	$self->{size_req} \|\|= do {
1574	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1575	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1586	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1576	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1577	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579		1590
1580	my ($w, $h) = $self->{layout}->size;	1591	my ($w, $h) = $self->{layout}->size;
1581		1592
1582	if (exists $self->{template}) {	1593	if (exists $self->{template}) {
1583	$self->{template}->set_font ($self->{font}) if $self->{font};	1594	$self->{template}->set_font ($self->{font}) if $self->{font};
1584	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585		1596
1586	my ($w2, $h2) = $self->{template}->size;	1597	my ($w2, $h2) = $self->{template}->size;
1587		1598
1588	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1589	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
		1601	}
		1602
		1603	[$w, $h]
1590	}	1604	};
1591		1605
1592	($w, $h)	1606	@{ $self->{size_req} }
1593	}	1607	}
1594		1608
1595	sub size_allocate {	1609	sub size_allocate {
1596	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1597		1611
…		…
1606		1620
1607	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1608	delete $self->{texture};	1622	delete $self->{texture};
1609		1623
1610	$self->realloc;	1624	$self->realloc;
		1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1611	}	1633	}
1612		1634
1613	sub _draw {	1635	sub _draw {
1614	my ($self) = @_;	1636	my ($self) = @_;
1615		1637
…		…
1635	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1636	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1637	};	1659	};
1638		1660
1639	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 {
1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641
1642	glColor_premultiply @{$self->{fg}}
1643	if $tex->{format} == GL_ALPHA;
1644
1645	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1670	}
1646		1671
1647	glDisable GL_TEXTURE_2D;	1672	glDisable GL_TEXTURE_2D;
1648	}	1673	}
1649		1674
1650	#############################################################################	1675	#############################################################################
…		…
1682	$self->{last_activity} = $::NOW;	1707	$self->{last_activity} = $::NOW;
1683	$self->{text} = $text;	1708	$self->{text} = $text;
1684		1709
1685	$text =~ s/./*/g if $self->{hidden};	1710	$text =~ s/./*/g if $self->{hidden};
1686	$self->{layout}->set_text ("$text ");	1711	$self->{layout}->set_text ("$text ");
		1712	delete $self->{size_req};
1687		1713
1688	$self->_emit (changed => $self->{text});	1714	$self->_emit (changed => $self->{text});
		1715
		1716	$self->realloc;
1689	$self->update;	1717	$self->update;
1690	}	1718	}
1691		1719
1692	sub set_text {	1720	sub set_text {
1693	my ($self, $text) = @_;	1721	my ($self, $text) = @_;
1694		1722
1695	$self->{cursor} = length $text;	1723	$self->{cursor} = length $text;
1696	$self->_set_text ($text);	1724	$self->_set_text ($text);
1697
1698	$self->realloc;
1699	}	1725	}
1700		1726
1701	sub get_text {	1727	sub get_text {
1702	$_[0]{text}	1728	$_[0]{text}
1703	}	1729	}
…		…
3076	@_,	3102	@_,
3077	);	3103	);
3078		3104
3079	Scalar::Util::weaken (my $this = $self);	3105	Scalar::Util::weaken (my $this = $self);
3080		3106
3081	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {	3107	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082	$this->reorder;
3083	$this->update;
3084	});
3085		3108
3086	$self	3109	$self
3087	}	3110	}
3088		3111
3089	sub reorder {	3112	sub reorder {
3090	my ($self) = @_;	3113	my ($self) = @_;
3091	my $NOW = Time::HiRes::time;	3114	my $NOW = Time::HiRes::time;
		3115
		3116	# freeze display when hovering over any label
		3117	return if $CFClient::UI::TOOLTIP->{owner}
		3118	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3119	values %{ $self->{item} };
3092		3120
3093	while (my ($k, $v) = each %{ $self->{item} }) {	3121	while (my ($k, $v) = each %{ $self->{item} }) {
3094	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3122	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3095	}	3123	}
3096		3124
…		…
3105		3133
3106	my $count = 10 + 1;	3134	my $count = 10 + 1;
3107	for my $item (@items) {	3135	for my $item (@items) {
3108	last unless --$count;	3136	last unless --$count;
3109		3137
3110	push @widgets, $item->{label} \|\|= do {	3138	my $label = $item->{label} \|\|= do {
3111	# TODO: doesn't handle markup well (read as: at all)	3139	# TODO: doesn't handle markup well (read as: at all)
3112	my $short = $item->{count} > 1	3140	my $short = $item->{count} > 1
3113	? "<b>$item->{count} ×</b> $item->{text}"	3141	? "<b>$item->{count} ×</b> $item->{text}"
3114	: $item->{text};	3142	: $item->{text};
3115		3143
…		…
3123	tooltip => $item->{tooltip},	3151	tooltip => $item->{tooltip},
3124	tooltip_font => $::FONT_PROP,	3152	tooltip_font => $::FONT_PROP,
3125	tooltip_width => 0.67,	3153	tooltip_width => 0.67,
3126	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3154	fontsize => $item->{fontsize} \|\| $self->{fontsize},
3127	max_w => $::WIDTH * 0.44,	3155	max_w => $::WIDTH * 0.44,
3128	fg => $item->{fg},	3156	fg => [@{ $item->{fg} }],
3129	orig_alpha => $item->{fg}[3] \|\| 1,
3130	can_events => 1,	3157	can_events => 1,
3131	can_hover => 1	3158	can_hover => 1
3132	};	3159	};
3133		3160
3134	if ((my $diff = $item->{timeout} - $NOW) < 2) {	3161	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135	$item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;	3162	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
3136	if ($diff < 1) {
3137	$item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138	$item->{label}->realloc;
3139	}
3140	$item->{label}->update;	3163	$label->update;
		3164	$label->set_max_size (undef, $label->{req_h} * $diff)
		3165	if $diff < 1;
3141	$self->{timer}->interval (1/30);	3166	$self->{timer}->interval (1/30);
		3167	} else {
		3168	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
3142	}	3169	}
		3170
		3171	push @widgets, $label;
3143	}	3172	}
3144		3173
3145	$self->clear;	3174	$self->clear;
3146	$self->SUPER::add (reverse @widgets);	3175	$self->SUPER::add (reverse @widgets);
3147	}	3176	}
…		…
3455	commands => [],	3484	commands => [],
3456	@_,	3485	@_,
3457	)	3486	)
3458	}	3487	}
3459		3488
3460	# XXX: Do sorting? Argl...	3489	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3490	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
		3491	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3492	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
		3493	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3494	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
		3495
		3496	sub rebuild_spell_list {
		3497	my ($self) = @_;
		3498
		3499	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3500	$self->clear;
		3501
		3502	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
		3503	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3504	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3505	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3506
		3507	my $row = 0;
		3508
		3509	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3510	my $spell = $self->{spell}{$_};
		3511
		3512	$row++;
		3513
		3514	$self->add (0, $row, new CFClient::UI::Face
		3515	face => $spell->{face},
		3516	can_hover => 1,
		3517	can_events => 1,
		3518	tooltip => $spell->{message},
		3519	);
		3520
		3521	$self->add (1, $row, new CFClient::UI::Label
		3522	expand => 1,
		3523	text => $spell->{name},
		3524	can_hover => 1,
		3525	can_events => 1,
		3526	tooltip => $spell->{message},
		3527	);
		3528
		3529	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3530	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} \|\| $spell->{grace}, @TOOLTIP_SP);
		3531	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3532
		3533	# TODO: should be done via popup
		3534	$self->add (5, $row, new CFClient::UI::Button
		3535	text => "bind",
		3536	tooltip => "bind spell readying (cast command) to key",
		3537	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
		3538	);
		3539	}
		3540	});
		3541	}
		3542
3461	sub add_spell {	3543	sub add_spell {
3462	my ($self, $spell) = @_;	3544	my ($self, $spell) = @_;
		3545
3463	$self->{spells}->{$spell->{name}} = $spell;	3546	$self->{spell}->{$spell->{name}} = $spell;
3464		3547	$self->rebuild_spell_list;
3465	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3466	face => $spell->{face},
3467	can_hover => 1,
3468	can_events => 1,
3469	tooltip => $spell->{message});
3470
3471	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472	text => $spell->{name},
3473	can_hover => 1,
3474	can_events => 1,
3475	tooltip => $spell->{message},
3476	expand => 1);
3477
3478	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3481	expand => 1);
3482
3483	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484	text => "bind to key",
3485	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486	}
3487
3488	sub rebuild_spell_list {
3489	my ($self) = @_;
3490	$self->{tbl_idx} = 0;
3491	$self->add_spell ($_) for values %{$self->{spells}};
3492	}	3548	}
3493		3549
3494	sub remove_spell {	3550	sub remove_spell {
3495	my ($self, $spell) = @_;	3551	my ($self, $spell) = @_;
		3552
3496	delete $self->{spells}->{$spell->{name}};	3553	delete $self->{spell}->{$spell->{name}};
3497	$self->rebuild_spell_list;	3554	$self->rebuild_spell_list;
3498	}	3555	}
3499		3556
3500	#############################################################################	3557	#############################################################################
3501		3558

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC vs. Revision 1.290 by root, Mon Jun 5 22:30:35 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 2006 UTC