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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC

…		…
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	delete $self->{max_w}; $self->{max_w} = $w if $w;
387	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	delete $self->{max_h}; $self->{max_h} = $h if $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;
…		…
1636	};	1637	};
1637		1638
1638	glEnable GL_TEXTURE_2D;	1639	glEnable GL_TEXTURE_2D;
1639	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1640		1641
		1642	glColor_premultiply @{$self->{fg}}
1641	if ($tex->{format} == GL_ALPHA) {	1643	if $tex->{format} == GL_ALPHA;
1642	glColor @{$self->{fg}};	1644
1643	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1644	} else {
1645	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1645	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1646	}
1647		1646
1648	glDisable GL_TEXTURE_2D;	1647	glDisable GL_TEXTURE_2D;
1649	}	1648	}
1650		1649
1651	#############################################################################	1650	#############################################################################
…		…
1784	my ($self) = @_;	1783	my ($self) = @_;
1785		1784
1786	local $self->{fg} = $self->{fg};	1785	local $self->{fg} = $self->{fg};
1787		1786
1788	if ($FOCUS == $self) {	1787	if ($FOCUS == $self) {
1789	glColor @{$self->{active_bg}};	1788	glColor_premultiply @{$self->{active_bg}};
1790	$self->{fg} = $self->{active_fg};	1789	$self->{fg} = $self->{active_fg};
1791	} else {	1790	} else {
1792	glColor @{$self->{bg}};	1791	glColor_premultiply @{$self->{bg}};
1793	}	1792	}
1794		1793
1795	glEnable GL_BLEND;	1794	glEnable GL_BLEND;
1796	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1795	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1797	glBegin GL_QUADS;	1796	glBegin GL_QUADS;
1798	glVertex 0 , 0;	1797	glVertex 0 , 0;
1799	glVertex 0 , $self->{h};	1798	glVertex 0 , $self->{h};
1800	glVertex $self->{w}, $self->{h};	1799	glVertex $self->{w}, $self->{h};
1801	glVertex $self->{w}, 0;	1800	glVertex $self->{w}, 0;
…		…
1911	}	1910	}
1912		1911
1913	sub _draw {	1912	sub _draw {
1914	my ($self) = @_;	1913	my ($self) = @_;
1915		1914
1916	local $self->{fg} = $self->{fg};	1915	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1917
1918	if ($GRAB == $self) {
1919	$self->{fg} = $self->{active_fg};
1920	}
1921		1916
1922	glEnable GL_TEXTURE_2D;	1917	glEnable GL_TEXTURE_2D;
1923	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1924	glColor 0, 0, 0, 1;	1919	glColor 0, 0, 0, 1;
1925		1920
…		…
2150		2145
2151	my $h1 = $self->{h} * (1 - $ycut1);	2146	my $h1 = $self->{h} * (1 - $ycut1);
2152	my $h2 = $self->{h} * (1 - $ycut2);	2147	my $h2 = $self->{h} * (1 - $ycut2);
2153		2148
2154	glEnable GL_BLEND;	2149	glEnable GL_BLEND;
2155	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;
2156	glEnable GL_TEXTURE_2D;	2152	glEnable GL_TEXTURE_2D;
2157	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2153	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158		2154
2159	glBindTexture GL_TEXTURE_2D, $t1->{name};	2155	glBindTexture GL_TEXTURE_2D, $t1->{name};
2160	glBegin GL_QUADS;	2156	glBegin GL_QUADS;
…		…
2572		2568
2573	delete $self->{texture};	2569	delete $self->{texture};
2574	}	2570	}
2575		2571
2576	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2572	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2577	glClearColor 0.5, 0.5, 0.5, 0;	2573	glClearColor 0, 0, 0, 0;
2578	glClear GL_COLOR_BUFFER_BIT;	2574	glClear GL_COLOR_BUFFER_BIT;
2579		2575
2580	my $top = int $self->{children}[1]{range}[0];	2576	my $top = int $self->{children}[1]{range}[0];
2581		2577
2582	my $y0 = $top;	2578	my $y0 = $top;
…		…
2617	sub _draw {	2613	sub _draw {
2618	my ($self) = @_;	2614	my ($self) = @_;
2619		2615
2620	glEnable GL_TEXTURE_2D;	2616	glEnable GL_TEXTURE_2D;
2621	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2617	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2622	glColor 1, 1, 1, 1;	2618	glColor 0, 0, 0, 1;
2623	$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});
2624	glDisable GL_TEXTURE_2D;	2620	glDisable GL_TEXTURE_2D;
2625		2621
2626	$self->{children}[1]->draw;	2622	$self->{children}[1]->draw;
2627		2623
2628	}	2624	}
…		…
2855	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2851	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2856		2852
2857	if ($tex) {	2853	if ($tex) {
2858	glEnable GL_TEXTURE_2D;	2854	glEnable GL_TEXTURE_2D;
2859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2855	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2860	glColor 1, 1, 1, 1;	2856	glColor 0, 0, 0, 1;
2861	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2857	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2862	glDisable GL_TEXTURE_2D;	2858	glDisable GL_TEXTURE_2D;
2863	}	2859	}
2864	}	2860	}
2865		2861
…		…
3073	our @ISA = CFClient::UI::VBox::;	3069	our @ISA = CFClient::UI::VBox::;
3074		3070
3075	sub new {	3071	sub new {
3076	my $class = shift;	3072	my $class = shift;
3077		3073
3078	$class->SUPER::new (	3074	my $self = $class->SUPER::new (
3079	fontsize => 0.8,	3075	fontsize => 0.8,
3080	@_,	3076	@_,
3081	)	3077	);
		3078
		3079	Scalar::Util::weaken (my $this = $self);
		3080
		3081	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
		3082	$this->reorder;
		3083	$this->update;
		3084	});
		3085
		3086	$self
