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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.281 by root, Mon Jun 5 01:59:59 2006 UTC

…		…
381	}	381	}
382		382
383	sub set_max_size {	383	sub set_max_size {
384	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
385		385
386	delete $self->{max_w}; $self->{max_w} = $w if $w;	386	$self->{max_w} = int $w if defined $w;
387	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	$self->{max_h} = int $h if defined $h;
		388
		389	$self->realloc;
388	}	390	}
389		391
390	sub set_tooltip {	392	sub set_tooltip {
391	my ($self, $tooltip) = @_;	393	my ($self, $tooltip) = @_;
392		394
…		…
548	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)	550	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
549	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);	551	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
550		552
551	glPushMatrix;	553	glPushMatrix;
552	glTranslate $self->{x}, $self->{y}, 0;	554	glTranslate $self->{x}, $self->{y}, 0;
553	$self->_draw;
554	glPopMatrix;
555		555
556	if ($self == $HOVER && $self->{can_hover}) {	556	if ($self == $HOVER && $self->{can_hover}) {
557	my ($x, $y) = @$self{qw(x y)};
558
559	glColor 1, 0.8, 0.5, 0.2;	557	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
560	glEnable GL_BLEND;	558	glEnable GL_BLEND;
561	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	559	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562	glBegin GL_QUADS;	560	glBegin GL_QUADS;
563	glVertex $x , $y;	561	glVertex 0 , 0;
564	glVertex $x + $self->{w}, $y;	562	glVertex $self->{w}, 0;
565	glVertex $x + $self->{w}, $y + $self->{h};	563	glVertex $self->{w}, $self->{h};
566	glVertex $x , $y + $self->{h};	564	glVertex 0 , $self->{h};
567	glEnd;	565	glEnd;
568	glDisable GL_BLEND;	566	glDisable GL_BLEND;
569	}	567	}
570		568
571	if ($ENV{CFPLUS_DEBUG} & 1) {	569	if ($ENV{CFPLUS_DEBUG} & 1) {
572	glPushMatrix;	570	glPushMatrix;
573	glColor 1, 1, 0, 1;	571	glColor 1, 1, 0, 1;
574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	572	glTranslate 0.375, 0.375;
575	glBegin GL_LINE_LOOP;	573	glBegin GL_LINE_LOOP;
576	glVertex 0 , 0;	574	glVertex 0 , 0;
577	glVertex $self->{w} - 1, 0;	575	glVertex $self->{w} - 1, 0;
578	glVertex $self->{w} - 1, $self->{h} - 1;	576	glVertex $self->{w} - 1, $self->{h} - 1;
579	glVertex 0 , $self->{h} - 1;	577	glVertex 0 , $self->{h} - 1;
580	glEnd;	578	glEnd;
581	glPopMatrix;	579	glPopMatrix;
582	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583	}	581	}
		582
		583	$self->_draw;
		584	glPopMatrix;
584	}	585	}
585		586
586	sub _draw {	587	sub _draw {
587	my ($self) = @_;	588	my ($self) = @_;
588		589
…		…
626		627
627	if ($color && (@$color < 4 \|\| $color->[3])) {	628	if ($color && (@$color < 4 \|\| $color->[3])) {
628	my ($w, $h) = @$self{qw(w h)};	629	my ($w, $h) = @$self{qw(w h)};
629		630
630	glEnable GL_BLEND;	631	glEnable GL_BLEND;
631	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	632	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632	glColor @$color;	633	glColor_premultiply @$color;
633		634
634	glBegin GL_QUADS;	635	glBegin GL_QUADS;
635	glVertex 0 , 0;	636	glVertex 0 , 0;
636	glVertex 0 , $h;	637	glVertex 0 , $h;
637	glVertex $w, $h;	638	glVertex $w, $h;
…		…
856	my $tex = $self->{texture}	857	my $tex = $self->{texture}
857	or return;	858	or return;
858		859
859	glEnable GL_TEXTURE_2D;	860	glEnable GL_TEXTURE_2D;
860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
862		863
863	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864		865
865	glDisable GL_TEXTURE_2D;	866	glDisable GL_TEXTURE_2D;
866	}	867	}
…		…
1035		1036
1036	if ($self->{bg}) {	1037	if ($self->{bg}) {
1037	my ($w, $h) = @$self{qw(w h)};	1038	my ($w, $h) = @$self{qw(w h)};
1038		1039
1039	glEnable GL_BLEND;	1040	glEnable GL_BLEND;
1040	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1041	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041	glColor @{ $self->{bg} };	1042	glColor_premultiply @{ $self->{bg} };
1042		1043
1043	glBegin GL_QUADS;	1044	glBegin GL_QUADS;
1044	glVertex 0 , 0;	1045	glVertex 0 , 0;
1045	glVertex 0 , $h;	1046	glVertex 0 , $h;
1046	glVertex $w, $h;	1047	glVertex $w, $h;
…		…
1160	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
1161		1162
1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164		1165
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165	$self->realloc;	1167	$self->realloc;
1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167	};	1168	};
1168		1169
1169	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171	my ($bx, $by) = ($self->{x}, $self->{y});	1172	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1174	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
1175		1176
1176	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
1177		1178
1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1180	# HACK: the next line is required to enforce placement
		1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179	};	1182	};
