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

Diff Legend

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