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.247 by root, Sun May 28 01:16:04 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	}
225
226	sub toggle_visibility {
227	my ($self) = @_;
228
229	if ($self->{visible}) {
230	$self->hide;
231	} else {
232	$self->show;
233	}
234	}	237	}
235		238
236	sub destroy {	239	sub destroy {
237	my ($self) = @_;	240	my ($self) = @_;
238		241
…		…
240	%$self = ();	243	%$self = ();
241	}	244	}
242		245
243	sub show {	246	sub show {
244	my ($self) = @_;	247	my ($self) = @_;
		248
245	return if $self->{parent};	249	return if $self->{parent};
246		250
247	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
248	}
249
250	sub center {
251	my ($self) = @_;
252
253	$CFClient::UI::ROOT->on_post_alloc (
254	"center_$self" => sub {
255	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
256	},
257	);
258
259	$self->update;
260	}	252	}
261		253
262	sub set_visible {	254	sub set_visible {
263	my ($self) = @_;	255	my ($self) = @_;
264		256
265	return if $self->{visible};	257	return if $self->{visible};
266		258
267	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
268	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
269		261
270	$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;
271	}	267	}
272		268
273	sub set_invisible {	269	sub set_invisible {
274	my ($self) = @_;	270	my ($self) = @_;
275		271
276	return unless $self->{visible};	272	return unless $self->{visible};
277		273
278	# broken show/hide model	274	$_->set_invisible for $self->children;
279		275
280	delete $self->{root};	276	delete $self->{root};
281	delete $self->{visible};	277	delete $self->{visible};
282		278
283	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
284	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
285		281
286	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
287	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
288		284
289	$self->focus_out;	285	$self->focus_out;
290		286
291	$self->emit (visibility_change => 0);	287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
292	}	305	}
293		306
294	sub hide {	307	sub hide {
295	my ($self) = @_;	308	my ($self) = @_;
296		309
…		…
298		311
299	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
300	if $self->{parent};	313	if $self->{parent};
301	}	314	}
302		315
303	sub move {	316	sub move_abs {
304	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
305		318
306	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
307	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
308	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
309		322
310	$self->update;	323	$self->update;
311	}	324	}
312		325
313	sub set_size {	326	sub set_size {
314	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
315		328
316	$self->{def_w} = $w;	329	$self->{force_w} = $w;
317	$self->{def_h} = $h;	330	$self->{force_h} = $h;
318		331
319	$self->check_size;	332	$self->realloc;
320	}	333	}
321		334
322	sub size_request {	335	sub size_request {
323	require Carp;	336	require Carp;
324	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
326		339
327	sub configure {	340	sub configure {
328	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
329		342
330	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
331	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
332	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
333		348
334	# use alignment to adjust x, y	349	# use alignment to adjust x, y
335		350
336	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
337	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
338
339	($w, $h) = ($w2, $h2);
340	}	353	}
341		354
342	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
343	$self->{x} = $x;	356	$self->{x} = $x;
344	$self->{y} = $y;	357	$self->{y} = $y;
345	$self->update;	358	$self->update;
346	}	359	}
347		360
348	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
349	$CFClient::UI::ROOT->{size_alloc}{$self} = [$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;
350	}	368	}
351	}	369	}
352		370
353	sub size_allocate {	371	sub size_allocate {
354	# nothing to be done	372	# nothing to be done
355	}	373	}
356		374
357	sub reconfigure {
358	my ($self) = @_;
359
360	$self->check_size (1);
361	$self->update;
362	}
363
364	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
365	}	381	}
366		382
367	sub set_max_size {	383	sub set_max_size {
368	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
369		385
…		…
428		444
429	$::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
430	unless $FOCUS;	446	unless $FOCUS;
431	}	447	}
432		448
433	sub mouse_motion { }	449	sub mouse_motion { 0 }
434	sub button_up { }	450	sub button_up { 0 }
435	sub key_down { }	451	sub key_down { 0 }
436	sub key_up { }	452	sub key_up { 0 }
437		453
438	sub button_down {	454	sub button_down {
439	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
440		456
441	$self->focus_in;	457	$self->focus_in;
442	}
443		458
444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
448	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
449		535
450	sub draw {	536	sub draw {
451	my ($self) = @_;	537	my ($self) = @_;
452		538
453	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);
454		550
455	glPushMatrix;	551	glPushMatrix;
456	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
457	$self->_draw;
458	glPopMatrix;
459		553
460	if ($self == $HOVER && $self->{can_hover}) {	554	if ($self == $HOVER && $self->{can_hover}) {
461	my ($x, $y) = @$self{qw(x y)};
462
463	glColor 1, 0.8, 0.5, 0.2;	555	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
464	glEnable GL_BLEND;	556	glEnable GL_BLEND;
465	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	557	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
466	glBegin GL_QUADS;	558	glBegin GL_QUADS;
467	glVertex $x , $y;	559	glVertex 0 , 0;
468	glVertex $x + $self->{w}, $y;	560	glVertex $self->{w}, 0;
469	glVertex $x + $self->{w}, $y + $self->{h};	561	glVertex $self->{w}, $self->{h};
470	glVertex $x , $y + $self->{h};	562	glVertex 0 , $self->{h};
471	glEnd;	563	glEnd;
472	glDisable GL_BLEND;	564	glDisable GL_BLEND;
473	}	565	}
474		566
475	if ($ENV{PCLIENT_DEBUG}) {	567	if ($ENV{CFPLUS_DEBUG} & 1) {
476	glPushMatrix;	568	glPushMatrix;
477	glColor 1, 1, 0, 1;	569	glColor 1, 1, 0, 1;
478	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	570	glTranslate 0.375, 0.375;
479	glBegin GL_LINE_LOOP;	571	glBegin GL_LINE_LOOP;
480	glVertex 0 , 0;	572	glVertex 0 , 0;
481	glVertex $self->{w} - 1, 0;	573	glVertex $self->{w} - 1, 0;
482	glVertex $self->{w} - 1, $self->{h} - 1;	574	glVertex $self->{w} - 1, $self->{h} - 1;
483	glVertex 0 , $self->{h} - 1;	575	glVertex 0 , $self->{h} - 1;
484	glEnd;	576	glEnd;
485	glPopMatrix;	577	glPopMatrix;
486	#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;
487	}	579	}
		580
		581	$self->_draw;
		582	glPopMatrix;
488	}	583	}
489		584
490	sub _draw {	585	sub _draw {
491	my ($self) = @_;	586	my ($self) = @_;
492		587
493	warn "no draw defined for $self\n";	588	warn "no draw defined for $self\n";
494	}
495
496	sub find_widget {
497	my ($self, $x, $y) = @_;
498
499	return () unless $self->{can_events};
500
501	return $self
502	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
503	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
504
505	()
506	}
507
508	sub set_parent {
509	my ($self, $parent) = @_;
510
511	Scalar::Util::weaken ($self->{parent} = $parent);
512
513	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
515	$self->check_size;
516	}
517
518	sub check_size {
519	my ($self, $forced) = @_;
520
521	$self->{force_alloc} = 1 if $forced;
522	$CFClient::UI::ROOT->{check_size}{$self} = $self;
523	}
524
525	sub update {
526	my ($self) = @_;
527
528	$self->{parent}->update
529	if $self->{parent};
530	}
531
532	sub connect {
533	my ($self, $signal, $cb) = @_;
534
535	push @{ $self->{signal_cb}{$signal} }, $cb;
536	}
537
538	sub _emit {
539	my ($self, $signal, @args) = @_;
540
541	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
542	}
543
544	sub emit {
545	my ($self, $signal, @args) = @_;
546
547	$self->_emit ($signal, @args)
548	|| $self->$signal (@args);
549	}
550
551	sub visibility_change {
552	#my ($self, $visible) = @_;
553	}	589	}
554		590
555	sub DESTROY {	591	sub DESTROY {
556	my ($self) = @_;	592	my ($self) = @_;
557		593
…		…
589		625
590	if ($color && (@$color < 4 || $color->[3])) {	626	if ($color && (@$color < 4 || $color->[3])) {
591	my ($w, $h) = @$self{qw(w h)};	627	my ($w, $h) = @$self{qw(w h)};
592		628
593	glEnable GL_BLEND;	629	glEnable GL_BLEND;
594	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
595	glColor @$color;	631	glColor_premultiply @$color;
596		632
597	glBegin GL_QUADS;	633	glBegin GL_QUADS;
598	glVertex 0 , 0;	634	glVertex 0 , 0;
599	glVertex 0 , $h;	635	glVertex 0 , $h;
600	glVertex $w, $h;	636	glVertex $w, $h;
…		…
615	my ($class, %arg) = @_;	651	my ($class, %arg) = @_;
616	$class->SUPER::new (can_events => 0, %arg);	652	$class->SUPER::new (can_events => 0, %arg);
617	}	653	}
618		654
619	sub size_request {	655	sub size_request {
620	(0, 0)	656	my ($self) = @_;
		657
		658	($self->{w} + 0, $self->{h} + 0)
621	}	659	}
622		660
623	sub draw { }	661	sub draw { }
624		662
625	#############################################################################	663	#############################################################################
…		…
629	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFClient::UI::Base::;
630		668
631	sub new {	669	sub new {
632	my ($class, %arg) = @_;	670	my ($class, %arg) = @_;
633		671
634	my $children = delete $arg{children} || [];	672	my $children = delete $arg{children};
635		673
636	my $self = $class->SUPER::new (	674	my $self = $class->SUPER::new (
637	children => [],	675	children => [],
638	can_events => 0,	676	can_events => 0,
639	%arg,	677	%arg,
640	);	678	);
		679
641	$self->add ($_) for @$children;	680	$self->add (@$children)
		681	if $children;
642		682
643	$self	683	$self
644	}	684	}
645		685
646	sub add {	686	sub add {
…		…
654	$self->{children} = [	694	$self->{children} = [
655	sort { $a->{z} <=> $b->{z} }	695	sort { $a->{z} <=> $b->{z} }
656	@{$self->{children}}, @widgets	696	@{$self->{children}}, @widgets
657	];	697	];
658		698
659	$self->check_size (1);	699	$self->realloc;
660	$self->update;
661	}	700	}
662		701
663	sub children {	702	sub children {
664	@{ $_[0]{children} }	703	@{ $_[0]{children} }
665	}	704	}
…		…
670	delete $child->{parent};	709	delete $child->{parent};
671	$child->hide;	710	$child->hide;
672		711
673	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	712	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
674		713
675	$self->check_size (1);	714	$self->realloc;
676	$self->update;
677	}	715	}
678		716
679	sub clear {	717	sub clear {
680	my ($self) = @_;	718	my ($self) = @_;
681		719
…		…
685	for (@$children) {	723	for (@$children) {
686	delete $_->{parent};	724	delete $_->{parent};
687	$_->hide;	725	$_->hide;
688	}	726	}
689		727
690	$self->check_size;	728	$self->realloc;
691	$self->update;
692	}	729	}
693		730
694	sub find_widget {	731	sub find_widget {
695	my ($self, $x, $y) = @_;	732	my ($self, $x, $y) = @_;
696		733
697	$x -= $self->{x};	734	$x -= $self->{x};
698	$y -= $self->{y};	735	$y -= $self->{y};
699		736
700	my $res;	737	my $res;
701		738
702	for (reverse @{ $self->{children} }) {	739	for (reverse $self->visible_children) {
703	$res = $_->find_widget ($x, $y)	740	$res = $_->find_widget ($x, $y)
704	and return $res;	741	and return $res;
705	}	742	}
706		743
707	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	744	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
756	$self->{children}[0]->configure (0, 0, $w, $h);	793	$self->{children}[0]->configure (0, 0, $w, $h);
757	}	794	}
758		795
759	#############################################################################	796	#############################################################################
760		797
		798	# back-buffered drawing area
		799