1180	} else {	1183	} else {
1181	return 0;	1184	return 0;
1182	}	1185	}
1183		1186
…		…
1634	};	1637	};
1635		1638
1636	glEnable GL_TEXTURE_2D;	1639	glEnable GL_TEXTURE_2D;
1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1638		1641
		1642	glColor_premultiply @{$self->{fg}}
1639	if ($tex->{format} == GL_ALPHA) {	1643	if $tex->{format} == GL_ALPHA;
1640	glColor @{$self->{fg}};	1644
1641	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642	} else {
1643	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1645	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644	}
1645		1646
1646	glDisable GL_TEXTURE_2D;	1647	glDisable GL_TEXTURE_2D;
1647	}	1648	}
1648		1649
1649	#############################################################################	1650	#############################################################################
…		…
1782	my ($self) = @_;	1783	my ($self) = @_;
1783		1784
1784	local $self->{fg} = $self->{fg};	1785	local $self->{fg} = $self->{fg};
1785		1786
1786	if ($FOCUS == $self) {	1787	if ($FOCUS == $self) {
1787	glColor @{$self->{active_bg}};	1788	glColor_premultiply @{$self->{active_bg}};
1788	$self->{fg} = $self->{active_fg};	1789	$self->{fg} = $self->{active_fg};
1789	} else {	1790	} else {
1790	glColor @{$self->{bg}};	1791	glColor_premultiply @{$self->{bg}};
1791	}	1792	}
1792		1793
1793	glEnable GL_BLEND;	1794	glEnable GL_BLEND;
1794	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1795	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795	glBegin GL_QUADS;	1796	glBegin GL_QUADS;
1796	glVertex 0 , 0;	1797	glVertex 0 , 0;
1797	glVertex 0 , $self->{h};	1798	glVertex 0 , $self->{h};
1798	glVertex $self->{w}, $self->{h};	1799	glVertex $self->{w}, $self->{h};
1799	glVertex $self->{w}, 0;	1800	glVertex $self->{w}, 0;
…		…
1909	}	1910	}
1910		1911
1911	sub _draw {	1912	sub _draw {
1912	my ($self) = @_;	1913	my ($self) = @_;
1913		1914
1914	local $self->{fg} = $self->{fg};	1915	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916	if ($GRAB == $self) {
1917	$self->{fg} = $self->{active_fg};
1918	}
1919		1916
1920	glEnable GL_TEXTURE_2D;	1917	glEnable GL_TEXTURE_2D;
1921	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922	glColor 0, 0, 0, 1;	1919	glColor 0, 0, 0, 1;
1923		1920
…		…
2148		2145
2149	my $h1 = $self->{h} * (1 - $ycut1);	2146	my $h1 = $self->{h} * (1 - $ycut1);
2150	my $h2 = $self->{h} * (1 - $ycut2);	2147	my $h2 = $self->{h} * (1 - $ycut2);
2151		2148
2152	glEnable GL_BLEND;	2149	glEnable GL_BLEND;
2153	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2150	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2151	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2154	glEnable GL_TEXTURE_2D;	2152	glEnable GL_TEXTURE_2D;
2155	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2153	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156		2154
2157	glBindTexture GL_TEXTURE_2D, $t1->{name};	2155	glBindTexture GL_TEXTURE_2D, $t1->{name};
2158	glBegin GL_QUADS;	2156	glBegin GL_QUADS;
…		…
2570		2568
2571	delete $self->{texture};	2569	delete $self->{texture};
2572	}	2570	}
2573		2571
2574	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2572	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2575	glClearColor 0.5, 0.5, 0.5, 0;	2573	glClearColor 0, 0, 0, 0;
2576	glClear GL_COLOR_BUFFER_BIT;	2574	glClear GL_COLOR_BUFFER_BIT;
2577		2575
2578	my $top = int $self->{children}[1]{range}[0];	2576	my $top = int $self->{children}[1]{range}[0];
2579		2577
2580	my $y0 = $top;	2578	my $y0 = $top;
…		…
2615	sub _draw {	2613	sub _draw {
2616	my ($self) = @_;	2614	my ($self) = @_;
2617		2615
2618	glEnable GL_TEXTURE_2D;	2616	glEnable GL_TEXTURE_2D;
2619	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2617	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620	glColor 1, 1, 1, 1;	2618	glColor 0, 0, 0, 1;
2621	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2619	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2622	glDisable GL_TEXTURE_2D;	2620	glDisable GL_TEXTURE_2D;
2623		2621
2624	$self->{children}[1]->draw;	2622	$self->{children}[1]->draw;
2625		2623
2626	}	2624	}
…		…
2853	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2851	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2854		2852
2855	if ($tex) {	2853	if ($tex) {
2856	glEnable GL_TEXTURE_2D;	2854	glEnable GL_TEXTURE_2D;
2857	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2855	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858	glColor 1, 1, 1, 1;	2856	glColor 0, 0, 0, 1;
2859	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2857	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860	glDisable GL_TEXTURE_2D;	2858	glDisable GL_TEXTURE_2D;
2861	}	2859	}
2862	}	2860	}
2863		2861
…		…
3071	our @ISA = CFClient::UI::VBox::;	3069	our @ISA = CFClient::UI::VBox::;
3072		3070
3073	sub new {	3071	sub new {
3074	my $class = shift;	3072	my $class = shift;
3075		3073
3076	$class->SUPER::new (	3074	my $self = $class->SUPER::new (
3077	fontsize => 0.8,	3075	fontsize => 0.8,
3078	@_,	3076	@_,
3079	)	3077	);
		3078
		3079	Scalar::Util::weaken (my $this = $self);
		3080
		3081	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3082
		3083	$self
3080	}	3084	}
3081		3085
3082	sub reorder {	3086	sub reorder {
3083	my ($self) = @_;	3087	my ($self) = @_;
3084	my $NOW = time;	3088	my $NOW = Time::HiRes::time;
		3089
		3090	# freeze display when hovering over any label
		3091	return if $CFClient::UI::TOOLTIP->{owner}
		3092	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3093	values %{ $self->{item} };
3085		3094
3086	while (my ($k, $v) = each %{ $self->{item} }) {	3095	while (my ($k, $v) = each %{ $self->{item} }) {
3087	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3096	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088	}	3097	}
3089		3098
…		…
3092	my @items = sort {	3101	my @items = sort {
3093	$a->{pri} <=> $b->{pri}	3102	$a->{pri} <=> $b->{pri}
3094	or $b->{id} <=> $a->{id}	3103	or $b->{id} <=> $a->{id}
3095	} values %{ $self->{item} };	3104	} values %{ $self->{item} };
3096		3105
		3106	$self->{timer}->interval (1);
		3107
3097	my $count = 10 + 1;	3108	my $count = 10 + 1;
3098	for my $item (@items) {	3109	for my $item (@items) {
3099	last unless --$count;	3110	last unless --$count;
3100		3111
3101	push @widgets, $item->{label} \|\|= do {	3112	my $label = $item->{label} \|\|= do {
3102	# TODO: doesn't handle markup well (read as: at all)	3113	# TODO: doesn't handle markup well (read as: at all)
3103	my $short = $item->{count} > 1	3114	my $short = $item->{count} > 1
3104	? "<b>$item->{count} ×</b> $item->{text}"	3115	? "<b>$item->{count} ×</b> $item->{text}"
3105	: $item->{text};	3116	: $item->{text};
3106		3117
…		…
3114	tooltip => $item->{tooltip},	3125	tooltip => $item->{tooltip},
3115	tooltip_font => $::FONT_PROP,	3126	tooltip_font => $::FONT_PROP,
3116	tooltip_width => 0.67,	3127	tooltip_width => 0.67,
3117	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3128	fontsize => $item->{fontsize} \|\| $self->{fontsize},
3118	max_w => $::WIDTH * 0.44,	3129	max_w => $::WIDTH * 0.44,
3119	fg => $item->{fg},	3130	fg => [@{ $item->{fg} }],
3120	can_events => 1,	3131	can_events => 1,
3121	can_hover => 1	3132	can_hover => 1
3122	};	3133	};
		3134
		3135	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3136	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3137	$label->update;
		3138	$label->set_max_size (undef, $label->{req_h} * $diff)
		3139	if $diff < 1;
		3140	$self->{timer}->interval (1/30);
		3141	} else {
		3142	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3143	}
		3144
		3145	push @widgets, $label;
3123	}	3146	}
3124		3147
3125	$self->clear;	3148	$self->clear;
3126	$self->SUPER::add (reverse @widgets);	3149	$self->SUPER::add (reverse @widgets);
3127	}	3150	}
…		…
3132	$text =~ s/^\s+//;	3155	$text =~ s/^\s+//;
3133	$text =~ s/\s+$//;	3156	$text =~ s/\s+$//;
3134		3157
3135	return unless $text;	3158	return unless $text;
3136		3159
3137	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3160	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
3138		3161
3139	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3162	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140		3163
3141	if (my $item = $self->{item}{$group}) {	3164	if (my $item = $self->{item}{$group}) {
3142	if ($item->{text} eq $text) {	3165	if ($item->{text} eq $text) {
…		…
3172		3195
3173	$self->reorder;	3196	$self->reorder;
3174	$self->SUPER::reconfigure;	3197	$self->SUPER::reconfigure;
3175	}	3198	}
3176		3199
		3200	sub DESTROY {
		3201	my ($self) = @_;
		3202
		3203	$self->{timer}->cancel;
		3204
		3205	$self->SUPER::DESTROY;
		3206	}
		3207
3177	#############################################################################	3208	#############################################################################
3178		3209
3179	package CFClient::UI::Inventory;	3210	package CFClient::UI::Inventory;
3180		3211
3181	our @ISA = CFClient::UI::ScrolledWindow::;	3212	our @ISA = CFClient::UI::ScrolledWindow::;
…		…
3473		3504
3474	package CFClient::UI::Root;	3505	package CFClient::UI::Root;
3475		3506
3476	our @ISA = CFClient::UI::Container::;	3507	our @ISA = CFClient::UI::Container::;
3477		3508
		3509	use List::Util qw(min max);
		3510
3478	use CFClient::OpenGL;	3511	use CFClient::OpenGL;
3479		3512
3480	sub new {	3513	sub new {
3481	my $class = shift;	3514	my $class = shift;
3482		3515
…		…
3616		3649
3617	delete $queue{$widget+0};	3650	delete $queue{$widget+0};
3618		3651
3619	my ($w, $h) = $widget->size_request;	3652	my ($w, $h) = $widget->size_request;
3620		3653
3621	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3654	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3655	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3656
		3657	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3658	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623		3659
3624	$w = $widget->{force_w} if exists $widget->{force_w};	3660	$w = $widget->{force_w} if exists $widget->{force_w};
3625	$h = $widget->{force_h} if exists $widget->{force_h};	3661	$h = $widget->{force_h} if exists $widget->{force_h};
3626		3662
3627	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3663	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.276 by root, Sun Jun 4 00:16:01 2006 UTC vs. Revision 1.281 by root, Mon Jun 5 01:59:59 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.281 by root, Mon Jun 5 01:59:59 2006 UTC