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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC vs.
Revision 1.296 by root, Wed Jun 7 05:48:53 2006 UTC

…		…
315	}	315	}
316		316
317	sub move_abs {	317	sub move_abs {
318	my ($self, $x, $y, $z) = @_;	318	my ($self, $x, $y, $z) = @_;
319		319
320	$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;
321	$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;
322	$self->{z} = $z if defined $z;	322	$self->{z} = $z if defined $z;
323		323
324	$self->update;	324	$self->update;
325	}	325	}
326		326
…		…
1554	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$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	delete $self->{req_h};	1560	delete $self->{size_req};
1560
1561	$self->realloc;	1561	$self->realloc;
1562	$self->update;	1562	$self->update;
1563	}	1563	}
1564		1564
1565	sub set_markup {	1565	sub set_markup {
…		…
1570		1570
1571	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1572		1572
1573	$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;
1574	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
		1575
1575	delete $self->{req_h};	1576	delete $self->{size_req};
1576
1577	$self->realloc;	1577	$self->realloc;
1578	$self->update;	1578	$self->update;
1579	}	1579	}
1580		1580
1581	sub size_request {	1581	sub size_request {
1582	my ($self) = @_;	1582	my ($self) = @_;
1583		1583
1584	if (exists $self->{req_h}) {	1584	$self->{size_req} \|\|= do {
1585	@$self{qw(req_w req_h)}
1586	} else {
1587	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1588	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1586	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1589	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1590	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
…		…
1600		1598
1601	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1602	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
1603	}	1601	}
1604		1602
1605	($w, $h)	1603	[$w, $h]
1606	}	1604	};
		1605
		1606	@{ $self->{size_req} }
1607	}	1607	}
1608		1608
1609	sub size_allocate {	1609	sub size_allocate {
1610	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1611		1611
…		…
1620		1620
1621	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1622	delete $self->{texture};	1622	delete $self->{texture};
1623		1623
1624	$self->realloc;	1624	$self->realloc;
		1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1625	}	1633	}
1626		1634
1627	sub _draw {	1635	sub _draw {
1628	my ($self) = @_;	1636	my ($self) = @_;
1629		1637
…		…
1650	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1651	};	1659	};
1652		1660
1653	glEnable GL_TEXTURE_2D;	1661	glEnable GL_TEXTURE_2D;
1654		1662
		1663	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1664	my $h = List::Util::min $self->{h} + 2, $tex->{h};
		1665
1655	if ($tex->{format} == GL_ALPHA) {	1666	if ($tex->{format} == GL_ALPHA) {
1656	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1667	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1657	glColor @{$self->{fg}};	1668	glColor @{$self->{fg}};
1658	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1669	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1659	} else {	1670	} else {
1660	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1661	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1672	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1662	}	1673	}
1663		1674
1664	glDisable GL_TEXTURE_2D;	1675	glDisable GL_TEXTURE_2D;
1665	}	1676	}
1666		1677
…		…
1683	can_hover => 1,	1694	can_hover => 1,
1684	can_focus => 1,	1695	can_focus => 1,
1685	valign => 0,	1696	valign => 0,
1686	can_events => 1,	1697	can_events => 1,
1687	#text => ...	1698	#text => ...
		1699	#hidden => "*",