3082	}	3087	}
3083		3088
3084	sub reorder {	3089	sub reorder {
3085	my ($self) = @_;	3090	my ($self) = @_;
3086	my $NOW = time;	3091	my $NOW = Time::HiRes::time;
3087		3092
3088	while (my ($k, $v) = each %{ $self->{item} }) {	3093	while (my ($k, $v) = each %{ $self->{item} }) {
3089	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3094	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3090	}	3095	}
3091		3096
…		…
3093		3098
3094	my @items = sort {	3099	my @items = sort {
3095	$a->{pri} <=> $b->{pri}	3100	$a->{pri} <=> $b->{pri}
3096	or $b->{id} <=> $a->{id}	3101	or $b->{id} <=> $a->{id}
3097	} values %{ $self->{item} };	3102	} values %{ $self->{item} };
		3103
		3104	$self->{timer}->interval (1);
3098		3105
3099	my $count = 10 + 1;	3106	my $count = 10 + 1;
3100	for my $item (@items) {	3107	for my $item (@items) {
3101	last unless --$count;	3108	last unless --$count;
3102		3109
…		…
3117	tooltip_font => $::FONT_PROP,	3124	tooltip_font => $::FONT_PROP,
3118	tooltip_width => 0.67,	3125	tooltip_width => 0.67,
3119	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3126	fontsize => $item->{fontsize} \|\| $self->{fontsize},
3120	max_w => $::WIDTH * 0.44,	3127	max_w => $::WIDTH * 0.44,
3121	fg => $item->{fg},	3128	fg => $item->{fg},
		3129	orig_alpha => $item->{fg}[3] \|\| 1,
3122	can_events => 1,	3130	can_events => 1,
3123	can_hover => 1	3131	can_hover => 1
3124	};	3132	};
		3133
		3134	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3135	$item->{label}{fg}[3] = $item->{label}{orig_alpha} * $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;
		3141	$self->{timer}->interval (1/30);
		3142	}
3125	}	3143	}
3126		3144
3127	$self->clear;	3145	$self->clear;
3128	$self->SUPER::add (reverse @widgets);	3146	$self->SUPER::add (reverse @widgets);
3129	}	3147	}
…		…
3134	$text =~ s/^\s+//;	3152	$text =~ s/^\s+//;
3135	$text =~ s/\s+$//;	3153	$text =~ s/\s+$//;
3136		3154
3137	return unless $text;	3155	return unless $text;
3138		3156
3139	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3157	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
3140		3158
3141	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3159	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3142		3160
3143	if (my $item = $self->{item}{$group}) {	3161	if (my $item = $self->{item}{$group}) {
3144	if ($item->{text} eq $text) {	3162	if ($item->{text} eq $text) {
…		…
3174		3192
3175	$self->reorder;	3193	$self->reorder;
3176	$self->SUPER::reconfigure;	3194	$self->SUPER::reconfigure;
3177	}	3195	}
3178		3196
		3197	sub DESTROY {
		3198	my ($self) = @_;
		3199
		3200	$self->{timer}->cancel;
		3201
		3202	$self->SUPER::DESTROY;
		3203	}
		3204
3179	#############################################################################	3205	#############################################################################
3180		3206
3181	package CFClient::UI::Inventory;	3207	package CFClient::UI::Inventory;
3182		3208
3183	our @ISA = CFClient::UI::ScrolledWindow::;	3209	our @ISA = CFClient::UI::ScrolledWindow::;
…		…
3475		3501
3476	package CFClient::UI::Root;	3502	package CFClient::UI::Root;
3477		3503
3478	our @ISA = CFClient::UI::Container::;	3504	our @ISA = CFClient::UI::Container::;
3479		3505
		3506	use List::Util qw(min max);
		3507
3480	use CFClient::OpenGL;	3508	use CFClient::OpenGL;
3481		3509
3482	sub new {	3510	sub new {
3483	my $class = shift;	3511	my $class = shift;
3484		3512
…		…
3618		3646
3619	delete $queue{$widget+0};	3647	delete $queue{$widget+0};
3620		3648
3621	my ($w, $h) = $widget->size_request;	3649	my ($w, $h) = $widget->size_request;
3622		3650
3623	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3651	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3652	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3653
		3654	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3655	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3625		3656
3626	$w = $widget->{force_w} if exists $widget->{force_w};	3657	$w = $widget->{force_w} if exists $widget->{force_w};
3627	$h = $widget->{force_h} if exists $widget->{force_h};	3658	$h = $widget->{force_h} if exists $widget->{force_h};
3628		3659
3629	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3660	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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs. Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC