ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->realloc;
61	}	61	}
62		62
63	return;	63	return;
64	}	64	}
65	}	65	}
…		…
171	sub rescale_widgets {	171	sub rescale_widgets {
172	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
173		173
174	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
175	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
176	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
177	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
178	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
179	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
180	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
181	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
		185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
182	}	189	}
183	}	190	}
184		191
185	reconfigure_widgets;	192	reconfigure_widgets;
186	}	193	}
…		…
195		202
196	sub new {	203	sub new {
197	my $class = shift;	204	my $class = shift;
198		205
199	my $self = bless {	206	my $self = bless {
200	x => 0,	207	x => "center",
201	y => 0,	208	y => "center",
202	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
203	can_events => 1,	212	can_events => 1,
204	@_	213	@_
205	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
206		217
207	for (keys %$self) {	218	for (keys %$self) {
208	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
209	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
210	}	221	}
211	}	222	}
212		223
213	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
214
215	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
216	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
217	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
218	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
219	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
220	}	234	}
221		235
222	$self	236	$self
223	}	237	}
224		238
…		…
235	return if $self->{parent};	249	return if $self->{parent};
236		250
237	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
238	}	252	}
239		253
240	sub center {
241	my ($self) = @_;
242
243	$CFClient::UI::ROOT->on_post_alloc (
244	"center_$self" => sub {
245	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
246	},
247	);
248
249	$self->update;
250	}
251
252	sub set_visible {	254	sub set_visible {
253	my ($self) = @_;	255	my ($self) = @_;
254		256
255	return if $self->{visible};	257	return if $self->{visible};
256		258
257	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
258	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
259		261
260	$self->emit (visibility_change => 1);	262	$self->emit (visibility_change => 1);
261		263
262	$self->realloc unless exists $self->{req_w};	264	$self->realloc if !exists $self->{req_w};
263		265
264	$_->set_visible for $self->children;	266	$_->set_visible for $self->children;
265	}	267	}
266		268
267	sub set_invisible {	269	sub set_invisible {
…		…
309		311
310	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
311	if $self->{parent};	313	if $self->{parent};
312	}	314	}
313		315
314	sub move {	316	sub move_abs {
315	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
316		318
317	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
318	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
319	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
320		322
321	$self->update;	323	$self->update;
322	}	324	}
323		325
324	sub set_size {	326	sub set_size {
325	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
326		328
327	$self->{def_w} = $w;	329	$self->{force_w} = $w;
328	$self->{def_h} = $h;	330	$self->{force_h} = $h;
329		331
330	$self->realloc;	332	$self->realloc;
331	}	333	}
332		334
333	sub size_request {	335	sub size_request {
…		…
337		339
338	sub configure {	340	sub configure {
339	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
340		342
341	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
342	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
343	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
344		348
345	# use alignment to adjust x, y	349	# use alignment to adjust x, y
346		350
347	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
348	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
349
350	($w, $h) = ($w2, $h2);
351	}	353	}
352		354
353	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
354	$self->{x} = $x;	356	$self->{x} = $x;
355	$self->{y} = $y;	357	$self->{y} = $y;
356	$self->update;	358	$self->update;
357	}	359	}
358		360
359	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
360	return unless $self->{visible};	362	return unless $self->{visible};
361		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
362	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
363	}	368	}
364	}	369	}
365		370
366	sub size_allocate {	371	sub size_allocate {
367	# nothing to be done	372	# nothing to be done
368	}	373	}
369		374
370	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
371	}	381	}
372		382
373	sub set_max_size {	383	sub set_max_size {
374	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
375		385
376	delete $self->{max_w}; $self->{max_w} = $w if $w;	386	delete $self->{max_w}; $self->{max_w} = $w if $w;
377	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;
378	}	390	}
379		391
380	sub set_tooltip {	392	sub set_tooltip {
381	my ($self, $tooltip) = @_;	393	my ($self, $tooltip) = @_;
382		394
…		…
434		446
435	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	447	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
436	unless $FOCUS;	448	unless $FOCUS;
437	}	449	}
438		450
439	sub mouse_motion { }	451	sub mouse_motion { 0 }
440	sub button_up { }	452	sub button_up { 0 }
441	sub key_down { }	453	sub key_down { 0 }
442	sub key_up { }	454	sub key_up { 0 }
443		455
444	sub button_down {	456	sub button_down {
445	my ($self, $ev, $x, $y) = @_;	457	my ($self, $ev, $x, $y) = @_;
446		458
447	$self->focus_in;	459	$self->focus_in;
448	}
449		460
450	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	461	0
451	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	462	}
452	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
453	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
454	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455		463
456	sub find_widget {	464	sub find_widget {
457	my ($self, $x, $y) = @_;	465	my ($self, $x, $y) = @_;
458		466
459	return () unless $self->{can_events};	467	return () unless $self->{can_events};
…		…
467		475
468	sub set_parent {	476	sub set_parent {
469	my ($self, $parent) = @_;	477	my ($self, $parent) = @_;
470		478
471	Scalar::Util::weaken ($self->{parent} = $parent);	479	Scalar::Util::weaken ($self->{parent} = $parent);
472
473	$self->set_visible if $parent->{visible};	480	$self->set_visible if $parent->{visible};
474
475	$self->realloc;
476	}	481	}
477		482
478	sub connect {	483	sub connect {
479	my ($self, $signal, $cb) = @_;	484	my ($self, $signal, $cb) = @_;
480		485
…		…
499	}	504	}
500		505
501	sub realloc {	506	sub realloc {
502	my ($self) = @_;	507	my ($self) = @_;
503		508
504	return unless $self->{visible};	509	if ($self->{visible}) {
505
506	return if $self->{root}{realloc}{$self};	510	return if $self->{root}{realloc}{$self+0};
507		511
508	$self->{root}{realloc}{$self} = $self;	512	$self->{root}{realloc}{$self+0} = $self;
509	$self->{root}->update;	513	$self->{root}->update;
		514	} else {
		515	delete $self->{req_w};
		516	delete $self->{req_h};
		517	}
510	}	518	}
511		519
512	sub update {	520	sub update {
513	my ($self) = @_;	521	my ($self) = @_;
514		522
515	$self->{parent}->update	523	$self->{parent}->update
516	if $self->{parent};	524	if $self->{parent};
517	}	525	}
518		526
		527	sub reconfigure {
		528	my ($self) = @_;
		529
		530	$self->realloc;
		531	$self->update;
		532	}
		533
		534	# using global variables seems a bit hacky, but passing through all drawing
		535	# functions seems pointless.
		536	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		537
519	sub draw {	538	sub draw {
520	my ($self) = @_;	539	my ($self) = @_;
521		540
522	return unless $self->{h} && $self->{w};	541	return unless $self->{h} && $self->{w};
		542
		543	# update screen rectangle
		544	local $draw_x = $draw_x + $self->{x};
		545	local $draw_y = $draw_y + $self->{y};
		546	local $draw_w = $draw_x + $self->{w};
		547	local $draw_h = $draw_y + $self->{h};
		548
		549	# skip widgets that are entirely outside the drawing area
		550	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		551	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
523		552
524	glPushMatrix;	553	glPushMatrix;
525	glTranslate $self->{x}, $self->{y}, 0;	554	glTranslate $self->{x}, $self->{y}, 0;
526	$self->_draw;
527	glPopMatrix;
528		555
529	if ($self == $HOVER && $self->{can_hover}) {	556	if ($self == $HOVER && $self->{can_hover}) {
530	my ($x, $y) = @$self{qw(x y)};
531
532	glColor 1, 0.8, 0.5, 0.2;	557	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
533	glEnable GL_BLEND;	558	glEnable GL_BLEND;
534	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	559	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535	glBegin GL_QUADS;	560	glBegin GL_QUADS;
536	glVertex $x , $y;	561	glVertex 0 , 0;
537	glVertex $x + $self->{w}, $y;	562	glVertex $self->{w}, 0;
538	glVertex $x + $self->{w}, $y + $self->{h};	563	glVertex $self->{w}, $self->{h};
539	glVertex $x , $y + $self->{h};	564	glVertex 0 , $self->{h};
540	glEnd;	565	glEnd;
541	glDisable GL_BLEND;	566	glDisable GL_BLEND;
542	}	567	}
543		568
544	if ($ENV{PCLIENT_DEBUG}) {	569	if ($ENV{CFPLUS_DEBUG} & 1) {
545	glPushMatrix;	570	glPushMatrix;
546	glColor 1, 1, 0, 1;	571	glColor 1, 1, 0, 1;
547	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	572	glTranslate 0.375, 0.375;
548	glBegin GL_LINE_LOOP;	573	glBegin GL_LINE_LOOP;
549	glVertex 0 , 0;	574	glVertex 0 , 0;
550	glVertex $self->{w} - 1, 0;	575	glVertex $self->{w} - 1, 0;
551	glVertex $self->{w} - 1, $self->{h} - 1;	576	glVertex $self->{w} - 1, $self->{h} - 1;
552	glVertex 0 , $self->{h} - 1;	577	glVertex 0 , $self->{h} - 1;
553	glEnd;	578	glEnd;
554	glPopMatrix;	579	glPopMatrix;
555	#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;
556	}	581	}
		582
		583	$self->_draw;
		584	glPopMatrix;
557	}	585	}
558		586
559	sub _draw {	587	sub _draw {
560	my ($self) = @_;	588	my ($self) = @_;
561		589
…		…
599		627
600	if ($color && (@$color < 4 || $color->[3])) {	628	if ($color && (@$color < 4 || $color->[3])) {
601	my ($w, $h) = @$self{qw(w h)};	629	my ($w, $h) = @$self{qw(w h)};
602		630
603	glEnable GL_BLEND;	631	glEnable GL_BLEND;
604	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	632	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605	glColor @$color;	633	glColor_premultiply @$color;
606		634
607	glBegin GL_QUADS;	635	glBegin GL_QUADS;
608	glVertex 0 , 0;	636	glVertex 0 , 0;
609	glVertex 0 , $h;	637	glVertex 0 , $h;
610	glVertex $w, $h;	638	glVertex $w, $h;
…		…
625	my ($class, %arg) = @_;	653	my ($class, %arg) = @_;
626	$class->SUPER::new (can_events => 0, %arg);	654	$class->SUPER::new (can_events => 0, %arg);
627	}	655	}
628		656
629	sub size_request {	657	sub size_request {
630	(0, 0)	658	my ($self) = @_;
		659
		660	($self->{w} + 0, $self->{h} + 0)
631	}	661	}
632		662
633	sub draw { }	663	sub draw { }
634		664
635	#############################################################################	665	#############################################################################
…		…
639	our @ISA = CFClient::UI::Base::;	669	our @ISA = CFClient::UI::Base::;
640		670
641	sub new {	671	sub new {
642	my ($class, %arg) = @_;	672	my ($class, %arg) = @_;
643		673
644	my $children = delete $arg{children} || [];	674	my $children = delete $arg{children};
645		675
646	my $self = $class->SUPER::new (	676	my $self = $class->SUPER::new (
647	children => [],	677	children => [],
648	can_events => 0,	678	can_events => 0,
649	%arg,	679	%arg,
650	);	680	);
		681
651	$self->add ($_) for @$children;	682	$self->add (@$children)
		683	if $children;
652		684
653	$self	685	$self
654	}	686	}
655		687
656	sub add {	688	sub add {
…		…
704	$x -= $self->{x};	736	$x -= $self->{x};
705	$y -= $self->{y};	737	$y -= $self->{y};
706		738
707	my $res;	739	my $res;
708		740
709	for (reverse @{ $self->{children} }) {	741	for (reverse $self->visible_children) {
710	$res = $_->find_widget ($x, $y)	742	$res = $_->find_widget ($x, $y)
711	and return $res;	743	and return $res;
712	}	744	}
713		745
714	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	746	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
756	sub size_request {	788	sub size_request {
757	$_[0]{children}[0]->size_request	789	$_[0]{children}[0]->size_request
758	}	790	}
759		791
760	sub size_allocate {	792	sub size_allocate {
761	my ($self, $w, $h, $changed) = @_;	793	my ($self, $w, $h) = @_;
762		794
763	$self->{children}[0]->configure (0, 0, $w, $h);	795	$self->{children}[0]->configure (0, 0, $w, $h);
764	}	796	}
765		797
766	#############################################################################	798	#############################################################################
		799
		800	# back-buffered drawing area
767		801
768	package CFClient::UI::Window;	802	package CFClient::UI::Window;
769		803
770	our @ISA = CFClient::UI::Bin::;	804	our @ISA = CFClient::UI::Bin::;
771		805
…		…
783	$ROOT->on_post_alloc ($self => sub { $self->render_child });	817	$ROOT->on_post_alloc ($self => sub { $self->render_child });
784	$self->SUPER::update;	818	$self->SUPER::update;
785	}	819	}
786		820
787	sub size_allocate {	821	sub size_allocate {
788	my ($self, $w, $h, $changed) = @_;	822	my ($self, $w, $h) = @_;
789		823
790	$self->SUPER::size_allocate ($w, $h, $changed);	824	$self->SUPER::size_allocate ($w, $h);
791	$self->update	825	$self->update;
792	if $changed;
793	}	826	}
794		827
795	sub _render {	828	sub _render {
		829	my ($self) = @_;
		830
796	$_[0]{children}[0]->draw;	831	$self->{children}[0]->draw;
797	}	832	}
798		833
799	sub render_child {	834	sub render_child {
800	my ($self) = @_;	835	my ($self) = @_;
801		836
802	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803	glClearColor 0, 0, 0, 0;	838	glClearColor 0, 0, 0, 0;
804	glClear GL_COLOR_BUFFER_BIT;	839	glClear GL_COLOR_BUFFER_BIT;
805		840
		841	{
		842	package CFClient::UI::Base;
		843
		844	($draw_x, $draw_y, $draw_w, $draw_h) =
		845	(0, 0, $self->{w}, $self->{h});
		846	}
		847
806	$self->_render;	848	$self->_render;
807	};	849	};
808	}	850	}
809		851
810	sub _draw {	852	sub _draw {
811	my ($self) = @_;	853	my ($self) = @_;
812		854
813	my ($w, $h) = ($self->w, $self->h);	855	my ($w, $h) = @$self{qw(w h)};
814		856
815	my $tex = $self->{texture}	857	my $tex = $self->{texture}
816	or return;	858	or return;
817		859
818	glEnable GL_TEXTURE_2D;	860	glEnable GL_TEXTURE_2D;
819	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
821		863
822	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823		865
824	glDisable GL_TEXTURE_2D;	866	glDisable GL_TEXTURE_2D;
825	}	867	}
…		…
841	}	883	}
842		884
843	sub size_request {	885	sub size_request {
844	my ($self) = @_;	886	my ($self) = @_;
845		887
846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847		889
848	$w = 10 if $self->{scroll_x};	890	$w = 10 if $self->{scroll_x};
849	$h = 10 if $self->{scroll_y};	891	$h = 10 if $self->{scroll_y};
850		892
851	($w, $h)	893	($w, $h)
852	}	894	}
853		895
854	sub size_allocate {	896	sub size_allocate {
855	my ($self, $w, $h, $changed) = @_;	897	my ($self, $w, $h) = @_;
856		898
		899	my $child = $self->child;
		900
857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	901	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	902	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859		903
860	$self->child->configure (0, 0, $w, $h);	904	$self->child->configure (0, 0, $w, $h);
861	$self->update;	905	$self->update;
862	}	906	}
863		907
…		…
899	}	943	}
900		944
901	sub _render {	945	sub _render {
902	my ($self) = @_;	946	my ($self) = @_;
903		947
		948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		950
904	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905		952
906	$self->SUPER::_render;	953	$self->SUPER::_render;
907	}	954	}
908		955
…		…
911	package CFClient::UI::ScrolledWindow;	958	package CFClient::UI::ScrolledWindow;
912		959
913	our @ISA = CFClient::UI::HBox::;	960	our @ISA = CFClient::UI::HBox::;
914		961
915	sub new {	962	sub new {
916	my $class = shift;	963	my ($class, %arg) = @_;
		964
		965	my $child = delete $arg{child};
917		966
918	my $self;	967	my $self;
919		968
920	my $slider = new CFClient::UI::Slider	969	my $slider = new CFClient::UI::Slider
921	vertical => 1,	970	vertical => 1,
…		…
926	;	975	;
927		976
928	$self = $class->SUPER::new (	977	$self = $class->SUPER::new (
929	vp => (new CFClient::UI::ViewPort expand => 1),	978	vp => (new CFClient::UI::ViewPort expand => 1),
930	slider => $slider,	979	slider => $slider,
931	@_,	980	%arg,
932	);	981	);
933		982
934	$self->{vp}->add ($self->{scrolled});
935	$self->add ($self->{vp});
936	$self->add ($self->{slider});	983	$self->SUPER::add ($self->{vp}, $self->{slider});
		984	$self->add ($child) if $child;
937		985
938	$self	986	$self
		987	}
		988
		989	sub add {
		990	my ($self, $widget) = @_;
		991
		992	$self->{vp}->add ($self->{child} = $widget);
939	}	993	}
940		994
941	sub update {	995	sub update {
942	my ($self) = @_;	996	my ($self) = @_;
943		997
…		…
947	my $child = $self->{vp}->child;	1001	my $child = $self->{vp}->child;
948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949	}	1003	}
950		1004
951	sub size_allocate {	1005	sub size_allocate {
952	my ($self, $w, $h, $changed) = @_;	1006	my ($self, $w, $h) = @_;
953		1007
954	$self->SUPER::size_allocate ($w, $h, $changed);	1008	$self->SUPER::size_allocate ($w, $h);
955		1009
956	my $child = $self->{vp}->child;	1010	my $child = $self->{vp}->child;
957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958	}	1012	}
959		1013
…		…
982		1036
983	if ($self->{bg}) {	1037	if ($self->{bg}) {
984	my ($w, $h) = @$self{qw(w h)};	1038	my ($w, $h) = @$self{qw(w h)};
985		1039
986	glEnable GL_BLEND;	1040	glEnable GL_BLEND;
987	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1041	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988	glColor @{ $self->{bg} };	1042	glColor_premultiply @{ $self->{bg} };
989		1043
990	glBegin GL_QUADS;	1044	glBegin GL_QUADS;
991	glVertex 0 , 0;	1045	glVertex 0 , 0;
992	glVertex 0 , $h;	1046	glVertex 0 , $h;
993	glVertex $w, $h;	1047	glVertex $w, $h;
…		…
1006		1060
1007	our @ISA = CFClient::UI::Bin::;	1061	our @ISA = CFClient::UI::Bin::;
1008		1062
1009	use CFClient::OpenGL;	1063	use CFClient::OpenGL;
1010		1064
1011	my @tex =	1065	my $bg =
		1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1067	mipmap => 1, wrap => 1;
		1068
		1069	my @border =
1012	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014		1072
1015	sub new {	1073	sub new {
1016	my $class = shift;	1074	my ($class, %arg) = @_;
		1075
		1076	my $title = delete $arg{title};
1017		1077
1018	my $self = $class->SUPER::new (	1078	my $self = $class->SUPER::new (
1019	bg => [1, 1, 1, 1],	1079	bg => [1, 1, 1, 1],
1020	border_bg => [1, 1, 1, 1],	1080	border_bg => [1, 1, 1, 1],
1021	border => 0.6,	1081	border => 0.6,
1022	is_toplevel => 1,
1023	can_events => 1,	1082	can_events => 1,
1024	@_	1083	min_w => 16,
		1084	min_h => 16,
		1085	%arg,
1025	);	1086	);
1026		1087
1027	$self->{title} &&= new CFClient::UI::Label	1088	$self->{title} = new CFClient::UI::Label
1028	align => 0,	1089	align => 0,
1029	valign => 1,	1090	valign => 1,
1030	text => $self->{title},	1091	text => $title,
1031	fontsize => $self->{border};	1092	fontsize => $self->{border}
		1093	if defined $title;
1032		1094
1033	$self	1095	$self
		1096	}
		1097
		1098	sub add {
		1099	my ($self, @widgets) = @_;
		1100
		1101	$self->SUPER::add (@widgets);
		1102	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1034	}	1103	}
1035		1104
1036	sub border {	1105	sub border {
1037	int $_[0]{border} * $::FONTSIZE	1106	int $_[0]{border} * $::FONTSIZE
1038	}	1107	}
1039		1108
1040	sub size_request {	1109	sub size_request {
1041	my ($self) = @_;	1110	my ($self) = @_;
		1111
		1112	$self->{title}->size_request
		1113	if $self->{title};
1042		1114
1043	my ($w, $h) = $self->SUPER::size_request;	1115	my ($w, $h) = $self->SUPER::size_request;
1044		1116
1045	(	1117	(
1046	$w + $self->border * 2,	1118	$w + $self->border * 2,
1047	$h + $self->border * 2,	1119	$h + $self->border * 2,
1048	)	1120	)
1049	}	1121	}
1050		1122
1051	sub size_allocate {	1123	sub size_allocate {
1052	my ($self, $w, $h, $changed) = @_;	1124	my ($self, $w, $h) = @_;
1053		1125
1054	return unless $changed;	1126	if ($self->{title}) {
		1127	$self->{title}{w} = $w;
		1128	$self->{title}{h} = $h;
		1129	$self->{title}->size_allocate ($w, $h);
		1130	}
1055		1131
		1132	my $border = $self->border;
		1133
1056	$h -= List::Util::max 0, $self->border * 2;	1134	$h -= List::Util::max 0, $border * 2;
1057	$w -= List::Util::max 0, $self->border * 2;	1135	$w -= List::Util::max 0, $border * 2;
1058		1136
1059	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1060	if $self->{title};
1061
1062	$self->child->configure ($self->border, $self->border, $w, $h);	1137	$self->child->configure ($border, $border, $w, $h);
1063	}	1138	}
1064		1139
1065	sub button_down {	1140	sub button_down {
1066	my ($self, $ev, $x, $y) = @_;	1141	my ($self, $ev, $x, $y) = @_;
1067		1142
…		…
1083	my ($ev, $x, $y) = @_;	1158	my ($ev, $x, $y) = @_;
1084		1159
1085	my $dx = $ev->{x} - $ox;	1160	my $dx = $ev->{x} - $ox;
1086	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
1087		1162
1088	$self->{user_x} = $wx + $dx * $mx;
1089	$self->{user_y} = $wy + $dy * $my;
1090	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092	$self->move ($self->{user_x}, $self->{user_y});	1165
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093	$self->realloc;	1167	$self->realloc;
1094	};	1168	};
1095		1169
1096	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
1097	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
1100	$self->{motion} = sub {	1174	$self->{motion} = sub {
1101	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
1102		1176
1103	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
1104		1178
1105	$self->{user_x} = $bx + $x - $ox;	1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106	$self->{user_y} = $by + $y - $oy;	1180	# HACK: the next line is required to enforce placement
1107		1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108	$self->move ($self->{user_x}, $self->{user_y});
1109	$self->realloc;
1110	};	1182	};
		1183	} else {
		1184	return 0;
		1185	}
		1186
1111	}	1187	1
1112	}	1188	}
1113		1189
1114	sub button_up {	1190	sub button_up {
1115	my ($self, $ev, $x, $y) = @_;	1191	my ($self, $ev, $x, $y) = @_;
1116		1192
1117	delete $self->{motion};	1193	!!delete $self->{motion}
1118	}	1194	}
1119		1195
1120	sub mouse_motion {	1196	sub mouse_motion {
1121	my ($self, $ev, $x, $y) = @_;	1197	my ($self, $ev, $x, $y) = @_;
1122		1198
1123	$self->{motion}->($ev, $x, $y) if $self->{motion};	1199	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1200
		1201	!!$self->{motion}
1124	}	1202	}
1125		1203
1126	sub _draw {	1204	sub _draw {
1127	my ($self) = @_;	1205	my ($self) = @_;
1128		1206
		1207	my $child = $self->{children}[0];
		1208
1129	my ($w, $h ) = ($self->{w}, $self->{h});	1209	my ($w, $h ) = ($self->{w}, $self->{h});
1130	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1210	my ($cw, $ch) = ($child->{w}, $child->{h});
1131		1211
1132	glEnable GL_TEXTURE_2D;	1212	glEnable GL_TEXTURE_2D;
1133	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134		1214
1135	my $border = $self->border;	1215	my $border = $self->border;
1136		1216
1137	glColor @{ $self->{border_bg} };	1217	glColor @{ $self->{border_bg} };
1138	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1218	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1139	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1219	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1220	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1221	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142		1222
1143	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1223	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144	my $bg = $tex[0];	1224	glColor @{ $self->{bg} };
1145		1225
1146	# TODO: repeat texture not scale	1226	# TODO: repeat texture not scale
		1227	# solve this better(?)
1147	my $rep_x = $cw / $bg->{w};	1228	$bg->{s} = $cw / $bg->{w};
1148	my $rep_y = $ch / $bg->{h};	1229	$bg->{t} = $ch / $bg->{h};
1149
1150	glColor @{ $self->{bg} };
1151
1152	$bg->{s} = $rep_x;
1153	$bg->{t} = $rep_y;
1154	$bg->{wrap_mode} = 1;
1155	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1230	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156	}	1231	}
1157		1232
1158	glDisable GL_TEXTURE_2D;	1233	glDisable GL_TEXTURE_2D;
1159		1234
1160	$self->{title}->draw if $self->{title};
1161
1162	$self->child->draw;	1235	$child->draw;
		1236
		1237	if ($self->{title}) {
		1238	glTranslate 0, $border - $self->{h};
		1239	$self->{title}->_draw;
		1240	}
1163	}	1241	}
1164		1242
1165	#############################################################################	1243	#############################################################################
1166		1244
1167	package CFClient::UI::Table;	1245	package CFClient::UI::Table;
…		…
1241	(sum @$hs),	1319	(sum @$hs),
1242	)	1320	)
1243	}	1321	}
1244		1322
1245	sub size_allocate {	1323	sub size_allocate {
1246	my ($self, $w, $h, $changed) = @_;	1324	my ($self, $w, $h) = @_;
1247		1325
1248	my ($ws, $hs) = $self->get_wh;	1326	my ($ws, $hs) = $self->get_wh;
1249		1327
1250	my $req_w = (sum @$ws) || 1;	1328	my $req_w = (sum @$ws) || 1;
1251	my $req_h = (sum @$hs) || 1;	1329	my $req_h = (sum @$hs) || 1;
…		…
1329	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1407	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1330	)	1408	)
1331	}	1409	}
1332		1410
1333	sub size_allocate {	1411	sub size_allocate {
1334	my ($self, $w, $h, $changed) = @_;	1412	my ($self, $w, $h) = @_;
1335		1413
1336	my $space = $self->{vertical} ? $h : $w;	1414	my $space = $self->{vertical} ? $h : $w;
1337	my $children = $self->{children};	1415	my $children = $self->{children};
1338		1416
1339	my @req;	1417	my @req;
…		…
1422	ellipsise => 3, # end	1500	ellipsise => 3, # end
1423	layout => (new CFClient::Layout),	1501	layout => (new CFClient::Layout),
1424	fontsize => 1,	1502	fontsize => 1,
1425	align => -1,	1503	align => -1,
1426	valign => -1,	1504	valign => -1,
1427	padding => 2,	1505	padding_x => 2,
		1506	padding_y => 2,
1428	can_events => 0,	1507	can_events => 0,
1429	%arg	1508	%arg
1430	);	1509	);
1431		1510
1432	if (exists $self->{template}) {	1511	if (exists $self->{template}) {
…		…
1469		1548
1470	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1549	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471	$self->{layout}->set_text ($text);	1550	$self->{layout}->set_text ($text);
1472		1551
1473	$self->realloc;	1552	$self->realloc;
		1553	$self->update;
1474	}	1554	}
1475		1555
1476	sub set_markup {	1556	sub set_markup {
1477	my ($self, $markup) = @_;	1557	my ($self, $markup) = @_;
1478		1558
…		…
1483		1563
1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1564	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485	$self->{layout}->set_markup ($markup);	1565	$self->{layout}->set_markup ($markup);
1486		1566
1487	$self->realloc;	1567	$self->realloc;
		1568	$self->update;
1488	}	1569	}
1489		1570
1490	sub size_request {	1571	sub size_request {
1491	my ($self) = @_;	1572	my ($self) = @_;
1492		1573
…		…
1506		1587
1507	$w = List::Util::max $w, $w2;	1588	$w = List::Util::max $w, $w2;
1508	$h = List::Util::max $h, $h2;	1589	$h = List::Util::max $h, $h2;
1509	}	1590	}
1510		1591
1511	(	1592	($w, $h)
1512	$w + $self->{padding} * 2,
1513	$h + $self->{padding} * 2,
1514	)
1515	}	1593	}
1516		1594
1517	sub size_allocate {	1595	sub size_allocate {
1518	my ($self, $w, $h, $changed) = @_;	1596	my ($self, $w, $h) = @_;
		1597
		1598	delete $self->{ox};
1519		1599
1520	delete $self->{texture}	1600	delete $self->{texture}
1521	if $changed;	1601	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1602	}
1523		1603
1524	sub set_fontsize {	1604	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1605	my ($self, $fontsize) = @_;
1526		1606
…		…
1541	$self->{layout}->set_width ($self->{w});	1621	$self->{layout}->set_width ($self->{w});
1542	$self->{layout}->set_ellipsise ($self->{ellipsise});	1622	$self->{layout}->set_ellipsise ($self->{ellipsise});
1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1623	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1624	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545		1625
1546	my $tex = new_from_layout CFClient::Texture $self->{layout};	1626	new_from_layout CFClient::Texture $self->{layout}
		1627	};
1547		1628
		1629	unless (exists $self->{ox}) {
1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1630	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1631	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550	: ($self->{w} - $tex->{w}) * 0.5);	1632	: ($self->{w} - $tex->{w}) * 0.5);
1551		1633
1552	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1634	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1635	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554	: ($self->{h} - $tex->{h}) * 0.5);	1636	: ($self->{h} - $tex->{h}) * 0.5);
1555
1556	$tex
1557	};	1637	};
1558		1638
1559	glEnable GL_TEXTURE_2D;	1639	glEnable GL_TEXTURE_2D;
1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561		1641
		1642	glColor_premultiply @{$self->{fg}}
1562	if ($tex->{format} == GL_ALPHA) {	1643	if $tex->{format} == GL_ALPHA;
1563	glColor @{$self->{fg}};	1644
1564	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1565	} else {
1566	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1645	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1567	}
1568		1646
1569	glDisable GL_TEXTURE_2D;	1647	glDisable GL_TEXTURE_2D;
1570	}	1648	}
1571		1649
1572	#############################################################################	1650	#############################################################################
…		…
1599		1677
1600	delete $self->{cur_h};	1678	delete $self->{cur_h};
1601		1679
1602	return if $self->{text} eq $text;	1680	return if $self->{text} eq $text;
1603		1681
1604	delete $self->{texture};
1605
1606	$self->{last_activity} = $::NOW;	1682	$self->{last_activity} = $::NOW;
1607	$self->{text} = $text;	1683	$self->{text} = $text;
1608		1684
1609	$text =~ s/./*/g if $self->{hidden};	1685	$text =~ s/./*/g if $self->{hidden};
1610	$self->{layout}->set_text ("$text ");	1686	$self->{layout}->set_text ("$text ");
1611		1687
1612	$self->_emit (changed => $self->{text});	1688	$self->_emit (changed => $self->{text});
		1689	$self->update;
1613	}	1690	}
1614		1691
1615	sub set_text {	1692	sub set_text {
1616	my ($self, $text) = @_;	1693	my ($self, $text) = @_;
1617		1694
…		…
1656	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1657	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1658	$self->_emit ('escape');	1735	$self->_emit ('escape');
1659	} elsif ($uni) {	1736	} elsif ($uni) {
1660	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1661	}	1740	}
1662		1741
1663	$self->_set_text ($text);	1742	$self->_set_text ($text);
1664		1743
1665	$self->realloc;	1744	$self->realloc;
		1745
		1746	1
1666	}	1747	}
1667		1748
1668	sub focus_in {	1749	sub focus_in {
1669	my ($self) = @_;	1750	my ($self) = @_;
1670		1751
…		…
1685	utf8::encode $text;	1766	utf8::encode $text;
1686	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1687		1768
1688	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1689	$self->update;	1770	$self->update;
		1771
		1772	1
1690	}	1773	}
1691		1774
1692	sub mouse_motion {	1775	sub mouse_motion {
1693	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1694	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1777	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1778
		1779	0
1695	}	1780	}
1696		1781
1697	sub _draw {	1782	sub _draw {
1698	my ($self) = @_;	1783	my ($self) = @_;
1699		1784
1700	local $self->{fg} = $self->{fg};	1785	local $self->{fg} = $self->{fg};
1701		1786
1702	if ($FOCUS == $self) {	1787	if ($FOCUS == $self) {
1703	glColor @{$self->{active_bg}};	1788	glColor_premultiply @{$self->{active_bg}};
1704	$self->{fg} = $self->{active_fg};	1789	$self->{fg} = $self->{active_fg};
1705	} else {	1790	} else {
1706	glColor @{$self->{bg}};	1791	glColor_premultiply @{$self->{bg}};
1707	}	1792	}
1708		1793
1709	glEnable GL_BLEND;	1794	glEnable GL_BLEND;
1710	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1795	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711	glBegin GL_QUADS;	1796	glBegin GL_QUADS;
1712	glVertex 0 , 0;	1797	glVertex 0 , 0;
1713	glVertex 0 , $self->{h};	1798	glVertex 0 , $self->{h};
1714	glVertex $self->{w}, $self->{h};	1799	glVertex $self->{w}, $self->{h};
1715	glVertex $self->{w}, 0;	1800	glVertex $self->{w}, 0;
…		…
1776	} else {	1861	} else {
1777	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1778	}	1863	}
1779		1864
1780	} else {	1865	} else {
1781	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1782	}	1869	1
1783
1784	}	1870	}
1785		1871
1786	#############################################################################	1872	#############################################################################
1787		1873
1788	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1797		1883
1798	sub new {	1884	sub new {
1799	my $class = shift;	1885	my $class = shift;
1800		1886
1801	$class->SUPER::new (	1887	$class->SUPER::new (
1802	padding => 4,	1888	padding_x => 4,
		1889	padding_y => 4,
1803	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1804	active_fg => [0, 0, 1],	1891	active_fg => [0, 0, 1],
1805	can_hover => 1,	1892	can_hover => 1,
1806	align => 0,	1893	align => 0,
1807	valign => 0,	1894	valign => 0,
…		…
1816	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1817		1904
1818	$self->emit ("activate")	1905	$self->emit ("activate")
1819	if $x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1820	&& $y >= 0 && $y < $self->{h};	1907	&& $y >= 0 && $y < $self->{h};
		1908
		1909	1
1821	}	1910	}
1822		1911
1823	sub _draw {	1912	sub _draw {
1824	my ($self) = @_;	1913	my ($self) = @_;
1825		1914
1826	local $self->{fg} = $self->{fg};	1915	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828	if ($GRAB == $self) {
1829	$self->{fg} = $self->{active_fg};
1830	}
1831		1916
1832	glEnable GL_TEXTURE_2D;	1917	glEnable GL_TEXTURE_2D;
1833	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834	glColor 0, 0, 0, 1;	1919	glColor 0, 0, 0, 1;
1835		1920
…		…
1854		1939
1855	sub new {	1940	sub new {
1856	my $class = shift;	1941	my $class = shift;
1857		1942
1858	$class->SUPER::new (	1943	$class->SUPER::new (
1859	padding => 2,	1944	padding_x => 2,
		1945	padding_y => 2,
1860	fg => [1, 1, 1],	1946	fg => [1, 1, 1],
1861	active_fg => [1, 1, 0],	1947	active_fg => [1, 1, 0],
1862	bg => [0, 0, 0, 0.2],	1948	bg => [0, 0, 0, 0.2],
1863	active_bg => [1, 1, 1, 0.5],	1949	active_bg => [1, 1, 1, 0.5],
1864	state => 0,	1950	state => 0,
…		…
1868	}	1954	}
1869		1955
1870	sub size_request {	1956	sub size_request {
1871	my ($self) = @_;	1957	my ($self) = @_;
1872		1958
1873	($self->{padding} * 2 + 6) x 2	1959	(6) x 2
1874	}	1960	}
1875		1961
1876	sub button_down {	1962	sub button_down {
1877	my ($self, $ev, $x, $y) = @_;	1963	my ($self, $ev, $x, $y) = @_;
1878		1964
1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1965	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1966	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881	$self->{state} = !$self->{state};	1967	$self->{state} = !$self->{state};
1882	$self->_emit (changed => $self->{state});	1968	$self->_emit (changed => $self->{state});
		1969	} else {
		1970	return 0
		1971	}
		1972
1883	}	1973	1
1884	}	1974	}
1885		1975
1886	sub _draw {	1976	sub _draw {
1887	my ($self) = @_;	1977	my ($self) = @_;
1888		1978
1889	$self->SUPER::_draw;	1979	$self->SUPER::_draw;
1890		1980
1891	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1981	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892		1982
1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1983	my ($w, $h) = @$self{qw(w h)};
		1984
		1985	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894		1986
1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1987	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896		1988
1897	my $tex = $self->{state} ? $tex[1] : $tex[0];	1989	my $tex = $self->{state} ? $tex[1] : $tex[0];
1898		1990
…		…
2053		2145
2054	my $h1 = $self->{h} * (1 - $ycut1);	2146	my $h1 = $self->{h} * (1 - $ycut1);
2055	my $h2 = $self->{h} * (1 - $ycut2);	2147	my $h2 = $self->{h} * (1 - $ycut2);
2056		2148
2057	glEnable GL_BLEND;	2149	glEnable GL_BLEND;
2058	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;
2059	glEnable GL_TEXTURE_2D;	2152	glEnable GL_TEXTURE_2D;
2060	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2153	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061		2154
2062	glBindTexture GL_TEXTURE_2D, $t1->{name};	2155	glBindTexture GL_TEXTURE_2D, $t1->{name};
2063	glBegin GL_QUADS;	2156	glBegin GL_QUADS;
…		…
2163	fg => [1, 1, 1],	2256	fg => [1, 1, 1],
2164	active_fg => [0, 0, 0],	2257	active_fg => [0, 0, 0],
2165	bg => [0, 0, 0, 0.2],	2258	bg => [0, 0, 0, 0.2],
2166	active_bg => [1, 1, 1, 0.5],	2259	active_bg => [1, 1, 1, 0.5],
2167	range => [0, 0, 100, 10, 0],	2260	range => [0, 0, 100, 10, 0],
2168	req_w => $::WIDTH / 80,	2261	min_w => $::WIDTH / 80,
2169	req_h => $::WIDTH / 80,	2262	min_h => $::WIDTH / 80,
2170	vertical => 0,	2263	vertical => 0,
2171	can_hover => 1,	2264	can_hover => 1,
2172	inner_pad => 0.02,	2265	inner_pad => 0.02,
2173	@_	2266	@_
2174	);	2267	);
…		…
2214	}	2307	}
2215		2308
2216	sub size_request {	2309	sub size_request {
2217	my ($self) = @_;	2310	my ($self) = @_;
2218		2311
2219	my $w = $self->{req_w};	2312	($self->{req_w}, $self->{req_h})
2220	my $h = $self->{req_h};
2221
2222	$self->{vertical} ? ($h, $w) : ($w, $h)
2223	}	2313	}
2224		2314
2225	sub button_down {	2315	sub button_down {
2226	my ($self, $ev, $x, $y) = @_;	2316	my ($self, $ev, $x, $y) = @_;
2227		2317
2228	$self->SUPER::button_down ($ev, $x, $y);	2318	$self->SUPER::button_down ($ev, $x, $y);
2229		2319
2230	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2320	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231		2321
2232	$self->mouse_motion ($ev, $x, $y);	2322	$self->mouse_motion ($ev, $x, $y)
2233	}	2323	}
2234		2324
2235	sub mouse_motion {	2325	sub mouse_motion {
2236	my ($self, $ev, $x, $y) = @_;	2326	my ($self, $ev, $x, $y) = @_;
2237		2327
…		…
2241	my (undef, $lo, $hi, $page) = @{$self->{range}};	2331	my (undef, $lo, $hi, $page) = @{$self->{range}};
2242		2332
2243	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2333	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244		2334
2245	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2335	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2336	} else {
		2337	return 0;
		2338	}
		2339
2246	}	2340	1
2247	}	2341	}
2248		2342
2249	sub update {	2343	sub update {
2250	my ($self) = @_;	2344	my ($self) = @_;
2251		2345
2252	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2346	delete $self->{knob_w};
		2347	$self->SUPER::update;
		2348	}
		2349
		2350	sub _draw {
		2351	my ($self) = @_;
		2352
		2353	unless ($self->{knob_w}) {
2253	$self->set_value ($self->{range}[0]);	2354	$self->set_value ($self->{range}[0]);
2254		2355
2255	my ($value, $lo, $hi, $page) = @{$self->{range}};	2356	my ($value, $lo, $hi, $page) = @{$self->{range}};
2256	my $range = ($hi - $page - $lo) || 1e-100;	2357	my $range = ($hi - $page - $lo) || 1e-100;
2257		2358
…		…
2263	$value = ($value - $lo) / $range;	2364	$value = ($value - $lo) / $range;
2264	$value = $value * $self->{scale} + $self->{offset};	2365	$value = $value * $self->{scale} + $self->{offset};
2265		2366
2266	$self->{knob_x} = $value - $knob_w * 0.5;	2367	$self->{knob_x} = $value - $knob_w * 0.5;
2267	$self->{knob_w} = $knob_w;	2368	$self->{knob_w} = $knob_w;
2268	});	2369	}
2269
2270	$self->SUPER::update;
2271	}
2272
2273	sub _draw {
2274	my ($self) = @_;
2275		2370
2276	$self->SUPER::_draw ();	2371	$self->SUPER::_draw ();
2277		2372
2278	glScale $self->{w}, $self->{h};	2373	glScale $self->{w}, $self->{h};
2279		2374
…		…
2377	$self->{fontsize} = $fontsize;	2472	$self->{fontsize} = $fontsize;
2378	$self->reflow;	2473	$self->reflow;
2379	}	2474	}
2380		2475
2381	sub size_allocate {	2476	sub size_allocate {
2382	my ($self, $w, $h, $changed) = @_;	2477	my ($self, $w, $h) = @_;
2383		2478
2384	$self->SUPER::size_allocate ($w, $h, $changed);	2479	$self->SUPER::size_allocate ($w, $h);
2385
2386	return unless $changed;
2387		2480
2388	$self->{layout}->set_font ($self->{font}) if $self->{font};	2481	$self->{layout}->set_font ($self->{font}) if $self->{font};
2389	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2482	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390	$self->{layout}->set_width ($self->{children}[0]{w});	2483	$self->{layout}->set_width ($self->{children}[0]{w});
2391		2484
…		…
2475		2568
2476	delete $self->{texture};	2569	delete $self->{texture};
2477	}	2570	}
2478		2571
2479	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2572	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2480	glClearColor 0.5, 0.5, 0.5, 0;	2573	glClearColor 0, 0, 0, 0;
2481	glClear GL_COLOR_BUFFER_BIT;	2574	glClear GL_COLOR_BUFFER_BIT;
2482		2575
2483	my $top = int $self->{children}[1]{range}[0];	2576	my $top = int $self->{children}[1]{range}[0];
2484		2577
2485	my $y0 = $top;	2578	my $y0 = $top;
…		…
2520	sub _draw {	2613	sub _draw {
2521	my ($self) = @_;	2614	my ($self) = @_;
2522		2615
2523	glEnable GL_TEXTURE_2D;	2616	glEnable GL_TEXTURE_2D;
2524	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2617	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525	glColor 1, 1, 1, 1;	2618	glColor 0, 0, 0, 1;
2526	$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});
2527	glDisable GL_TEXTURE_2D;	2620	glDisable GL_TEXTURE_2D;
2528		2621
2529	$self->{children}[1]->draw;	2622	$self->{children}[1]->draw;
2530		2623
2531	}	2624	}
…		…
2614	}	2707	}
2615		2708
2616	sub set_tooltip_from {	2709	sub set_tooltip_from {
2617	my ($self, $widget) = @_;	2710	my ($self, $widget) = @_;
2618		2711
		2712	my $tooltip = $widget->{tooltip};
		2713
		2714	if ($ENV{CFPLUS_DEBUG} & 2) {
		2715	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2716	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2717	. "req $widget->{req_w} $widget->{req_h}\n"
		2718	. "visible $widget->{visible}";
		2719	}
		2720
2619	$self->add (new CFClient::UI::Label	2721	$self->add (new CFClient::UI::Label
2620	markup => $widget->{tooltip},	2722	markup => $tooltip,
2621	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2723	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622	fontsize => 0.8,	2724	fontsize => 0.8,
2623	fg => [0, 0, 0, 1],	2725	fg => [0, 0, 0, 1],
2624	ellipsise => 0,	2726	ellipsise => 0,
2625	font => ($widget->{tooltip_font} || $::FONT_PROP),	2727	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2633		2735
2634	($w + 4, $h + 4)	2736	($w + 4, $h + 4)
2635	}	2737	}
2636		2738
2637	sub size_allocate {	2739	sub size_allocate {
2638	my ($self, $w, $h, $changed) = @_;	2740	my ($self, $w, $h) = @_;
2639		2741
2640	return unless $changed;
2641
2642	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2742	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2743	}
		2744
		2745	sub visibility_change {
		2746	my ($self, $visible) = @_;
		2747
		2748	return unless $visible;
		2749
		2750	$self->{root}->on_post_alloc ("move_$self" => sub {
		2751	my $widget = $self->{owner}
		2752	or return;
		2753
		2754	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2755
		2756	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2757	if $x + $self->{w} > $::WIDTH;
		2758
		2759	$self->move_abs ($x, $y);
		2760	});
2643	}	2761	}
2644		2762
2645	sub _draw {	2763	sub _draw {
2646	my ($self) = @_;	2764	my ($self) = @_;
2647		2765
…		…
2664	glVertex $w, $h;	2782	glVertex $w, $h;
2665	glVertex $w, 0;	2783	glVertex $w, 0;
2666	glEnd;	2784	glEnd;
2667		2785
2668	glTranslate 2 - 0.375, 2 - 0.375;	2786	glTranslate 2 - 0.375, 2 - 0.375;
		2787
2669	$self->SUPER::_draw;	2788	$self->SUPER::_draw;
2670	}	2789	}
2671		2790
2672	#############################################################################	2791	#############################################################################
2673		2792
…		…
2732	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2851	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2733		2852
2734	if ($tex) {	2853	if ($tex) {
2735	glEnable GL_TEXTURE_2D;	2854	glEnable GL_TEXTURE_2D;
2736	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2855	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737	glColor 1, 1, 1, 1;	2856	glColor 0, 0, 0, 1;
2738	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2857	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739	glDisable GL_TEXTURE_2D;	2858	glDisable GL_TEXTURE_2D;
2740	}	2859	}
2741	}	2860	}
2742		2861
…		…
2749	$self->SUPER::DESTROY;	2868	$self->SUPER::DESTROY;
2750	}	2869	}
2751		2870
2752	#############################################################################	2871	#############################################################################
2753		2872
2754	package CFClient::UI::Inventory;	2873	package CFClient::UI::Buttonbar;
2755		2874
2756	our @ISA = CFClient::UI::ScrolledWindow::;	2875	our @ISA = CFClient::UI::HBox::;
2757		2876
2758	sub new {	2877	# TODO: should actualyl wrap buttons and other goodies.
2759	my $class = shift;
2760
2761	my $self = $class->SUPER::new (
2762	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763	@_,
2764	);
2765
2766	$self
2767	}
2768
2769	sub set_items {
2770	my ($self, $items) = @_;
2771
2772	$self->{scrolled}->clear;
2773	return unless $items;
2774
2775	my @items = sort {
2776	($a->{type} <=> $b->{type})
2777	or ($a->{name} cmp $b->{name})
2778	} @$items;
2779
2780	$self->{real_items} = \@items;
2781
2782	my $row = 0;
2783	for my $item (@items) {
2784	CFClient::Item::update_widgets $item;
2785
2786	$self->{scrolled}->add (0, $row, $item->{face_widget});
2787	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2788	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2789
2790	$row++;
2791	}
2792	}
2793		2878
2794	#############################################################################	2879	#############################################################################
2795		2880
2796	package CFClient::UI::Menu;	2881	package CFClient::UI::Menu;
2797		2882
…		…
2838	# maybe save $GRAB? must be careful about events...	2923	# maybe save $GRAB? must be careful about events...
2839	$GRAB = $self;	2924	$GRAB = $self;
2840	$self->{button} = $ev->{button};	2925	$self->{button} = $ev->{button};
2841		2926
2842	$self->show;	2927	$self->show;
2843	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2928	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844	}	2929	}
2845		2930
2846	sub mouse_motion {	2931	sub mouse_motion {
2847	my ($self, $ev, $x, $y) = @_;	2932	my ($self, $ev, $x, $y) = @_;
2848		2933
2849	# TODO: should use vbox->find_widget or so	2934	# TODO: should use vbox->find_widget or so
2850	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851	$self->{hover} = $self->{item}{$HOVER};	2936	$self->{hover} = $self->{item}{$HOVER};
		2937
		2938	0
2852	}	2939	}
2853		2940
2854	sub button_up {	2941	sub button_up {
2855	my ($self, $ev, $x, $y) = @_;	2942	my ($self, $ev, $x, $y) = @_;
2856		2943
…		…
2858	undef $GRAB;	2945	undef $GRAB;
2859	$self->hide;	2946	$self->hide;
2860		2947
2861	$self->_emit ("popdown");	2948	$self->_emit ("popdown");
2862	$self->{hover}[1]->() if $self->{hover};	2949	$self->{hover}[1]->() if $self->{hover};
		2950	} else {
		2951	return 0
		2952	}
		2953
2863	}	2954	1
2864	}	2955	}
2865		2956
2866	#############################################################################	2957	#############################################################################
2867		2958
2868	package CFClient::UI::Statusbox;	2959	package CFClient::UI::Multiplexer;
2869		2960
2870	our @ISA = CFClient::UI::VBox::;	2961	our @ISA = CFClient::UI::Container::;
2871		2962
2872	sub new {	2963	sub new {
2873	my $class = shift;	2964	my $class = shift;
2874		2965
2875	$class->SUPER::new (	2966	my $self = $class->SUPER::new (
		2967	@_,
		2968	);
		2969
		2970	$self->{current} = $self->{children}[0]
		2971	if @{ $self->{children} };
		2972
		2973	$self
		2974	}
		2975
		2976	sub add {
		2977	my ($self, @widgets) = @_;
		2978
		2979	$self->SUPER::add (@widgets);
		2980
		2981	$self->{current} = $self->{children}[0]
		2982	if @{ $self->{children} };
		2983	}
		2984
		2985	sub set_current_page {
		2986	my ($self, $page_or_widget) = @_;
		2987
		2988	my $widget = ref $page_or_widget
		2989	? $page_or_widget
		2990	: $self->{children}[$page_or_widget];
		2991
		2992	$self->{current} = $widget;
		2993	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2994
		2995	$self->_emit (page_changed => $self->{current});
		2996
		2997	$self->realloc;
		2998	}
		2999
		3000	sub visible_children {
		3001	$_[0]{current}
		3002	}
		3003
		3004	sub size_request {
		3005	my ($self) = @_;
		3006
		3007	$self->{current}->size_request
		3008	}
		3009
		3010	sub size_allocate {
		3011	my ($self, $w, $h) = @_;
		3012
		3013	$self->{current}->configure (0, 0, $w, $h);
		3014	}
		3015
		3016	sub _draw {
		3017	my ($self) = @_;
		3018
		3019	$self->{current}->draw;
		3020	}
		3021
		3022	#############################################################################
		3023
		3024	package CFClient::UI::Notebook;
		3025
		3026	our @ISA = CFClient::UI::VBox::;
		3027
		3028	sub new {
		3029	my $class = shift;
		3030
		3031	my $self = $class->SUPER::new (
		3032	buttonbar => (new CFClient::UI::Buttonbar),
		3033	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3034	# filter => # will be put between multiplexer and $self
		3035	@_,
		3036	);
		3037
		3038	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3039	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3040
		3041	$self
		3042	}
		3043
		3044	sub add {
		3045	my ($self, $title, $widget, $tooltip) = @_;
		3046
		3047	Scalar::Util::weaken $self;
		3048
		3049	$self->{buttonbar}->add (new CFClient::UI::Button
		3050	markup => $title,
		3051	tooltip => $tooltip,
		3052	on_activate => sub { $self->set_current_page ($widget) },
		3053	);
		3054
		3055	$self->{multiplexer}->add ($widget);
		3056	}
		3057
		3058	sub set_current_page {
		3059	my ($self, $page) = @_;
		3060
		3061	$self->{multiplexer}->set_current_page ($page);
		3062	$self->_emit (page_changed => $self->{multiplexer}{current});
		3063	}
		3064
		3065	#############################################################################
		3066
		3067	package CFClient::UI::Statusbox;
		3068
		3069	our @ISA = CFClient::UI::VBox::;
		3070
		3071	sub new {
		3072	my $class = shift;
		3073
		3074	my $self = $class->SUPER::new (
2876	fontsize => 0.8,	3075	fontsize => 0.8,
2877	@_,	3076	@_,
2878	)	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
2879	}	3087	}
2880		3088
2881	sub reorder {	3089	sub reorder {
2882	my ($self) = @_;	3090	my ($self) = @_;
2883	my $NOW = time;	3091	my $NOW = Time::HiRes::time;
2884		3092
2885	while (my ($k, $v) = each %{ $self->{item} }) {	3093	while (my ($k, $v) = each %{ $self->{item} }) {
2886	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3094	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887	}	3095	}
2888		3096
…		…
2890		3098
2891	my @items = sort {	3099	my @items = sort {
2892	$a->{pri} <=> $b->{pri}	3100	$a->{pri} <=> $b->{pri}
2893	or $b->{id} <=> $a->{id}	3101	or $b->{id} <=> $a->{id}
2894	} values %{ $self->{item} };	3102	} values %{ $self->{item} };
		3103
		3104	$self->{timer}->interval (1);
2895		3105
2896	my $count = 10 + 1;	3106	my $count = 10 + 1;
2897	for my $item (@items) {	3107	for my $item (@items) {
2898	last unless --$count;	3108	last unless --$count;
2899		3109
…		…
2914	tooltip_font => $::FONT_PROP,	3124	tooltip_font => $::FONT_PROP,
2915	tooltip_width => 0.67,	3125	tooltip_width => 0.67,
2916	fontsize => $item->{fontsize} || $self->{fontsize},	3126	fontsize => $item->{fontsize} || $self->{fontsize},
2917	max_w => $::WIDTH * 0.44,	3127	max_w => $::WIDTH * 0.44,
2918	fg => $item->{fg},	3128	fg => $item->{fg},
		3129	orig_alpha => $item->{fg}[3] || 1,
2919	can_events => 1,	3130	can_events => 1,
2920	can_hover => 1	3131	can_hover => 1
2921	};	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	}
2922	}	3143	}
2923		3144
2924	$self->clear;	3145	$self->clear;
2925	$self->SUPER::add (reverse @widgets);	3146	$self->SUPER::add (reverse @widgets);
2926	}	3147	}
…		…
2931	$text =~ s/^\s+//;	3152	$text =~ s/^\s+//;
2932	$text =~ s/\s+$//;	3153	$text =~ s/\s+$//;
2933		3154
2934	return unless $text;	3155	return unless $text;
2935		3156
2936	my $timeout = time + ((delete $arg{timeout}) || 60);	3157	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2937		3158
2938	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3159	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2939		3160
2940	if (my $item = $self->{item}{$group}) {	3161	if (my $item = $self->{item}{$group}) {
2941	if ($item->{text} eq $text) {	3162	if ($item->{text} eq $text) {
…		…
2971		3192
2972	$self->reorder;	3193	$self->reorder;
2973	$self->SUPER::reconfigure;	3194	$self->SUPER::reconfigure;
2974	}	3195	}
2975		3196
		3197	sub DESTROY {
		3198	my ($self) = @_;
		3199
		3200	$self->{timer}->cancel;
		3201
		3202	$self->SUPER::DESTROY;
		3203	}
		3204
2976	#############################################################################	3205	#############################################################################
2977		3206
		3207	package CFClient::UI::Inventory;
		3208
		3209	our @ISA = CFClient::UI::ScrolledWindow::;
		3210
		3211	sub new {
		3212	my $class = shift;
		3213
		3214	my $self = $class->SUPER::new (
		3215	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3216	@_,
		3217	);
		3218
		3219	$self
		3220	}
		3221
		3222	sub set_items {
		3223	my ($self, $items) = @_;
		3224
		3225	$self->{child}->clear;
		3226	return unless $items;
		3227
		3228	my @items = sort {
		3229	($a->{type} <=> $b->{type})
		3230	or ($a->{name} cmp $b->{name})
		3231	} @$items;
		3232
		3233	$self->{real_items} = \@items;
		3234
		3235	my $row = 0;
		3236	for my $item (@items) {
		3237	CFClient::Item::update_widgets $item;
		3238
		3239	$self->{child}->add (0, $row, $item->{face_widget});
		3240	$self->{child}->add (1, $row, $item->{desc_widget});
		3241	$self->{child}->add (2, $row, $item->{weight_widget});
		3242
		3243	$row++;
		3244	}
		3245	}
		3246
		3247	#############################################################################
		3248
		3249	package CFClient::UI::BindEditor;
		3250
		3251	our @ISA = CFClient::UI::FancyFrame::;
		3252
		3253	sub new {
		3254	my $class = shift;
		3255
		3256	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3257
		3258	$self->add (my $vb = new CFClient::UI::VBox);
		3259
		3260
		3261	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3262	text => "start recording",
		3263	tooltip => "Start/Stops recording of actions."
		3264	."All subsequent actions after the recording started will be captured."
		3265	."The actions are displayed after the record was stopped."
		3266	."To bind the action you have to click on the 'Bind' button",
		3267	on_activate => sub {
		3268	unless ($self->{recording}) {
		3269	$self->start;
		3270	} else {
		3271	$self->stop;
		3272	}
		3273	});
		3274
		3275	$vb->add (new CFClient::UI::Label text => "Actions:");
		3276	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3277
		3278	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3279	$vb->add (my $hb = new CFClient::UI::HBox);
		3280	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3281	$hb->add (new CFClient::UI::Button
		3282	text => "bind",
		3283	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3284	on_activate => sub {
		3285	$self->ask_for_bind;
		3286	});
		3287
		3288	$vb->add (my $hb = new CFClient::UI::HBox);
		3289	$hb->add (new CFClient::UI::Button
		3290	text => "ok",
		3291	expand => 1,
		3292	tooltip => "This closes the binding editor and saves the binding",
		3293	on_activate => sub {
		3294	$self->hide;
		3295	$self->commit;
		3296	});
		3297
		3298	$hb->add (new CFClient::UI::Button
		3299	text => "cancel",
		3300	expand => 1,
		3301	tooltip => "This closes the binding editor without saving",
		3302	on_activate => sub {
		3303	$self->hide;
		3304	$self->{binding_cancel}->()
		3305	if $self->{binding_cancel};
		3306	});
		3307
		3308	$self->update_binding_widgets;
		3309
		3310	$self
		3311	}
		3312
		3313	sub commit {
		3314	my ($self) = @_;
		3315	my ($mod, $sym, $cmds) = $self->get_binding;
		3316	if ($sym != 0 && @$cmds > 0) {
		3317	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3318	."'. Don't forget 'Save Config'!");
		3319	$self->{binding_change}->($mod, $sym, $cmds)
		3320	if $self->{binding_change};
		3321	} else {
		3322	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3323	$self->{binding_cancel}->()
		3324	if $self->{binding_cancel};
		3325	}
		3326	}
		3327
		3328	sub start {
		3329	my ($self) = @_;
		3330
		3331	$self->{rec_btn}->set_text ("stop recording");
		3332	$self->{recording} = 1;
		3333	$self->clear_command_list;
		3334	$::CONN->start_record if $::CONN;
		3335	}
		3336
		3337	sub stop {
		3338	my ($self) = @_;
		3339
		3340	$self->{rec_btn}->set_text ("start recording");
		3341	$self->{recording} = 0;
		3342
		3343	my $rec;
		3344	$rec = $::CONN->stop_record if $::CONN;
		3345	return unless ref $rec eq 'ARRAY';
		3346	$self->set_command_list ($rec);
		3347	}
		3348
		3349
		3350	sub ask_for_bind_and_commit {
		3351	my ($self) = @_;
		3352	$self->ask_for_bind (1);
		3353	}
		3354
		3355	sub ask_for_bind {
		3356	my ($self, $commit) = @_;
		3357
		3358	CFClient::Binder::open_binding_dialog (sub {
		3359	my ($mod, $sym) = @_;
		3360	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3361	$self->update_binding_widgets;
		3362	$self->commit if $commit;
		3363	});
		3364	}
		3365
		3366	# $mod and $sym are the modifiers and key symbol
		3367	# $cmds is a array ref of strings (the commands)
		3368	# $cb is the callback that is executed on OK
		3369	# $ccb is the callback that is executed on CANCEL and
		3370	# when the binding was unsuccessful on OK
		3371	sub set_binding {
		3372	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3373
		3374	$self->clear_command_list;
		3375	$self->{recording} = 0;
		3376	$self->{rec_btn}->set_text ("start recording");
		3377
		3378	$self->{binding} = [$mod, $sym];
		3379	$self->{commands} = $cmds;
		3380
		3381	$self->{binding_change} = $cb;
		3382	$self->{binding_cancel} = $ccb;
		3383
		3384	$self->update_binding_widgets;
		3385	}
		3386
		3387	# this is a shortcut method that asks for a binding
		3388	# and then just binds it.
		3389	sub do_quick_binding {
		3390	my ($self, $cmds) = @_;
		3391	$self->set_binding (undef, undef, $cmds, sub {
		3392	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3393	});
		3394	$self->ask_for_bind (1);
		3395	}
		3396
		3397	sub update_binding_widgets {
		3398	my ($self) = @_;
		3399	my ($mod, $sym, $cmds) = $self->get_binding;
		3400	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3401	$self->set_command_list ($cmds);
		3402	}
		3403
		3404	sub get_binding {
		3405	my ($self) = @_;
		3406	return (
		3407	$self->{binding}->[0],
		3408	$self->{binding}->[1],
		3409	[ grep { defined $_ } @{$self->{commands}} ]
		3410	);
		3411	}
		3412
		3413	sub clear_command_list {
		3414	my ($self) = @_;
		3415	$self->{cmdbox}->clear ();
		3416	}
		3417
		3418	sub set_command_list {
		3419	my ($self, $cmds) = @_;
		3420
		3421	$self->{cmdbox}->clear ();
		3422	$self->{commands} = $cmds;
		3423
		3424	my $idx = 0;
		3425
		3426	for (@$cmds) {
		3427	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3428
		3429	my $i = $idx;
		3430	$hb->add (new CFClient::UI::Label text => $_);
		3431	$hb->add (new CFClient::UI::Button
		3432	text => "delete",
		3433	tooltip => "Deletes the action from the record",
		3434	on_activate => sub {
		3435	$self->{cmdbox}->remove ($hb);
		3436	$cmds->[$i] = undef;
		3437	});
		3438
		3439
		3440	$idx++
		3441	}
		3442	}
		3443
		3444	#############################################################################
		3445
		3446	package CFClient::UI::SpellList;
		3447
		3448	our @ISA = CFClient::UI::Table::;
		3449
		3450	sub new {
		3451	my $class = shift;
		3452
		3453	my $self = $class->SUPER::new (
		3454	binding => [],
		3455	commands => [],
		3456	@_,
		3457	)
		3458	}
		3459
		3460	# XXX: Do sorting? Argl...
		3461	sub add_spell {
		3462	my ($self, $spell) = @_;
		3463	$self->{spells}->{$spell->{name}} = $spell;
		3464
		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	}
		3493
		3494	sub remove_spell {
		3495	my ($self, $spell) = @_;
		3496	delete $self->{spells}->{$spell->{name}};
		3497	$self->rebuild_spell_list;
		3498	}
		3499
		3500	#############################################################################
		3501