1688	@_	1700	@_
1689	)	1701	)
1690	}	1702	}
1691		1703
1692	sub _set_text {	1704	sub _set_text {
…		…
1699	$self->{last_activity} = $::NOW;	1711	$self->{last_activity} = $::NOW;
1700	$self->{text} = $text;	1712	$self->{text} = $text;
1701		1713
1702	$text =~ s/./*/g if $self->{hidden};	1714	$text =~ s/./*/g if $self->{hidden};
1703	$self->{layout}->set_text ("$text ");	1715	$self->{layout}->set_text ("$text ");
1704	delete $self->{req_h};	1716	delete $self->{size_req};
1705		1717
1706	$self->_emit (changed => $self->{text});	1718	$self->_emit (changed => $self->{text});
1707		1719
1708	$self->realloc;	1720	$self->realloc;
1709	$self->update;	1721	$self->update;
…		…
2295	sub set_range {	2307	sub set_range {
2296	my ($self, $range) = @_;	2308	my ($self, $range) = @_;
2297		2309
2298	($range, $self->{range}) = ($self->{range}, $range);	2310	($range, $self->{range}) = ($self->{range}, $range);
2299		2311
2300	$self->update
2301	if "@$range" ne "@{$self->{range}}";	2312	if ("@$range" ne "@{$self->{range}}") {
		2313	$self->update;
		2314	$self->set_value ($self->{range}[0]);
		2315	}
2302	}	2316	}
2303		2317
2304	sub set_value {	2318	sub set_value {
2305	my ($self, $value) = @_;	2319	my ($self, $value) = @_;
2306		2320
…		…
2465	my $class = shift;	2479	my $class = shift;
2466		2480
2467	my $self = $class->SUPER::new (	2481	my $self = $class->SUPER::new (
2468	fontsize => 1,	2482	fontsize => 1,
2469	can_events => 0,	2483	can_events => 0,
		2484	indent => 0,
2470	#font => default_font	2485	#font => default_font
2471	@_,	2486	@_,
2472		2487
2473	layout => (new CFClient::Layout 1),	2488	layout => (new CFClient::Layout 1),
2474	par => [],	2489	par => [],
…		…
2497	$self->SUPER::size_allocate ($w, $h);	2512	$self->SUPER::size_allocate ($w, $h);
2498		2513
2499	$self->{layout}->set_font ($self->{font}) if $self->{font};	2514	$self->{layout}->set_font ($self->{font}) if $self->{font};
2500	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2515	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2501	$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});
2502		2518
2503	$self->reflow;	2519	$self->reflow;
2504	}	2520	}
2505		2521
2506	sub text_size {	2522	sub text_size {
…		…
2508		2524
2509	my $layout = $self->{layout};	2525	my $layout = $self->{layout};
2510		2526
2511	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2527	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2512	$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});
2513	$layout->set_markup ($text);	2530	$layout->set_markup ($text);
2514		2531
2515	$layout->size	2532	$layout->size
2516	}	2533	}
2517		2534
…		…
2556		2573
2557	return unless $self->{h} > 0;	2574	return unless $self->{h} > 0;
2558		2575
2559	delete $self->{texture};	2576	delete $self->{texture};
2560		2577
2561	$ROOT->on_post_alloc ($self, sub {	2578	$ROOT->on_post_alloc ($self => sub {
2562	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2579	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2563		2580
2564	if (delete $self->{need_reflow}) {	2581	if (delete $self->{need_reflow}) {
2565	my $height = 0;	2582	my $height = 0;
2566		2583
…		…
2569	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2586	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2570		2587
2571	for (@{$self->{par}}) {	2588	for (@{$self->{par}}) {
2572	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2589	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2573	$layout->set_width ($W - $_->[3]);	2590	$layout->set_width ($W - $_->[3]);
		2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2574	$layout->set_markup ($_->[4]);	2592	$layout->set_markup ($_->[4]);
2575	my ($w, $h) = $layout->size;	2593	my ($w, $h) = $layout->size;
2576	$_->[0] = $w + $_->[3];	2594	$_->[0] = $w + $_->[3];
2577	$_->[1] = $h;	2595	$_->[1] = $h;
2578	}	2596	}
…		…
2581	}	2599	}
2582		2600
2583	$self->{height} = $height;	2601	$self->{height} = $height;
2584		2602
2585	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2603	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2586		2604
2587	delete $self->{texture};	2605	delete $self->{texture};
2588	}	2606	}
2589		2607
2590	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2608	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2591	glClearColor 0, 0, 0, 0;	2609	glClearColor 0, 0, 0, 0;
…		…
2610	my $h = $par->[1];	2628	my $h = $par->[1];
2611		2629
2612	if ($y0 < $y + $h && $y < $y1) {	2630	if ($y0 < $y + $h && $y < $y1) {
2613	$layout->set_foreground (@{ $par->[2] });	2631	$layout->set_foreground (@{ $par->[2] });
2614	$layout->set_width ($W - $par->[3]);	2632	$layout->set_width ($W - $par->[3]);
		2633	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2615	$layout->set_markup ($par->[4]);	2634	$layout->set_markup ($par->[4]);
2616		2635
2617	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2636	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2618		2637
2619	glRasterPos $par->[3], $y - $y0;	2638	glRasterPos $par->[3], $y - $y0;
…		…
2770	or return;	2789	or return;
2771		2790
2772	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2791	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2773		2792
2774	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2793	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2775	if $x + $self->{w} > $::WIDTH;	2794	if $x + $self->{w} > $self->{root}{w};
2776		2795
2777	$self->move_abs ($x, $y);	2796	$self->move_abs ($x, $y);
2778	});	2797	});
2779	}	2798	}
2780		2799
…		…
2912	);	2931	);
2913		2932
2914	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2933	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2915		2934
2916	for my $item (@{ $self->{items} }) {	2935	for my $item (@{ $self->{items} }) {
2917	my ($widget, $cb) = @$item;	2936	my ($widget, $cb, $tooltip) = @$item;
2918		2937
2919	# handle various types of items, only text for now	2938	# handle various types of items, only text for now
2920	if (!ref $widget) {	2939	if (!ref $widget) {
2921	$widget = new CFClient::UI::Label	2940	$widget = new CFClient::UI::Label
2922	can_hover => 1,	2941	can_hover => 1,
2923	can_events => 1,	2942	can_events => 1,
2924	text => $widget;	2943	text => $widget,
		2944	tooltip => $tooltip
2925	}	2945	}
2926		2946
2927	$self->{item}{$widget} = $item;	2947	$self->{item}{$widget} = $item;
2928		2948
2929	$self->{vbox}->add ($widget);	2949	$self->{vbox}->add ($widget);
…		…
3076	sub set_current_page {	3096	sub set_current_page {
3077	my ($self, $page) = @_;	3097	my ($self, $page) = @_;
3078		3098
3079	$self->{multiplexer}->set_current_page ($page);	3099	$self->{multiplexer}->set_current_page ($page);
3080	$self->_emit (page_changed => $self->{multiplexer}{current});	3100	$self->_emit (page_changed => $self->{multiplexer}{current});
		3101	}
		3102
		3103	#############################################################################
		3104
		3105	package CFClient::UI::Combobox;
		3106
		3107	use utf8;
		3108
		3109	our @ISA = CFClient::UI::Button::;
		3110
		3111	sub new {
		3112	my $class = shift;
		3113
		3114	my $self = $class->SUPER::new (
		3115	options => [], # [title, value, tooltip], ...
		3116	value => undef,
		3117	@_,
		3118	);
		3119
		3120	$self->_set_value ($self->{value});
		3121
		3122	$self
		3123	}
		3124
		3125	sub button_down {
		3126	my ($self, $ev) = @_;
		3127
		3128	my @menu_items;
		3129
		3130	for (@{ $self->{options} }) {
		3131	my ($title, $value, $tooltip) = @$_;
		3132
		3133	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
		3134	}
		3135
		3136	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3137	}
		3138
		3139	sub _set_value {
		3140	my ($self, $value) = @_;
		3141
		3142	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
		3143	or return;
		3144
		3145	$self->{value} = $item->[1];
		3146	$self->set_markup ("$item->[0] ⇓");
		3147	$self->set_tooltip ($item->[2]);
		3148	}
		3149
		3150	sub set_value {
		3151	my ($self, $value) = @_;
		3152
		3153	return unless $self->{value} ne $value;
		3154
		3155	$self->_set_value ($value);
		3156	$self->_emit (changed => $value);
3081	}	3157	}
3082		3158
3083	#############################################################################	3159	#############################################################################
3084		3160
3085	package CFClient::UI::Statusbox;	3161	package CFClient::UI::Statusbox;
…		…
3476	commands => [],	3552	commands => [],
3477	@_,	3553	@_,
3478	)	3554	)
3479	}	3555	}
3480		3556
3481	# XXX: Do sorting? Argl...	3557	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3558	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
		3559	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3560	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
		3561	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3562	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
		3563
		3564	sub rebuild_spell_list {
		3565	my ($self) = @_;
		3566
		3567	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3568	$self->clear;
		3569
		3570	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
		3571	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3572	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3573	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3574
		3575	my $row = 0;
		3576
		3577	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3578	my $spell = $self->{spell}{$_};
		3579
		3580	$row++;
		3581
		3582	$self->add (0, $row, new CFClient::UI::Face
		3583	face => $spell->{face},
		3584	can_hover => 1,
		3585	can_events => 1,
		3586	tooltip => $spell->{message},
		3587	);
		3588
		3589	$self->add (1, $row, new CFClient::UI::Label
		3590	expand => 1,
		3591	text => $spell->{name},
		3592	can_hover => 1,
		3593	can_events => 1,
		3594	tooltip => $spell->{message},
		3595	);
		3596
		3597	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3598	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} \|\| $spell->{grace}, @TOOLTIP_SP);
		3599	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3600
		3601	# TODO: should be done via popup
		3602	$self->add (5, $row, new CFClient::UI::Button
		3603	text => "bind",
		3604	tooltip => "bind spell readying (cast command) to key",
		3605	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
		3606	);
		3607	}
		3608	});
		3609	}
		3610