761	package CFClient::UI::Window;	800	package CFClient::UI::Window;
762		801
763	our @ISA = CFClient::UI::Bin::;	802	our @ISA = CFClient::UI::Bin::;
764		803
765	use CFClient::OpenGL;	804	use CFClient::OpenGL;
…		…
783	$self->SUPER::size_allocate ($w, $h);	822	$self->SUPER::size_allocate ($w, $h);
784	$self->update;	823	$self->update;
785	}	824	}
786		825
787	sub _render {	826	sub _render {
		827	my ($self) = @_;
		828
788	$_[0]{children}[0]->draw;	829	$self->{children}[0]->draw;
789	}	830	}
790		831
791	sub render_child {	832	sub render_child {
792	my ($self) = @_;	833	my ($self) = @_;
793		834
794	$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 {
795	glClearColor 0, 0, 0, 0;	836	glClearColor 0, 0, 0, 0;
796	glClear GL_COLOR_BUFFER_BIT;	837	glClear GL_COLOR_BUFFER_BIT;
797		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
798	$self->_render;	846	$self->_render;
799	};	847	};
800	}	848	}
801		849
802	sub _draw {	850	sub _draw {
803	my ($self) = @_;	851	my ($self) = @_;
804		852
805	my ($w, $h) = ($self->w, $self->h);	853	my ($w, $h) = @$self{qw(w h)};
806		854
807	my $tex = $self->{texture}	855	my $tex = $self->{texture}
808	or return;	856	or return;
809		857
810	glEnable GL_TEXTURE_2D;	858	glEnable GL_TEXTURE_2D;
811	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812	glColor 1, 1, 1, 1;	860	glColor 0, 0, 0, 1;
813		861
814	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	862	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
815		863
816	glDisable GL_TEXTURE_2D;	864	glDisable GL_TEXTURE_2D;
817	}	865	}
…		…
833	}	881	}
834		882
835	sub size_request {	883	sub size_request {
836	my ($self) = @_;	884	my ($self) = @_;
837		885
838	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)};
839		887
840	$w = 10 if $self->{scroll_x};	888	$w = 10 if $self->{scroll_x};
841	$h = 10 if $self->{scroll_y};	889	$h = 10 if $self->{scroll_y};
842		890
843	($w, $h)	891	($w, $h)
844	}	892	}
845		893
846	sub size_allocate {	894	sub size_allocate {
847	my ($self, $w, $h) = @_;	895	my ($self, $w, $h) = @_;
848		896
		897	my $child = $self->child;
		898
849	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	899	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
850	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	900	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
851		901
852	$self->child->configure (0, 0, $w, $h);	902	$self->child->configure (0, 0, $w, $h);
853	$self->update;	903	$self->update;
854	}	904	}
855		905
…		…
891	}	941	}
892		942
893	sub _render {	943	sub _render {
894	my ($self) = @_;	944	my ($self) = @_;
895		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
896	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	949	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
897		950
898	$self->SUPER::_render;	951	$self->SUPER::_render;
899	}	952	}
900		953
…		…
903	package CFClient::UI::ScrolledWindow;	956	package CFClient::UI::ScrolledWindow;
904		957
905	our @ISA = CFClient::UI::HBox::;	958	our @ISA = CFClient::UI::HBox::;
906		959
907	sub new {	960	sub new {
908	my $class = shift;	961	my ($class, %arg) = @_;
		962
		963	my $child = delete $arg{child};
909		964
910	my $self;	965	my $self;
911		966
912	my $slider = new CFClient::UI::Slider	967	my $slider = new CFClient::UI::Slider
913	vertical => 1,	968	vertical => 1,
…		…
918	;	973	;
919		974
920	$self = $class->SUPER::new (	975	$self = $class->SUPER::new (
921	vp => (new CFClient::UI::ViewPort expand => 1),	976	vp => (new CFClient::UI::ViewPort expand => 1),
922	slider => $slider,	977	slider => $slider,
923	@_,	978	%arg,
924	);	979	);
925		980
926	$self->{vp}->add ($self->{scrolled});
927	$self->add ($self->{vp});
928	$self->add ($self->{slider});	981	$self->SUPER::add ($self->{vp}, $self->{slider});
		982	$self->add ($child) if $child;
929		983
930	$self	984	$self
		985	}
		986
		987	sub add {
		988	my ($self, $widget) = @_;
		989
		990	$self->{vp}->add ($self->{child} = $widget);
931	}	991	}
932		992
933	sub update {	993	sub update {
934	my ($self) = @_;	994	my ($self) = @_;
935		995
…		…
974		1034
975	if ($self->{bg}) {	1035	if ($self->{bg}) {
976	my ($w, $h) = @$self{qw(w h)};	1036	my ($w, $h) = @$self{qw(w h)};
977		1037
978	glEnable GL_BLEND;	1038	glEnable GL_BLEND;
979	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1039	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
980	glColor @{ $self->{bg} };	1040	glColor_premultiply @{ $self->{bg} };
981		1041
982	glBegin GL_QUADS;	1042	glBegin GL_QUADS;
983	glVertex 0 , 0;	1043	glVertex 0 , 0;
984	glVertex 0 , $h;	1044	glVertex 0 , $h;
985	glVertex $w, $h;	1045	glVertex $w, $h;
…		…
998		1058
999	our @ISA = CFClient::UI::Bin::;	1059	our @ISA = CFClient::UI::Bin::;
1000		1060
1001	use CFClient::OpenGL;	1061	use CFClient::OpenGL;
1002		1062
1003	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 =
1004	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1068	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1005	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);
1006		1070
1007	sub new {	1071	sub new {
1008	my $class = shift;	1072	my ($class, %arg) = @_;
		1073
		1074	my $title = delete $arg{title};
1009		1075
1010	my $self = $class->SUPER::new (	1076	my $self = $class->SUPER::new (
1011	bg => [1, 1, 1, 1],	1077	bg => [1, 1, 1, 1],
1012	border_bg => [1, 1, 1, 1],	1078	border_bg => [1, 1, 1, 1],
1013	border => 0.6,	1079	border => 0.6,
1014	is_toplevel => 1,
1015	can_events => 1,	1080	can_events => 1,
1016	@_	1081	min_w => 16,
		1082	min_h => 16,
		1083	%arg,
1017	);	1084	);
1018		1085
1019	$self->{title} &&= new CFClient::UI::Label	1086	$self->{title} = new CFClient::UI::Label
1020	align => 0,	1087	align => 0,
1021	valign => 1,	1088	valign => 1,
1022	text => $self->{title},	1089	text => $title,
1023	fontsize => $self->{border};	1090	fontsize => $self->{border}
		1091	if defined $title;
1024		1092
1025	$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};
1026	}	1101	}
1027		1102
1028	sub border {	1103	sub border {
1029	int $_[0]{border} * $::FONTSIZE	1104	int $_[0]{border} * $::FONTSIZE
1030	}	1105	}
1031		1106
1032	sub size_request {	1107	sub size_request {
1033	my ($self) = @_;	1108	my ($self) = @_;
		1109
		1110	$self->{title}->size_request
		1111	if $self->{title};
1034		1112
1035	my ($w, $h) = $self->SUPER::size_request;	1113	my ($w, $h) = $self->SUPER::size_request;
1036		1114
1037	(	1115	(
1038	$w + $self->border * 2,	1116	$w + $self->border * 2,
…		…
1041	}	1119	}
1042		1120
1043	sub size_allocate {	1121	sub size_allocate {
1044	my ($self, $w, $h) = @_;	1122	my ($self, $w, $h) = @_;
1045		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
1046	$h -= List::Util::max 0, $self->border * 2;	1132	$h -= List::Util::max 0, $border * 2;
1047	$w -= List::Util::max 0, $self->border * 2;	1133	$w -= List::Util::max 0, $border * 2;
1048		1134
1049	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1050	if $self->{title};
1051
1052	$self->child->configure ($self->border, $self->border, $w, $h);	1135	$self->child->configure ($border, $border, $w, $h);
1053	}	1136	}
1054		1137
1055	sub button_down {	1138	sub button_down {
1056	my ($self, $ev, $x, $y) = @_;	1139	my ($self, $ev, $x, $y) = @_;
1057		1140
…		…
1073	my ($ev, $x, $y) = @_;	1156	my ($ev, $x, $y) = @_;
1074		1157
1075	my $dx = $ev->{x} - $ox;	1158	my $dx = $ev->{x} - $ox;
1076	my $dy = $ev->{y} - $oy;	1159	my $dy = $ev->{y} - $oy;
1077		1160
1078	$self->{user_x} = $wx + $dx * $mx;
1079	$self->{user_y} = $wy + $dy * $my;
1080	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1161	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1162	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082	$self->move ($self->{user_x}, $self->{user_y});	1163
1083	$self->check_size;	1164	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
		1165	$self->realloc;
1084	};	1166	};
1085		1167
1086	} elsif ($lr ^ $td) {	1168	} elsif ($lr ^ $td) {
1087	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1169	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088	my ($bx, $by) = ($self->{x}, $self->{y});	1170	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1090	$self->{motion} = sub {	1172	$self->{motion} = sub {
1091	my ($ev, $x, $y) = @_;	1173	my ($ev, $x, $y) = @_;
1092		1174
1093	($x, $y) = ($ev->{x}, $ev->{y});	1175	($x, $y) = ($ev->{x}, $ev->{y});
1094		1176
1095	$self->{user_x} = $bx + $x - $ox;	1177	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096	$self->{user_y} = $by + $y - $oy;	1178	# HACK: the next line is required to enforce placement
1097		1179	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1098	$self->move ($self->{user_x}, $self->{user_y});
1099	$self->update;
1100	};	1180	};
		1181	} else {
		1182	return 0;
		1183	}
		1184
1101	}	1185	1
1102	}	1186	}
1103		1187
1104	sub button_up {	1188	sub button_up {
1105	my ($self, $ev, $x, $y) = @_;	1189	my ($self, $ev, $x, $y) = @_;
1106		1190
1107	delete $self->{motion};	1191	!!delete $self->{motion}
1108	}	1192	}
1109		1193
1110	sub mouse_motion {	1194	sub mouse_motion {
1111	my ($self, $ev, $x, $y) = @_;	1195	my ($self, $ev, $x, $y) = @_;
1112		1196
1113	$self->{motion}->($ev, $x, $y) if $self->{motion};	1197	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1198
		1199	!!$self->{motion}
1114	}	1200	}
1115		1201
1116	sub _draw {	1202	sub _draw {
1117	my ($self) = @_;	1203	my ($self) = @_;
1118		1204
		1205	my $child = $self->{children}[0];
		1206
1119	my ($w, $h ) = ($self->{w}, $self->{h});	1207	my ($w, $h ) = ($self->{w}, $self->{h});
1120	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1208	my ($cw, $ch) = ($child->{w}, $child->{h});
1121		1209
1122	glEnable GL_TEXTURE_2D;	1210	glEnable GL_TEXTURE_2D;
1123	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1211	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124		1212
1125	my $border = $self->border;	1213	my $border = $self->border;
1126		1214
1127	glColor @{ $self->{border_bg} };	1215	glColor @{ $self->{border_bg} };
1128	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1216	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1129	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1217	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1218	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1219	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132		1220
1133	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1221	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134	my $bg = $tex[0];	1222	glColor @{ $self->{bg} };
1135		1223
1136	# TODO: repeat texture not scale	1224	# TODO: repeat texture not scale
		1225	# solve this better(?)
1137	my $rep_x = $cw / $bg->{w};	1226	$bg->{s} = $cw / $bg->{w};
1138	my $rep_y = $ch / $bg->{h};	1227	$bg->{t} = $ch / $bg->{h};
1139
1140	glColor @{ $self->{bg} };
1141
1142	$bg->{s} = $rep_x;
1143	$bg->{t} = $rep_y;
1144	$bg->{wrap_mode} = 1;
1145	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1228	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146	}	1229	}
1147		1230
1148	glDisable GL_TEXTURE_2D;	1231	glDisable GL_TEXTURE_2D;
1149		1232
1150	$self->{title}->draw if $self->{title};
1151
1152	$self->child->draw;	1233	$child->draw;
		1234
		1235	if ($self->{title}) {
		1236	glTranslate 0, $border - $self->{h};
		1237	$self->{title}->_draw;
		1238	}