2978	package CFClient::UI::Root;	3502	package CFClient::UI::Root;
2979		3503
2980	our @ISA = CFClient::UI::Container::;	3504	our @ISA = CFClient::UI::Container::;
		3505
		3506	use List::Util qw(min max);
2981		3507
2982	use CFClient::OpenGL;	3508	use CFClient::OpenGL;
2983		3509
2984	sub new {	3510	sub new {
2985	my $class = shift;	3511	my $class = shift;
…		…
2992	Scalar::Util::weaken ($self->{root} = $self);	3518	Scalar::Util::weaken ($self->{root} = $self);
2993		3519
2994	$self	3520	$self
2995	}	3521	}
2996		3522
2997	sub configure {
2998	my ($self, $x, $y, $w, $h) = @_;
2999
3000	$self->{w} = $w;
3001	$self->{h} = $h;
3002	}
3003
3004	sub reconfigure {
3005	my ($self) = @_;
3006
3007	$self->SUPER::reconfigure;
3008
3009	$self->size_allocate ($self->{w}, $self->{h}, 1)
3010	if $self->{w};
3011	}
3012
3013	sub size_request {	3523	sub size_request {
3014	my ($self) = @_;	3524	my ($self) = @_;
3015		3525
3016	($self->{w}, $self->{h})	3526	($self->{w}, $self->{h})
3017	}	3527	}
3018		3528
		3529	sub _to_pixel {
		3530	my ($coord, $size, $max) = @_;
		3531
		3532	$coord =
		3533	$coord eq "center" ? ($max - $size) * 0.5
		3534	: $coord eq "max" ? $max
		3535	: $coord;
		3536
		3537	$coord = 0 if $coord < 0;
		3538	$coord = $max - $size if $coord > $max - $size;
		3539
		3540	int $coord + 0.5
		3541	}
		3542