3482	sub add_spell {	3611	sub add_spell {
3483	my ($self, $spell) = @_;	3612	my ($self, $spell) = @_;
		3613
3484	$self->{spells}->{$spell->{name}} = $spell;	3614	$self->{spell}->{$spell->{name}} = $spell;
3485		3615	$self->rebuild_spell_list;
3486	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3487	face => $spell->{face},
3488	can_hover => 1,
3489	can_events => 1,
3490	tooltip => $spell->{message});
3491
3492	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3493	text => $spell->{name},
3494	can_hover => 1,
3495	can_events => 1,
3496	tooltip => $spell->{message},
3497	expand => 1);
3498
3499	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3500	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3501	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3502	expand => 1);
3503
3504	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3505	text => "bind to key",
3506	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3507	}
3508
3509	sub rebuild_spell_list {
3510	my ($self) = @_;
3511	$self->{tbl_idx} = 0;
3512	$self->add_spell ($_) for values %{$self->{spells}};
3513	}	3616	}
3514		3617
3515	sub remove_spell {	3618	sub remove_spell {
3516	my ($self, $spell) = @_;	3619	my ($self, $spell) = @_;
		3620
3517	delete $self->{spells}->{$spell->{name}};	3621	delete $self->{spell}->{$spell->{name}};
3518	$self->rebuild_spell_list;	3622	$self->rebuild_spell_list;
3519	}	3623	}
3520		3624
3521	#############################################################################	3625	#############################################################################
3522		3626

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC vs. Revision 1.296 by root, Wed Jun 7 05:48:53 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC vs.
Revision 1.296 by root, Wed Jun 7 05:48:53 2006 UTC