1153	}	1239	}
1154		1240
1155	#############################################################################	1241	#############################################################################
1156		1242
1157	package CFClient::UI::Table;	1243	package CFClient::UI::Table;
…		…
1179	my ($self, $x, $y, $child) = @_;	1265	my ($self, $x, $y, $child) = @_;
1180		1266
1181	$child->set_parent ($self);	1267	$child->set_parent ($self);
1182	$self->{children}[$y][$x] = $child;	1268	$self->{children}[$y][$x] = $child;
1183		1269
1184	$self->check_size (1);	1270	$self->realloc;
1185	}	1271	}
1186		1272
1187	# 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?
1188	sub clear {	1274	sub clear {
1189	my ($self) = @_;	1275	my ($self) = @_;
…		…
1194	for (@children) {	1280	for (@children) {
1195	delete $_->{parent};	1281	delete $_->{parent};
1196	$_->hide;	1282	$_->hide;
1197	}	1283	}
1198		1284
1199	$self->check_size (1);	1285	$self->realloc;
1200	$self->update;
1201	}	1286	}
1202		1287
1203	sub get_wh {	1288	sub get_wh {
1204	my ($self) = @_;	1289	my ($self) = @_;
1205		1290
…		…
1413	ellipsise => 3, # end	1498	ellipsise => 3, # end
1414	layout => (new CFClient::Layout),	1499	layout => (new CFClient::Layout),
1415	fontsize => 1,	1500	fontsize => 1,
1416	align => -1,	1501	align => -1,
1417	valign => -1,	1502	valign => -1,
1418	padding => 2,	1503	padding_x => 2,
		1504	padding_y => 2,
1419	can_events => 0,	1505	can_events => 0,
1420	%arg	1506	%arg
1421	);	1507	);
1422		1508
1423	if (exists $self->{template}) {	1509	if (exists $self->{template}) {
…		…
1459	$self->{text} = "T$text";	1545	$self->{text} = "T$text";
1460		1546
1461	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1547	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462	$self->{layout}->set_text ($text);	1548	$self->{layout}->set_text ($text);
1463		1549
		1550	$self->realloc;
1464	$self->update;	1551	$self->update;
1465	$self->check_size;
1466	}	1552	}
1467		1553
1468	sub set_markup {	1554	sub set_markup {
1469	my ($self, $markup) = @_;	1555	my ($self, $markup) = @_;
1470		1556
…		…
1474	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1560	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475		1561
1476	$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;
1477	$self->{layout}->set_markup ($markup);	1563	$self->{layout}->set_markup ($markup);
1478		1564
		1565	$self->realloc;
1479	$self->update;	1566	$self->update;
1480	$self->check_size;
1481	}	1567	}
1482		1568
1483	sub size_request {	1569	sub size_request {
1484	my ($self) = @_;	1570	my ($self) = @_;
1485		1571
…		…
1499		1585
1500	$w = List::Util::max $w, $w2;	1586	$w = List::Util::max $w, $w2;
1501	$h = List::Util::max $h, $h2;	1587	$h = List::Util::max $h, $h2;
1502	}	1588	}
1503		1589
1504	(	1590	($w, $h)
1505	$w + $self->{padding} * 2,
1506	$h + $self->{padding} * 2,
1507	)
1508	}	1591	}
1509		1592
1510	sub size_allocate {	1593	sub size_allocate {
1511	my ($self, $w, $h) = @_;	1594	my ($self, $w, $h) = @_;
1512		1595
		1596	delete $self->{ox};
		1597
1513	delete $self->{texture};	1598	delete $self->{texture}
		1599	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1514	}	1600	}