3019	sub size_allocate {	3543	sub size_allocate {
3020	my ($self, $w, $h, $changed) = @_;	3544	my ($self, $w, $h) = @_;
3021		3545
3022	for my $child ($self->children) {	3546	for my $child ($self->children) {
3023	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3547	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024		3548
3025	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3549	$X = $child->{force_x} if exists $child->{force_x};
3026	if exists $child->{req_x};	3550	$Y = $child->{force_y} if exists $child->{force_y};
3027		3551
3028	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3552	$X = _to_pixel $X, $W, $self->{w};
3029	if exists $child->{req_y};	3553	$Y = _to_pixel $Y, $H, $self->{h};
3030
3031	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3033	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035		3554
3036	$child->configure ($X, $Y, $W, $H);	3555	$child->configure ($X, $Y, $W, $H);
3037	}	3556	}
3038	}	3557	}
3039		3558
…		…
3056	}	3575	}
3057		3576
3058	sub add {	3577	sub add {
3059	my ($self, @children) = @_;	3578	my ($self, @children) = @_;
3060		3579
3061	for my $child (@children) {
3062	$child->{is_toplevel} = 1;	3580	$_->{is_toplevel} = 1
3063		3581	for @children;
3064	# integerise window positions
3065	$child->{x} = int $child->{x};
3066	$child->{y} = int $child->{y};
3067	}
3068		3582
3069	$self->SUPER::add (@children);	3583	$self->SUPER::add (@children);
3070	}	3584	}
3071		3585
3072	sub remove {	3586	sub remove {
3073	my ($self, @children) = @_;	3587	my ($self, @children) = @_;
3074		3588
3075	$self->SUPER::remove (@children);	3589	$self->SUPER::remove (@children);
		3590
		3591	delete $self->{is_toplevel}
		3592	for @children;
3076		3593
3077	while (@children) {	3594	while (@children) {
3078	my $w = pop @children;	3595	my $w = pop @children;
3079	push @children, $w->children;	3596	push @children, $w->children;
3080	$w->set_invisible;	3597	$w->set_invisible;
…		…
3100	$_->()	3617	$_->()
3101	for values %{delete $self->{refresh_hook}};	3618	for values %{delete $self->{refresh_hook}};
3102	}	3619	}
3103		3620
3104	if ($self->{realloc}) {	3621	if ($self->{realloc}) {
		3622	my %queue;
3105	my @queue;	3623	my @queue;
		3624	my $widget;
3106		3625
		3626	outer:
3107	while () {	3627	while () {
3108	if ($self->{realloc}) {	3628	if (my $realloc = delete $self->{realloc}) {
3109	#TODO use array-of-depth approach	3629	for $widget (values %$realloc) {
		3630	$widget->{visible} or next; # do not resize invisible widgets
3110		3631
3111	@queue = sort { $a->{visible} <=> $b->{visible} }	3632	$queue{$widget+0}++ and next; # duplicates are common
3112	@queue, values %{delete $self->{realloc}};	3633
		3634	push @{ $queue[$widget->{visible}] }, $widget;
		3635	}
3113	}	3636	}
3114		3637
		3638	while () {
		3639	@queue or last outer;
		3640
		3641	$widget = pop @{ $queue[-1] || [] }
		3642	and last;
		3643
		3644	pop @queue;
		3645	}
		3646
		3647	delete $queue{$widget+0};
		3648
		3649	my ($w, $h) = $widget->size_request;
		3650
		3651	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 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};
		3656
		3657	$w = $widget->{force_w} if exists $widget->{force_w};
		3658	$h = $widget->{force_h} if exists $widget->{force_h};
		3659
		3660	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3661	|| delete $widget->{force_realloc}) {
		3662	$widget->{req_w} = $w;
		3663	$widget->{req_h} = $h;
		3664
		3665	$self->{size_alloc}{$widget+0} = $widget;
		3666
		3667	if (my $parent = $widget->{parent}) {
		3668	$self->{realloc}{$parent+0} = $parent
		3669	unless $queue{$parent+0};
		3670
		3671	$parent->{force_size_alloc} = 1;
		3672	$self->{size_alloc}{$parent+0} = $parent;
		3673	}
		3674	}
		3675
		3676	delete $self->{realloc}{$widget+0};
		3677	}
		3678	}
		3679
		3680	while (my $size_alloc = delete $self->{size_alloc}) {
		3681	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3682	values %$size_alloc;
		3683
		3684	while () {
3115	my $widget = pop @queue || last;	3685	my $widget = pop @queue || last;
3116		3686
3117	$widget->{visible} or last; # do not resize invisible widgets	3687	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3118
3119	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3120	? @$widget{qw(def_w def_h)}
3121	: $widget->size_request;
3122
3123	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3124
3125	$widget->{req_w} = $w;
3126	$widget->{req_h} = $h;
3127
3128	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3129
3130	push @queue, $widget->{parent}
3131	if $widget->{parent};
3132	}
3133	}
3134
3135	while (my $size_alloc = delete $self->{size_alloc}) {
3136	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3137	values %$size_alloc;
3138
3139	while () {
3140	my ($widget, $w, $h) = @{ pop @queue or last };
3141		3688
3142	$w = 0 if $w < 0;	3689	$w = 0 if $w < 0;
3143	$h = 0 if $h < 0;	3690	$h = 0 if $h < 0;
3144		3691
		3692	$w = int $w + 0.5;
		3693	$h = int $h + 0.5;
		3694
		3695	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3696	$widget->{old_w} = $widget->{w};
		3697	$widget->{old_h} = $widget->{h};
		3698
3145	$widget->{w} = $w;	3699	$widget->{w} = $w;
3146	$widget->{h} = $h;	3700	$widget->{h} = $h;
		3701
3147	$widget->emit (size_allocate => $w, $h, 1);	3702	$widget->emit (size_allocate => $w, $h);
		3703	}
3148	}	3704	}
3149	}	3705	}
3150		3706
3151	while ($self->{post_alloc_hook}) {	3707	while ($self->{post_alloc_hook}) {
3152	$_->()	3708	$_->()
3153	for values %{delete $self->{post_alloc_hook}};	3709	for values %{delete $self->{post_alloc_hook}};
3154	}	3710	}
		3711
3155		3712
3156	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3713	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3714	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158	glClear GL_COLOR_BUFFER_BIT;	3715	glClear GL_COLOR_BUFFER_BIT;
3159		3716
…		…
3161	glLoadIdentity;	3718	glLoadIdentity;
3162	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3719	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163	glMatrixMode GL_MODELVIEW;	3720	glMatrixMode GL_MODELVIEW;
3164	glLoadIdentity;	3721	glLoadIdentity;
3165		3722
		3723	{
		3724	package CFClient::UI::Base;
		3725
		3726	($draw_x, $draw_y, $draw_w, $draw_h) =
		3727	(0, 0, $self->{w}, $self->{h});
		3728	}
		3729
3166	$self->_draw;	3730	$self->_draw;
3167	}	3731	}
3168		3732
3169	#############################################################################	3733	#############################################################################
3170		3734

Diff Legend

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