1515		1601
1516	sub set_fontsize {	1602	sub set_fontsize {
1517	my ($self, $fontsize) = @_;	1603	my ($self, $fontsize) = @_;
1518		1604
1519	$self->{fontsize} = $fontsize;	1605	$self->{fontsize} = $fontsize;
1520	delete $self->{texture};	1606	delete $self->{texture};
1521		1607
1522	$self->update;	1608	$self->realloc;
1523	$self->check_size;
1524	}	1609	}
1525		1610
1526	sub _draw {	1611	sub _draw {
1527	my ($self) = @_;	1612	my ($self) = @_;
1528		1613
…		…
1534	$self->{layout}->set_width ($self->{w});	1619	$self->{layout}->set_width ($self->{w});
1535	$self->{layout}->set_ellipsise ($self->{ellipsise});	1620	$self->{layout}->set_ellipsise ($self->{ellipsise});
1536	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1621	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1622	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538		1623
1539	my $tex = new_from_layout CFClient::Texture $self->{layout};	1624	new_from_layout CFClient::Texture $self->{layout}
		1625	};
1540		1626
		1627	unless (exists $self->{ox}) {
1541	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1628	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1542	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1629	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1543	: ($self->{w} - $tex->{w}) * 0.5);	1630	: ($self->{w} - $tex->{w}) * 0.5);
1544		1631
1545	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1632	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1546	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1633	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1547	: ($self->{h} - $tex->{h}) * 0.5);	1634	: ($self->{h} - $tex->{h}) * 0.5);
1548
1549	$tex
1550	};	1635	};
1551		1636
1552	glEnable GL_TEXTURE_2D;	1637	glEnable GL_TEXTURE_2D;
1553	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1638	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554		1639
		1640	glColor_premultiply @{$self->{fg}}
1555	if ($tex->{format} == GL_ALPHA) {	1641	if $tex->{format} == GL_ALPHA;
1556	glColor @{$self->{fg}};	1642
1557	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1558	} else {
1559	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1643	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1560	}
1561		1644
1562	glDisable GL_TEXTURE_2D;	1645	glDisable GL_TEXTURE_2D;
1563	}	1646	}
1564		1647
1565	#############################################################################	1648	#############################################################################
…		…
1592		1675
1593	delete $self->{cur_h};	1676	delete $self->{cur_h};
1594		1677
1595	return if $self->{text} eq $text;	1678	return if $self->{text} eq $text;
1596		1679
1597	delete $self->{texture};
1598
1599	$self->{last_activity} = $::NOW;	1680	$self->{last_activity} = $::NOW;
1600	$self->{text} = $text;	1681	$self->{text} = $text;
1601		1682
1602	$text =~ s/./*/g if $self->{hidden};	1683	$text =~ s/./*/g if $self->{hidden};
1603	$self->{layout}->set_text ("$text ");	1684	$self->{layout}->set_text ("$text ");
1604		1685
1605	$self->_emit (changed => $self->{text});	1686	$self->_emit (changed => $self->{text});
		1687	$self->update;
1606	}	1688	}
1607		1689
1608	sub set_text {	1690	sub set_text {
1609	my ($self, $text) = @_;	1691	my ($self, $text) = @_;
1610		1692
1611	$self->{cursor} = length $text;	1693	$self->{cursor} = length $text;
1612	$self->_set_text ($text);	1694	$self->_set_text ($text);
1613	$self->update;	1695
1614	$self->check_size;	1696	$self->realloc;
1615	}	1697	}
1616		1698
1617	sub get_text {	1699	sub get_text {
1618	$_[0]{text}	1700	$_[0]{text}
1619	}	1701	}
…		…
1649	$self->{cursor} = length $text;	1731	$self->{cursor} = length $text;
1650	} elsif ($uni == 27) {	1732	} elsif ($uni == 27) {
1651	$self->_emit ('escape');	1733	$self->_emit ('escape');
1652	} elsif ($uni) {	1734	} elsif ($uni) {
1653	substr $text, $self->{cursor}++, 0, chr $uni;	1735	substr $text, $self->{cursor}++, 0, chr $uni;
		1736	} else {
		1737	return 0;
1654	}	1738	}
1655		1739
1656	$self->_set_text ($text);	1740	$self->_set_text ($text);
1657	$self->update;	1741
1658	$self->check_size;	1742	$self->realloc;
		1743
		1744	1
1659	}	1745	}
1660		1746
1661	sub focus_in {	1747	sub focus_in {
1662	my ($self) = @_;	1748	my ($self) = @_;
1663		1749
…		…
1678	utf8::encode $text;	1764	utf8::encode $text;
1679	$self->{cursor} = length substr $text, 0, $idx;	1765	$self->{cursor} = length substr $text, 0, $idx;
1680		1766
1681	$self->_set_text ($self->{text});	1767	$self->_set_text ($self->{text});
1682	$self->update;	1768	$self->update;
		1769
		1770	1
1683	}	1771	}
1684		1772
1685	sub mouse_motion {	1773	sub mouse_motion {
1686	my ($self, $ev, $x, $y) = @_;	1774	my ($self, $ev, $x, $y) = @_;
1687	# 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
1688	}	1778	}
1689		1779
1690	sub _draw {	1780	sub _draw {
1691	my ($self) = @_;	1781	my ($self) = @_;
1692		1782
1693	local $self->{fg} = $self->{fg};	1783	local $self->{fg} = $self->{fg};
1694		1784
1695	if ($FOCUS == $self) {	1785	if ($FOCUS == $self) {
1696	glColor @{$self->{active_bg}};	1786	glColor_premultiply @{$self->{active_bg}};
1697	$self->{fg} = $self->{active_fg};	1787	$self->{fg} = $self->{active_fg};
1698	} else {	1788	} else {
1699	glColor @{$self->{bg}};	1789	glColor_premultiply @{$self->{bg}};
1700	}	1790	}
1701		1791
1702	glEnable GL_BLEND;	1792	glEnable GL_BLEND;
1703	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1793	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1704	glBegin GL_QUADS;	1794	glBegin GL_QUADS;
1705	glVertex 0 , 0;	1795	glVertex 0 , 0;
1706	glVertex 0 , $self->{h};	1796	glVertex 0 , $self->{h};
1707	glVertex $self->{w}, $self->{h};	1797	glVertex $self->{w}, $self->{h};
1708	glVertex $self->{w}, 0;	1798	glVertex $self->{w}, 0;
…		…
1769	} else {	1859	} else {
1770	$self->set_text ($self->{history_saveback});	1860	$self->set_text ($self->{history_saveback});
1771	}	1861	}
1772		1862
1773	} else {	1863	} else {
1774	$self->SUPER::key_down ($ev);	1864	return $self->SUPER::key_down ($ev)
		1865	}
		1866
1775	}	1867	1
1776
1777	}	1868	}
1778		1869
1779	#############################################################################	1870	#############################################################################
1780		1871
1781	package CFClient::UI::Button;	1872	package CFClient::UI::Button;
…		…
1790		1881
1791	sub new {	1882	sub new {
1792	my $class = shift;	1883	my $class = shift;
1793		1884
1794	$class->SUPER::new (	1885	$class->SUPER::new (
1795	padding => 4,	1886	padding_x => 4,
		1887	padding_y => 4,
1796	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1797	active_fg => [0, 0, 1],	1889	active_fg => [0, 0, 1],
1798	can_hover => 1,	1890	can_hover => 1,
1799	align => 0,	1891	align => 0,
1800	valign => 0,	1892	valign => 0,
…		…
1809	my ($self, $ev, $x, $y) = @_;	1901	my ($self, $ev, $x, $y) = @_;
1810		1902
1811	$self->emit ("activate")	1903	$self->emit ("activate")
1812	if $x >= 0 && $x < $self->{w}	1904	if $x >= 0 && $x < $self->{w}
1813	&& $y >= 0 && $y < $self->{h};	1905	&& $y >= 0 && $y < $self->{h};
		1906
		1907	1
1814	}	1908	}
1815		1909
1816	sub _draw {	1910	sub _draw {
1817	my ($self) = @_;	1911	my ($self) = @_;
1818		1912
1819	local $self->{fg} = $self->{fg};	1913	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1820
1821	if ($GRAB == $self) {
1822	$self->{fg} = $self->{active_fg};
1823	}
1824		1914
1825	glEnable GL_TEXTURE_2D;	1915	glEnable GL_TEXTURE_2D;
1826	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1916	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1827	glColor 0, 0, 0, 1;	1917	glColor 0, 0, 0, 1;
1828		1918
…		…
1847		1937
1848	sub new {	1938	sub new {
1849	my $class = shift;	1939	my $class = shift;
1850		1940
1851	$class->SUPER::new (	1941	$class->SUPER::new (
1852	padding => 2,	1942	padding_x => 2,
		1943	padding_y => 2,
1853	fg => [1, 1, 1],	1944	fg => [1, 1, 1],
1854	active_fg => [1, 1, 0],	1945	active_fg => [1, 1, 0],
1855	bg => [0, 0, 0, 0.2],	1946	bg => [0, 0, 0, 0.2],
1856	active_bg => [1, 1, 1, 0.5],	1947	active_bg => [1, 1, 1, 0.5],
1857	state => 0,	1948	state => 0,
…		…
1861	}	1952	}
1862		1953
1863	sub size_request {	1954	sub size_request {
1864	my ($self) = @_;	1955	my ($self) = @_;
1865		1956
1866	($self->{padding} * 2 + 6) x 2	1957	(6) x 2
1867	}	1958	}
1868		1959
1869	sub button_down {	1960	sub button_down {
1870	my ($self, $ev, $x, $y) = @_;	1961	my ($self, $ev, $x, $y) = @_;
1871		1962
1872	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1963	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1964	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874	$self->{state} = !$self->{state};	1965	$self->{state} = !$self->{state};
1875	$self->_emit (changed => $self->{state});	1966	$self->_emit (changed => $self->{state});
		1967	} else {
		1968	return 0
		1969	}
		1970
1876	}	1971	1
1877	}	1972	}
1878		1973
1879	sub _draw {	1974	sub _draw {
1880	my ($self) = @_;	1975	my ($self) = @_;
1881		1976
1882	$self->SUPER::_draw;	1977	$self->SUPER::_draw;
1883		1978
1884	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1979	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885		1980
1886	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;
1887		1984
1888	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1985	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889		1986
1890	my $tex = $self->{state} ? $tex[1] : $tex[0];	1987	my $tex = $self->{state} ? $tex[1] : $tex[0];
1891		1988
…		…
2046		2143
2047	my $h1 = $self->{h} * (1 - $ycut1);	2144	my $h1 = $self->{h} * (1 - $ycut1);
2048	my $h2 = $self->{h} * (1 - $ycut2);	2145	my $h2 = $self->{h} * (1 - $ycut2);
2049		2146
2050	glEnable GL_BLEND;	2147	glEnable GL_BLEND;
2051	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;
2052	glEnable GL_TEXTURE_2D;	2150	glEnable GL_TEXTURE_2D;
2053	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054		2152
2055	glBindTexture GL_TEXTURE_2D, $t1->{name};	2153	glBindTexture GL_TEXTURE_2D, $t1->{name};
2056	glBegin GL_QUADS;	2154	glBegin GL_QUADS;
…		…
2156	fg => [1, 1, 1],	2254	fg => [1, 1, 1],
2157	active_fg => [0, 0, 0],	2255	active_fg => [0, 0, 0],
2158	bg => [0, 0, 0, 0.2],	2256	bg => [0, 0, 0, 0.2],
2159	active_bg => [1, 1, 1, 0.5],	2257	active_bg => [1, 1, 1, 0.5],
2160	range => [0, 0, 100, 10, 0],	2258	range => [0, 0, 100, 10, 0],
2161	req_w => $::WIDTH / 80,	2259	min_w => $::WIDTH / 80,
2162	req_h => $::WIDTH / 80,	2260	min_h => $::WIDTH / 80,
2163	vertical => 0,	2261	vertical => 0,
2164	can_hover => 1,	2262	can_hover => 1,
2165	inner_pad => 0.02,	2263	inner_pad => 0.02,
2166	@_	2264	@_
2167	);	2265	);
…		…
2170	$self->update;	2268	$self->update;
2171		2269
2172	$self	2270	$self
2173	}	2271	}
2174		2272
		2273	sub changed { }
		2274
2175	sub set_range {	2275	sub set_range {
2176	my ($self, $range) = @_;	2276	my ($self, $range) = @_;
2177		2277
2178	($range, $self->{range}) = ($self->{range}, $range);	2278	($range, $self->{range}) = ($self->{range}, $range);
2179		2279
…		…
2205	}	2305	}
2206		2306
2207	sub size_request {	2307	sub size_request {
2208	my ($self) = @_;	2308	my ($self) = @_;
2209		2309
2210	my $w = $self->{req_w};	2310	($self->{req_w}, $self->{req_h})
2211	my $h = $self->{req_h};
2212
2213	$self->{vertical} ? ($h, $w) : ($w, $h)
2214	}	2311	}
2215		2312
2216	sub button_down {	2313	sub button_down {
2217	my ($self, $ev, $x, $y) = @_;	2314	my ($self, $ev, $x, $y) = @_;
2218		2315
2219	$self->SUPER::button_down ($ev, $x, $y);	2316	$self->SUPER::button_down ($ev, $x, $y);
2220		2317
2221	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2318	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222		2319
2223	$self->mouse_motion ($ev, $x, $y);	2320	$self->mouse_motion ($ev, $x, $y)
2224	}	2321	}
2225		2322
2226	sub mouse_motion {	2323	sub mouse_motion {
2227	my ($self, $ev, $x, $y) = @_;	2324	my ($self, $ev, $x, $y) = @_;
2228		2325
…		…
2232	my (undef, $lo, $hi, $page) = @{$self->{range}};	2329	my (undef, $lo, $hi, $page) = @{$self->{range}};
2233		2330
2234	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2331	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235		2332
2236	$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
2237	}	2338	1
2238	}	2339	}
2239		2340
2240	sub update {	2341	sub update {
2241	my ($self) = @_;	2342	my ($self) = @_;
2242		2343
2243	$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}) {
2244	$self->set_value ($self->{range}[0]);	2352	$self->set_value ($self->{range}[0]);
2245		2353
2246	my ($value, $lo, $hi, $page) = @{$self->{range}};	2354	my ($value, $lo, $hi, $page) = @{$self->{range}};
2247	my $range = ($hi - $page - $lo) || 1e-100;	2355	my $range = ($hi - $page - $lo) || 1e-100;
2248		2356
…		…
2254	$value = ($value - $lo) / $range;	2362	$value = ($value - $lo) / $range;
2255	$value = $value * $self->{scale} + $self->{offset};	2363	$value = $value * $self->{scale} + $self->{offset};
2256		2364
2257	$self->{knob_x} = $value - $knob_w * 0.5;	2365	$self->{knob_x} = $value - $knob_w * 0.5;
2258	$self->{knob_w} = $knob_w;	2366	$self->{knob_w} = $knob_w;
2259	});	2367	}
2260
2261	$self->SUPER::update;
2262	}
2263
2264	sub _draw {
2265	my ($self) = @_;
2266		2368
2267	$self->SUPER::_draw ();	2369	$self->SUPER::_draw ();
2268		2370
2269	glScale $self->{w}, $self->{h};	2371	glScale $self->{w}, $self->{h};
2270		2372
…		…
2464		2566
2465	delete $self->{texture};	2567	delete $self->{texture};
2466	}	2568	}
2467		2569
2468	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2570	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2469	glClearColor 0.5, 0.5, 0.5, 0;	2571	glClearColor 0, 0, 0, 0;
2470	glClear GL_COLOR_BUFFER_BIT;	2572	glClear GL_COLOR_BUFFER_BIT;
2471		2573
2472	my $top = int $self->{children}[1]{range}[0];	2574	my $top = int $self->{children}[1]{range}[0];
2473		2575
2474	my $y0 = $top;	2576	my $y0 = $top;
…		…
2509	sub _draw {	2611	sub _draw {
2510	my ($self) = @_;	2612	my ($self) = @_;
2511		2613
2512	glEnable GL_TEXTURE_2D;	2614	glEnable GL_TEXTURE_2D;
2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2615	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514	glColor 1, 1, 1, 1;	2616	glColor 0, 0, 0, 1;
2515	$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});
2516	glDisable GL_TEXTURE_2D;	2618	glDisable GL_TEXTURE_2D;
2517		2619
2518	$self->{children}[1]->draw;	2620	$self->{children}[1]->draw;
2519		2621
2520	}	2622	}
…		…
2603	}	2705	}
2604		2706
2605	sub set_tooltip_from {	2707	sub set_tooltip_from {
2606	my ($self, $widget) = @_;	2708	my ($self, $widget) = @_;
2607		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
2608	$self->add (new CFClient::UI::Label	2719	$self->add (new CFClient::UI::Label
2609	markup => $widget->{tooltip},	2720	markup => $tooltip,
2610	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2721	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611	fontsize => 0.8,	2722	fontsize => 0.8,
2612	fg => [0, 0, 0, 1],	2723	fg => [0, 0, 0, 1],
2613	ellipsise => 0,	2724	ellipsise => 0,
2614	font => ($widget->{tooltip_font} || $::FONT_PROP),	2725	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2625		2736
2626	sub size_allocate {	2737	sub size_allocate {
2627	my ($self, $w, $h) = @_;	2738	my ($self, $w, $h) = @_;
2628		2739
2629	$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	});
2630	}	2759	}
2631		2760
2632	sub _draw {	2761	sub _draw {
2633	my ($self) = @_;	2762	my ($self) = @_;
2634		2763
…		…
2651	glVertex $w, $h;	2780	glVertex $w, $h;
2652	glVertex $w, 0;	2781	glVertex $w, 0;
2653	glEnd;	2782	glEnd;
2654		2783
2655	glTranslate 2 - 0.375, 2 - 0.375;	2784	glTranslate 2 - 0.375, 2 - 0.375;
		2785
2656	$self->SUPER::_draw;	2786	$self->SUPER::_draw;
2657	}	2787	}
2658		2788
2659	#############################################################################	2789	#############################################################################
2660		2790
…		…
2719	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2849	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2720		2850
2721	if ($tex) {	2851	if ($tex) {
2722	glEnable GL_TEXTURE_2D;	2852	glEnable GL_TEXTURE_2D;
2723	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2853	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2724	glColor 1, 1, 1, 1;	2854	glColor 0, 0, 0, 1;
2725	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2855	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2726	glDisable GL_TEXTURE_2D;	2856	glDisable GL_TEXTURE_2D;
2727	}	2857	}
2728	}	2858	}
2729		2859
…		…
2736	$self->SUPER::DESTROY;	2866	$self->SUPER::DESTROY;
2737	}	2867	}
2738		2868
2739	#############################################################################	2869	#############################################################################
2740		2870
2741	package CFClient::UI::Inventory;	2871	package CFClient::UI::Buttonbar;
2742		2872
2743	our @ISA = CFClient::UI::ScrolledWindow::;	2873	our @ISA = CFClient::UI::HBox::;
2744		2874
2745	sub new {	2875	# TODO: should actualyl wrap buttons and other goodies.
2746	my $class = shift;
2747
2748	my $self = $class->SUPER::new (
2749	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2750	@_,
2751	);
2752
2753	$self
2754	}
2755
2756	sub set_items {
2757	my ($self, $items) = @_;
2758
2759	$self->{scrolled}->clear;
2760	return unless $items;
2761
2762	my @items = sort {
2763	($a->{type} <=> $b->{type})
2764	or ($a->{name} cmp $b->{name})
2765	} @$items;
2766
2767	$self->{real_items} = \@items;
2768
2769	my $row = 0;
2770	for my $item (@items) {
2771	CFClient::Item::update_widgets $item;
2772
2773	$self->{scrolled}->add (0, $row, $item->{face_widget});
2774	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2775	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2776
2777	$row++;
2778	}
2779	}
2780		2876
2781	#############################################################################	2877	#############################################################################
2782		2878
2783	package CFClient::UI::Menu;	2879	package CFClient::UI::Menu;
2784		2880
…		…
2825	# maybe save $GRAB? must be careful about events...	2921	# maybe save $GRAB? must be careful about events...
2826	$GRAB = $self;	2922	$GRAB = $self;
2827	$self->{button} = $ev->{button};	2923	$self->{button} = $ev->{button};
2828		2924
2829	$self->show;	2925	$self->show;
2830	$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);
2831	}	2927	}
2832		2928
2833	sub mouse_motion {	2929	sub mouse_motion {
2834	my ($self, $ev, $x, $y) = @_;	2930	my ($self, $ev, $x, $y) = @_;
2835		2931
2836	# TODO: should use vbox->find_widget or so	2932	# TODO: should use vbox->find_widget or so
2837	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2933	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838	$self->{hover} = $self->{item}{$HOVER};	2934	$self->{hover} = $self->{item}{$HOVER};
		2935
		2936	0
2839	}	2937	}
2840		2938
2841	sub button_up {	2939	sub button_up {
2842	my ($self, $ev, $x, $y) = @_;	2940	my ($self, $ev, $x, $y) = @_;
2843		2941
…		…
2845	undef $GRAB;	2943	undef $GRAB;
2846	$self->hide;	2944	$self->hide;
2847		2945
2848	$self->_emit ("popdown");	2946	$self->_emit ("popdown");
2849	$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	);
2850	}	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});
2851	}	3061	}
2852		3062
2853	#############################################################################	3063	#############################################################################
2854		3064
2855	package CFClient::UI::Statusbox;	3065	package CFClient::UI::Statusbox;
…		…
2960	$self->SUPER::reconfigure;	3170	$self->SUPER::reconfigure;
2961	}	3171	}
2962		3172
2963	#############################################################################	3173	#############################################################################
2964		3174
2965	package CFClient::UI::Root;	3175	package CFClient::UI::Inventory;
2966		3176
2967	our @ISA = CFClient::UI::Container::;	3177	our @ISA = CFClient::UI::ScrolledWindow::;
2968
2969	use CFClient::OpenGL;
2970		3178
2971	sub new {	3179	sub new {
2972	my $class = shift;	3180	my $class = shift;
2973		3181
2974	$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 (
2975	visible => 1,	3480	visible => 1,
2976	@_,	3481	@_,
2977	)	3482	);
2978	}
2979		3483
2980	sub configure {	3484	Scalar::Util::weaken ($self->{root} = $self);
2981	my ($self, $x, $y, $w, $h) = @_;
2982		3485
2983	$self->{w} = $w;	3486	$self
2984	$self->{h} = $h;
2985	}
2986
2987	sub check_size {
2988	my ($self) = @_;
2989
2990	$self->size_allocate ($self->{w}, $self->{h})
2991	if $self->{w};
2992	}	3487	}
2993		3488
2994	sub size_request {	3489	sub size_request {
2995	my ($self) = @_;	3490	my ($self) = @_;
2996		3491
2997	($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
2998	}	3507	}
2999		3508
3000	sub size_allocate {	3509	sub size_allocate {
3001	my ($self, $w, $h) = @_;	3510	my ($self, $w, $h) = @_;
3002		3511
3003	for my $child ($self->children) {	3512	for my $child ($self->children) {
3004	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)};
3005		3514
3006	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3515	$X = $child->{force_x} if exists $child->{force_x};
3007	if exists $child->{req_x};	3516	$Y = $child->{force_y} if exists $child->{force_y};
3008		3517
3009	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3518	$X = _to_pixel $X, $W, $self->{w};
3010	if exists $child->{req_y};	3519	$Y = _to_pixel $Y, $H, $self->{h};
3011
3012	delete @$child{qw(req_x req_y)};
3013
3014	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3015	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3016		3520
3017	$child->configure ($X, $Y, $W, $H);	3521	$child->configure ($X, $Y, $W, $H);
3018	}	3522	}
3019	}	3523	}
3020		3524
…		…
3031	}	3535	}
3032		3536
3033	sub update {	3537	sub update {
3034	my ($self) = @_;	3538	my ($self) = @_;
3035		3539
3036	$self->check_size;
3037	$::WANT_REFRESH++;	3540	$::WANT_REFRESH++;
3038	}	3541	}
3039		3542
3040	sub add {	3543	sub add {
3041	my ($self, @children) = @_;	3544	my ($self, @children) = @_;
3042		3545
3043	for my $child (@children) {
3044	$child->{is_toplevel} = 1;	3546	$_->{is_toplevel} = 1
3045		3547	for @children;
3046	# integerise window positions
3047	$child->{x} = int $child->{x};
3048	$child->{y} = int $child->{y};
3049	}
3050		3548
3051	$self->SUPER::add (@children);	3549	$self->SUPER::add (@children);
3052
3053	for (my @widgets = @children; my $w = pop @widgets; ) {
3054	push @widgets, $w->children;
3055	$w->set_visible;
3056	}
3057
3058	}	3550	}
3059		3551
3060	sub remove {	3552	sub remove {
3061	my ($self, @children) = @_;	3553	my ($self, @children) = @_;
3062		3554
3063	$self->SUPER::remove (@children);	3555	$self->SUPER::remove (@children);
		3556
		3557	delete $self->{is_toplevel}
		3558	for @children;
3064		3559
3065	while (@children) {	3560	while (@children) {
3066	my $w = pop @children;	3561	my $w = pop @children;
3067	push @children, $w->children;	3562	push @children, $w->children;
3068	$w->set_invisible;	3563	$w->set_invisible;
…		…
3087	while ($self->{refresh_hook}) {	3582	while ($self->{refresh_hook}) {
3088	$_->()	3583	$_->()
3089	for values %{delete $self->{refresh_hook}};	3584	for values %{delete $self->{refresh_hook}};
3090	}	3585	}
3091		3586
3092	if ($self->{check_size}) {	3587	if ($self->{realloc}) {
		3588	my %queue;
3093	my @queue;	3589	my @queue;
		3590	my $widget;
3094		3591
3095	for (;;) {	3592	outer:
3096	if ($self->{check_size}) {	3593	while () {
3097	#TODO use array-of-depth approach	3594	if (my $realloc = delete $self->{realloc}) {
		3595	for $widget (values %$realloc) {
		3596	$widget->{visible} or next; # do not resize invisible widgets
3098		3597
3099	@queue = sort { $a->{visible} <=> $b->{visible} }	3598	$queue{$widget+0}++ and next; # duplicates are common
3100	@queue, values %{delete $self->{check_size}};	3599
		3600	push @{ $queue[$widget->{visible}] }, $widget;
		3601	}
3101	}	3602	}
3102		3603
		3604	while () {
		3605	@queue or last outer;
		3606
3103	my $widget = pop @queue || last;	3607	$widget = pop @{ $queue[-1] || [] }
3104		3608	and last;
3105	defined $widget->{visible} or last; # do not resize invisible widgets
3106
3107	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3108	? @$widget{qw(def_w def_h)}
3109	: $widget->size_request;
3110
3111	if (delete $widget->{force_alloc}
3112	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3113	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3114		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}) {
3115	$widget->{req_w} = $w;	3625	$widget->{req_w} = $w;
3116	$widget->{req_h} = $h;	3626	$widget->{req_h} = $h;
3117		3627
3118	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3628	$self->{size_alloc}{$widget+0} = $widget;
3119		3629
3120	$widget->{parent}->check_size
3121	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	}
3122	}	3637	}
		3638
		3639	delete $self->{realloc}{$widget+0};
3123	}	3640	}
3124	}	3641	}
3125		3642
3126	while ($self->{size_alloc}) {	3643	while (my $size_alloc = delete $self->{size_alloc}) {
3127	for (values %{delete $self->{size_alloc}}) {	3644	my @queue = sort { $b->{visible} <=> $a->{visible} }
3128	my ($widget, $w, $h) = @$_;	3645	values %$size_alloc;
		3646
		3647	while () {
		3648	my $widget = pop @queue || last;
		3649
		3650	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129		3651
3130	$w = 0 if $w < 0;	3652	$w = 0 if $w < 0;
3131	$h = 0 if $h < 0;	3653	$h = 0 if $h < 0;
3132		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
3133	$widget->{w} = $w;	3662	$widget->{w} = $w;
3134	$widget->{h} = $h;	3663	$widget->{h} = $h;
		3664
3135	$widget->emit (size_allocate => $w, $h);	3665	$widget->emit (size_allocate => $w, $h);
		3666	}
3136	}	3667	}
3137	}	3668	}
3138		3669
3139	while ($self->{post_alloc_hook}) {	3670	while ($self->{post_alloc_hook}) {
3140	$_->()	3671	$_->()
3141	for values %{delete $self->{post_alloc_hook}};	3672	for values %{delete $self->{post_alloc_hook}};
3142	}	3673	}
		3674
3143		3675
3144	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3676	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3677	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146	glClear GL_COLOR_BUFFER_BIT;	3678	glClear GL_COLOR_BUFFER_BIT;
3147		3679
…		…
3149	glLoadIdentity;	3681	glLoadIdentity;
3150	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3682	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151	glMatrixMode GL_MODELVIEW;	3683	glMatrixMode GL_MODELVIEW;
3152	glLoadIdentity;	3684	glLoadIdentity;
3153		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
3154	$self->_draw;	3693	$self->_draw;
3155	}	3694	}
3156		3695
3157	#############################################################################	3696	#############################################################################
3158		3697

Diff Legend

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