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.278 by root, Sun Jun 4 23:05:06 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;
		860	glEnable GL_BLEND;
		861	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
820	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
821		863
822	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad (0, 0, $w, $h);
823		865
		866	glDisable GL_BLEND;
824	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
825	}	868	}
826		869
827	#############################################################################	870	#############################################################################
828		871
…		…
841	}	884	}
842		885
843	sub size_request {	886	sub size_request {
844	my ($self) = @_;	887	my ($self) = @_;
845		888
846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	889	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847		890
848	$w = 10 if $self->{scroll_x};	891	$w = 10 if $self->{scroll_x};
849	$h = 10 if $self->{scroll_y};	892	$h = 10 if $self->{scroll_y};
850		893
851	($w, $h)	894	($w, $h)
852	}	895	}
853		896
854	sub size_allocate {	897	sub size_allocate {
855	my ($self, $w, $h) = @_;	898	my ($self, $w, $h) = @_;
856		899
		900	my $child = $self->child;
		901
857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859		904
860	$self->child->configure (0, 0, $w, $h);	905	$self->child->configure (0, 0, $w, $h);
861	$self->update;	906	$self->update;
862	}	907	}
863		908
…		…
899	}	944	}
900		945
901	sub _render {	946	sub _render {
902	my ($self) = @_;	947	my ($self) = @_;
903		948
		949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		950	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		951
904	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905		953
906	$self->SUPER::_render;	954	$self->SUPER::_render;
907	}	955	}
908		956
…		…
911	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
912		960
913	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
914		962
915	sub new {	963	sub new {
916	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
917		967
918	my $self;	968	my $self;
919		969
920	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
921	vertical => 1,	971	vertical => 1,
…		…
926	;	976	;
927		977
928	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
929	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
930	slider => $slider,	980	slider => $slider,
931	@_,	981	%arg,
932	);	982	);
933		983
934	$self->{vp}->add ($self->{scrolled});
935	$self->add ($self->{vp});
936	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
937		986
938	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
939	}	994	}
940		995
941	sub update {	996	sub update {
942	my ($self) = @_;	997	my ($self) = @_;
943		998
…		…
982		1037
983	if ($self->{bg}) {	1038	if ($self->{bg}) {
984	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
985		1040
986	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
987	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
989		1044
990	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
991	glVertex 0 , 0;	1046	glVertex 0 , 0;
992	glVertex 0 , $h;	1047	glVertex 0 , $h;
993	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1006		1061
1007	our @ISA = CFClient::UI::Bin::;	1062	our @ISA = CFClient::UI::Bin::;
1008		1063
1009	use CFClient::OpenGL;	1064	use CFClient::OpenGL;
1010		1065
1011	my @tex =	1066	my $bg =
		1067	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1068	mipmap => 1, wrap => 1;
		1069
		1070	my @border =
1012	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1071	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);	1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014		1073
1015	sub new {	1074	sub new {
1016	my $class = shift;	1075	my ($class, %arg) = @_;
		1076
		1077	my $title = delete $arg{title};
1017		1078
1018	my $self = $class->SUPER::new (	1079	my $self = $class->SUPER::new (
1019	bg => [1, 1, 1, 1],	1080	bg => [1, 1, 1, 1],
1020	border_bg => [1, 1, 1, 1],	1081	border_bg => [1, 1, 1, 1],
1021	border => 0.6,	1082	border => 0.6,
1022	is_toplevel => 1,
1023	can_events => 1,	1083	can_events => 1,
1024	@_	1084	min_w => 16,
		1085	min_h => 16,
		1086	%arg,
1025	);	1087	);
1026		1088
1027	$self->{title} &&= new CFClient::UI::Label	1089	$self->{title} = new CFClient::UI::Label
1028	align => 0,	1090	align => 0,
1029	valign => 1,	1091	valign => 1,
1030	text => $self->{title},	1092	text => $title,
1031	fontsize => $self->{border};	1093	fontsize => $self->{border}
		1094	if defined $title;
1032		1095
1033	$self	1096	$self
		1097	}
		1098
		1099	sub add {
		1100	my ($self, @widgets) = @_;
		1101
		1102	$self->SUPER::add (@widgets);
		1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1034	}	1104	}
1035		1105
1036	sub border {	1106	sub border {
1037	int $_[0]{border} * $::FONTSIZE	1107	int $_[0]{border} * $::FONTSIZE
1038	}	1108	}
1039		1109
1040	sub size_request {	1110	sub size_request {
1041	my ($self) = @_;	1111	my ($self) = @_;
		1112
		1113	$self->{title}->size_request
		1114	if $self->{title};
1042		1115
1043	my ($w, $h) = $self->SUPER::size_request;	1116	my ($w, $h) = $self->SUPER::size_request;
1044		1117
1045	(	1118	(
1046	$w + $self->border * 2,	1119	$w + $self->border * 2,
…		…
1049	}	1122	}
1050		1123
1051	sub size_allocate {	1124	sub size_allocate {
1052	my ($self, $w, $h) = @_;	1125	my ($self, $w, $h) = @_;
1053		1126
		1127	if ($self->{title}) {
		1128	$self->{title}{w} = $w;
		1129	$self->{title}{h} = $h;
		1130	$self->{title}->size_allocate ($w, $h);
		1131	}
		1132
		1133	my $border = $self->border;
		1134
1054	$h -= List::Util::max 0, $self->border * 2;	1135	$h -= List::Util::max 0, $border * 2;
1055	$w -= List::Util::max 0, $self->border * 2;	1136	$w -= List::Util::max 0, $border * 2;
1056		1137
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);	1138	$self->child->configure ($border, $border, $w, $h);
1061	}	1139	}
1062		1140
1063	sub button_down {	1141	sub button_down {
1064	my ($self, $ev, $x, $y) = @_;	1142	my ($self, $ev, $x, $y) = @_;
1065		1143
…		…
1081	my ($ev, $x, $y) = @_;	1159	my ($ev, $x, $y) = @_;
1082		1160
1083	my $dx = $ev->{x} - $ox;	1161	my $dx = $ev->{x} - $ox;
1084	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1085		1163
1086	$self->{user_x} = $wx + $dx * $mx;
1087	$self->{user_y} = $wy + $dy * $my;
1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090	$self->move ($self->{user_x}, $self->{user_y});	1166
1091	$self->check_size;	1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
		1168	$self->realloc;
1092	};	1169	};
1093		1170
1094	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1098	$self->{motion} = sub {	1175	$self->{motion} = sub {
1099	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1100		1177
1101	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1102		1179
1103	$self->{user_x} = $bx + $x - $ox;	1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104	$self->{user_y} = $by + $y - $oy;	1181	# HACK: the next line is required to enforce placement
1105		1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1106	$self->move ($self->{user_x}, $self->{user_y});
1107	$self->update;
1108	};	1183	};
		1184	} else {
		1185	return 0;
		1186	}
		1187
1109	}	1188	1
1110	}	1189	}
1111		1190
1112	sub button_up {	1191	sub button_up {
1113	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1114		1193
1115	delete $self->{motion};	1194	!!delete $self->{motion}
1116	}	1195	}
1117		1196
1118	sub mouse_motion {	1197	sub mouse_motion {
1119	my ($self, $ev, $x, $y) = @_;	1198	my ($self, $ev, $x, $y) = @_;
1120		1199
1121	$self->{motion}->($ev, $x, $y) if $self->{motion};	1200	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1201
		1202	!!$self->{motion}
1122	}	1203	}
1123		1204
1124	sub _draw {	1205	sub _draw {
1125	my ($self) = @_;	1206	my ($self) = @_;
1126		1207
		1208	my $child = $self->{children}[0];
		1209
1127	my ($w, $h ) = ($self->{w}, $self->{h});	1210	my ($w, $h ) = ($self->{w}, $self->{h});
1128	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1211	my ($cw, $ch) = ($child->{w}, $child->{h});
1129		1212
1130	glEnable GL_TEXTURE_2D;	1213	glEnable GL_TEXTURE_2D;
1131	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132		1215
1133	my $border = $self->border;	1216	my $border = $self->border;
1134		1217
1135	glColor @{ $self->{border_bg} };	1218	glColor @{ $self->{border_bg} };
1136	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1219	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1137	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1220	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1138	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1221	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1139	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1222	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1140		1223
1141	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1224	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142	my $bg = $tex[0];	1225	glColor @{ $self->{bg} };
1143		1226
1144	# TODO: repeat texture not scale	1227	# TODO: repeat texture not scale
		1228	# solve this better(?)
1145	my $rep_x = $cw / $bg->{w};	1229	$bg->{s} = $cw / $bg->{w};
1146	my $rep_y = $ch / $bg->{h};	1230	$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);	1231	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154	}	1232	}
1155		1233
1156	glDisable GL_TEXTURE_2D;	1234	glDisable GL_TEXTURE_2D;
1157		1235
1158	$self->{title}->draw if $self->{title};
1159
1160	$self->child->draw;	1236	$child->draw;
		1237
		1238	if ($self->{title}) {
		1239	glTranslate 0, $border - $self->{h};
		1240	$self->{title}->_draw;
		1241	}
1161	}	1242	}
1162		1243
1163	#############################################################################	1244	#############################################################################
1164		1245
1165	package CFClient::UI::Table;	1246	package CFClient::UI::Table;
…		…
1187	my ($self, $x, $y, $child) = @_;	1268	my ($self, $x, $y, $child) = @_;
1188		1269
1189	$child->set_parent ($self);	1270	$child->set_parent ($self);
1190	$self->{children}[$y][$x] = $child;	1271	$self->{children}[$y][$x] = $child;
1191		1272
1192	$self->check_size (1);	1273	$self->realloc;
1193	}	1274	}
1194		1275
1195	# TODO: move to container class maybe? send children a signal on removal?	1276	# TODO: move to container class maybe? send children a signal on removal?
1196	sub clear {	1277	sub clear {
1197	my ($self) = @_;	1278	my ($self) = @_;
…		…
1202	for (@children) {	1283	for (@children) {
1203	delete $_->{parent};	1284	delete $_->{parent};
1204	$_->hide;	1285	$_->hide;
1205	}	1286	}
1206		1287
1207	$self->check_size (1);	1288	$self->realloc;
1208	$self->update;
1209	}	1289	}
1210		1290
1211	sub get_wh {	1291	sub get_wh {
1212	my ($self) = @_;	1292	my ($self) = @_;
1213		1293
…		…
1421	ellipsise => 3, # end	1501	ellipsise => 3, # end
1422	layout => (new CFClient::Layout),	1502	layout => (new CFClient::Layout),
1423	fontsize => 1,	1503	fontsize => 1,
1424	align => -1,	1504	align => -1,
1425	valign => -1,	1505	valign => -1,
1426	padding => 2,	1506	padding_x => 2,
		1507	padding_y => 2,
1427	can_events => 0,	1508	can_events => 0,
1428	%arg	1509	%arg
1429	);	1510	);
1430		1511
1431	if (exists $self->{template}) {	1512	if (exists $self->{template}) {
…		…
1467	$self->{text} = "T$text";	1548	$self->{text} = "T$text";
1468		1549
1469	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1550	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470	$self->{layout}->set_text ($text);	1551	$self->{layout}->set_text ($text);
1471		1552
		1553	$self->realloc;
1472	$self->update;	1554	$self->update;
1473	$self->check_size;
1474	}	1555	}
1475		1556
1476	sub set_markup {	1557	sub set_markup {
1477	my ($self, $markup) = @_;	1558	my ($self, $markup) = @_;
1478		1559
…		…
1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1563	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483		1564
1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1565	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485	$self->{layout}->set_markup ($markup);	1566	$self->{layout}->set_markup ($markup);
1486		1567
		1568	$self->realloc;
1487	$self->update;	1569	$self->update;
1488	$self->check_size;
1489	}	1570	}
1490		1571
1491	sub size_request {	1572	sub size_request {
1492	my ($self) = @_;	1573	my ($self) = @_;
1493		1574
…		…
1507		1588
1508	$w = List::Util::max $w, $w2;	1589	$w = List::Util::max $w, $w2;
1509	$h = List::Util::max $h, $h2;	1590	$h = List::Util::max $h, $h2;
1510	}	1591	}
1511		1592
1512	(	1593	($w, $h)
1513	$w + $self->{padding} * 2,
1514	$h + $self->{padding} * 2,
1515	)
1516	}	1594	}
1517		1595
1518	sub size_allocate {	1596	sub size_allocate {
1519	my ($self, $w, $h) = @_;	1597	my ($self, $w, $h) = @_;
1520		1598
		1599	delete $self->{ox};
		1600
1521	delete $self->{texture};	1601	delete $self->{texture}
		1602	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1603	}
1523		1604
1524	sub set_fontsize {	1605	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1606	my ($self, $fontsize) = @_;
1526		1607
1527	$self->{fontsize} = $fontsize;	1608	$self->{fontsize} = $fontsize;
1528	delete $self->{texture};	1609	delete $self->{texture};
1529		1610
1530	$self->update;	1611	$self->realloc;
1531	$self->check_size;
1532	}	1612	}
1533		1613
1534	sub _draw {	1614	sub _draw {
1535	my ($self) = @_;	1615	my ($self) = @_;
1536		1616
…		…
1542	$self->{layout}->set_width ($self->{w});	1622	$self->{layout}->set_width ($self->{w});
1543	$self->{layout}->set_ellipsise ($self->{ellipsise});	1623	$self->{layout}->set_ellipsise ($self->{ellipsise});
1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1624	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1625	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546		1626
1547	my $tex = new_from_layout CFClient::Texture $self->{layout};	1627	new_from_layout CFClient::Texture $self->{layout}
		1628	};
1548		1629
		1630	unless (exists $self->{ox}) {
1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1631	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1632	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551	: ($self->{w} - $tex->{w}) * 0.5);	1633	: ($self->{w} - $tex->{w}) * 0.5);
1552		1634
1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1635	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1636	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555	: ($self->{h} - $tex->{h}) * 0.5);	1637	: ($self->{h} - $tex->{h}) * 0.5);
1556
1557	$tex
1558	};	1638	};
1559		1639
1560	glEnable GL_TEXTURE_2D;	1640	glEnable GL_TEXTURE_2D;
1561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562		1642
…		…
1600		1680
1601	delete $self->{cur_h};	1681	delete $self->{cur_h};
1602		1682
1603	return if $self->{text} eq $text;	1683	return if $self->{text} eq $text;
1604		1684
1605	delete $self->{texture};
1606
1607	$self->{last_activity} = $::NOW;	1685	$self->{last_activity} = $::NOW;
1608	$self->{text} = $text;	1686	$self->{text} = $text;
1609		1687
1610	$text =~ s/./*/g if $self->{hidden};	1688	$text =~ s/./*/g if $self->{hidden};
1611	$self->{layout}->set_text ("$text ");	1689	$self->{layout}->set_text ("$text ");
1612		1690
1613	$self->_emit (changed => $self->{text});	1691	$self->_emit (changed => $self->{text});
		1692	$self->update;
1614	}	1693	}
1615		1694
1616	sub set_text {	1695	sub set_text {
1617	my ($self, $text) = @_;	1696	my ($self, $text) = @_;
1618		1697
1619	$self->{cursor} = length $text;	1698	$self->{cursor} = length $text;
1620	$self->_set_text ($text);	1699	$self->_set_text ($text);
1621	$self->update;	1700
1622	$self->check_size;	1701	$self->realloc;
1623	}	1702	}
1624		1703
1625	sub get_text {	1704	sub get_text {
1626	$_[0]{text}	1705	$_[0]{text}
1627	}	1706	}
…		…
1657	$self->{cursor} = length $text;	1736	$self->{cursor} = length $text;
1658	} elsif ($uni == 27) {	1737	} elsif ($uni == 27) {
1659	$self->_emit ('escape');	1738	$self->_emit ('escape');
1660	} elsif ($uni) {	1739	} elsif ($uni) {
1661	substr $text, $self->{cursor}++, 0, chr $uni;	1740	substr $text, $self->{cursor}++, 0, chr $uni;
		1741	} else {
		1742	return 0;
1662	}	1743	}
1663		1744
1664	$self->_set_text ($text);	1745	$self->_set_text ($text);
1665	$self->update;	1746
1666	$self->check_size;	1747	$self->realloc;
		1748
		1749	1
1667	}	1750	}
1668		1751
1669	sub focus_in {	1752	sub focus_in {
1670	my ($self) = @_;	1753	my ($self) = @_;
1671		1754
…		…
1686	utf8::encode $text;	1769	utf8::encode $text;
1687	$self->{cursor} = length substr $text, 0, $idx;	1770	$self->{cursor} = length substr $text, 0, $idx;
1688		1771
1689	$self->_set_text ($self->{text});	1772	$self->_set_text ($self->{text});
1690	$self->update;	1773	$self->update;
		1774
		1775	1
1691	}	1776	}
1692		1777
1693	sub mouse_motion {	1778	sub mouse_motion {
1694	my ($self, $ev, $x, $y) = @_;	1779	my ($self, $ev, $x, $y) = @_;
1695	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1780	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1781
		1782	0
1696	}	1783	}
1697		1784
1698	sub _draw {	1785	sub _draw {
1699	my ($self) = @_;	1786	my ($self) = @_;
1700		1787
1701	local $self->{fg} = $self->{fg};	1788	local $self->{fg} = $self->{fg};
1702		1789
1703	if ($FOCUS == $self) {	1790	if ($FOCUS == $self) {
1704	glColor @{$self->{active_bg}};	1791	glColor_premultiply @{$self->{active_bg}};
1705	$self->{fg} = $self->{active_fg};	1792	$self->{fg} = $self->{active_fg};
1706	} else {	1793	} else {
1707	glColor @{$self->{bg}};	1794	glColor_premultiply @{$self->{bg}};
1708	}	1795	}
1709		1796
1710	glEnable GL_BLEND;	1797	glEnable GL_BLEND;
1711	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1798	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712	glBegin GL_QUADS;	1799	glBegin GL_QUADS;
1713	glVertex 0 , 0;	1800	glVertex 0 , 0;
1714	glVertex 0 , $self->{h};	1801	glVertex 0 , $self->{h};
1715	glVertex $self->{w}, $self->{h};	1802	glVertex $self->{w}, $self->{h};
1716	glVertex $self->{w}, 0;	1803	glVertex $self->{w}, 0;
…		…
1777	} else {	1864	} else {
1778	$self->set_text ($self->{history_saveback});	1865	$self->set_text ($self->{history_saveback});
1779	}	1866	}
1780		1867
1781	} else {	1868	} else {
1782	$self->SUPER::key_down ($ev);	1869	return $self->SUPER::key_down ($ev)
		1870	}
		1871
1783	}	1872	1
1784
1785	}	1873	}
1786		1874
1787	#############################################################################	1875	#############################################################################
1788		1876
1789	package CFClient::UI::Button;	1877	package CFClient::UI::Button;
…		…
1798		1886
1799	sub new {	1887	sub new {
1800	my $class = shift;	1888	my $class = shift;
1801		1889
1802	$class->SUPER::new (	1890	$class->SUPER::new (
1803	padding => 4,	1891	padding_x => 4,
		1892	padding_y => 4,
1804	fg => [1, 1, 1],	1893	fg => [1, 1, 1],
1805	active_fg => [0, 0, 1],	1894	active_fg => [0, 0, 1],
1806	can_hover => 1,	1895	can_hover => 1,
1807	align => 0,	1896	align => 0,
1808	valign => 0,	1897	valign => 0,
…		…
1817	my ($self, $ev, $x, $y) = @_;	1906	my ($self, $ev, $x, $y) = @_;
1818		1907
1819	$self->emit ("activate")	1908	$self->emit ("activate")
1820	if $x >= 0 && $x < $self->{w}	1909	if $x >= 0 && $x < $self->{w}
1821	&& $y >= 0 && $y < $self->{h};	1910	&& $y >= 0 && $y < $self->{h};
		1911
		1912	1
1822	}	1913	}
1823		1914
1824	sub _draw {	1915	sub _draw {
1825	my ($self) = @_;	1916	my ($self) = @_;
1826		1917
…		…
1855		1946
1856	sub new {	1947	sub new {
1857	my $class = shift;	1948	my $class = shift;
1858		1949
1859	$class->SUPER::new (	1950	$class->SUPER::new (
1860	padding => 2,	1951	padding_x => 2,
		1952	padding_y => 2,
1861	fg => [1, 1, 1],	1953	fg => [1, 1, 1],
1862	active_fg => [1, 1, 0],	1954	active_fg => [1, 1, 0],
1863	bg => [0, 0, 0, 0.2],	1955	bg => [0, 0, 0, 0.2],
1864	active_bg => [1, 1, 1, 0.5],	1956	active_bg => [1, 1, 1, 0.5],
1865	state => 0,	1957	state => 0,
…		…
1869	}	1961	}
1870		1962
1871	sub size_request {	1963	sub size_request {
1872	my ($self) = @_;	1964	my ($self) = @_;
1873		1965
1874	($self->{padding} * 2 + 6) x 2	1966	(6) x 2
1875	}	1967	}
1876		1968
1877	sub button_down {	1969	sub button_down {
1878	my ($self, $ev, $x, $y) = @_;	1970	my ($self, $ev, $x, $y) = @_;
1879		1971
1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1972	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1973	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882	$self->{state} = !$self->{state};	1974	$self->{state} = !$self->{state};
1883	$self->_emit (changed => $self->{state});	1975	$self->_emit (changed => $self->{state});
		1976	} else {
		1977	return 0
		1978	}
		1979
1884	}	1980	1
1885	}	1981	}
1886		1982
1887	sub _draw {	1983	sub _draw {
1888	my ($self) = @_;	1984	my ($self) = @_;
1889		1985
1890	$self->SUPER::_draw;	1986	$self->SUPER::_draw;
1891		1987
1892	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1988	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893		1989
1894	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1990	my ($w, $h) = @$self{qw(w h)};
		1991
		1992	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895		1993
1896	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1994	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897		1995
1898	my $tex = $self->{state} ? $tex[1] : $tex[0];	1996	my $tex = $self->{state} ? $tex[1] : $tex[0];
1899		1997
…		…
2054		2152
2055	my $h1 = $self->{h} * (1 - $ycut1);	2153	my $h1 = $self->{h} * (1 - $ycut1);
2056	my $h2 = $self->{h} * (1 - $ycut2);	2154	my $h2 = $self->{h} * (1 - $ycut2);
2057		2155
2058	glEnable GL_BLEND;	2156	glEnable GL_BLEND;
2059	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2157	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2158	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060	glEnable GL_TEXTURE_2D;	2159	glEnable GL_TEXTURE_2D;
2061	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2160	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062		2161
2063	glBindTexture GL_TEXTURE_2D, $t1->{name};	2162	glBindTexture GL_TEXTURE_2D, $t1->{name};
2064	glBegin GL_QUADS;	2163	glBegin GL_QUADS;
…		…
2164	fg => [1, 1, 1],	2263	fg => [1, 1, 1],
2165	active_fg => [0, 0, 0],	2264	active_fg => [0, 0, 0],
2166	bg => [0, 0, 0, 0.2],	2265	bg => [0, 0, 0, 0.2],
2167	active_bg => [1, 1, 1, 0.5],	2266	active_bg => [1, 1, 1, 0.5],
2168	range => [0, 0, 100, 10, 0],	2267	range => [0, 0, 100, 10, 0],
2169	req_w => $::WIDTH / 80,	2268	min_w => $::WIDTH / 80,
2170	req_h => $::WIDTH / 80,	2269	min_h => $::WIDTH / 80,
2171	vertical => 0,	2270	vertical => 0,
2172	can_hover => 1,	2271	can_hover => 1,
2173	inner_pad => 0.02,	2272	inner_pad => 0.02,
2174	@_	2273	@_
2175	);	2274	);
…		…
2178	$self->update;	2277	$self->update;
2179		2278
2180	$self	2279	$self
2181	}	2280	}
2182		2281
		2282	sub changed { }
		2283
2183	sub set_range {	2284	sub set_range {
2184	my ($self, $range) = @_;	2285	my ($self, $range) = @_;
2185		2286
2186	($range, $self->{range}) = ($self->{range}, $range);	2287	($range, $self->{range}) = ($self->{range}, $range);
2187		2288
…		…
2213	}	2314	}
2214		2315
2215	sub size_request {	2316	sub size_request {
2216	my ($self) = @_;	2317	my ($self) = @_;
2217		2318
2218	my $w = $self->{req_w};	2319	($self->{req_w}, $self->{req_h})
2219	my $h = $self->{req_h};
2220
2221	$self->{vertical} ? ($h, $w) : ($w, $h)
2222	}	2320	}
2223		2321
2224	sub button_down {	2322	sub button_down {
2225	my ($self, $ev, $x, $y) = @_;	2323	my ($self, $ev, $x, $y) = @_;
2226		2324
2227	$self->SUPER::button_down ($ev, $x, $y);	2325	$self->SUPER::button_down ($ev, $x, $y);
2228		2326
2229	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2327	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230		2328
2231	$self->mouse_motion ($ev, $x, $y);	2329	$self->mouse_motion ($ev, $x, $y)
2232	}	2330	}
2233		2331
2234	sub mouse_motion {	2332	sub mouse_motion {
2235	my ($self, $ev, $x, $y) = @_;	2333	my ($self, $ev, $x, $y) = @_;
2236		2334
…		…
2240	my (undef, $lo, $hi, $page) = @{$self->{range}};	2338	my (undef, $lo, $hi, $page) = @{$self->{range}};
2241		2339
2242	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2340	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243		2341
2244	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2342	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2343	} else {
		2344	return 0;
		2345	}
		2346
2245	}	2347	1
2246	}	2348	}
2247		2349
2248	sub update {	2350	sub update {
2249	my ($self) = @_;	2351	my ($self) = @_;
2250		2352
2251	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2353	delete $self->{knob_w};
		2354	$self->SUPER::update;
		2355	}
		2356
		2357	sub _draw {
		2358	my ($self) = @_;
		2359
		2360	unless ($self->{knob_w}) {
2252	$self->set_value ($self->{range}[0]);	2361	$self->set_value ($self->{range}[0]);
2253		2362
2254	my ($value, $lo, $hi, $page) = @{$self->{range}};	2363	my ($value, $lo, $hi, $page) = @{$self->{range}};
2255	my $range = ($hi - $page - $lo) || 1e-100;	2364	my $range = ($hi - $page - $lo) || 1e-100;
2256		2365
…		…
2262	$value = ($value - $lo) / $range;	2371	$value = ($value - $lo) / $range;
2263	$value = $value * $self->{scale} + $self->{offset};	2372	$value = $value * $self->{scale} + $self->{offset};
2264		2373
2265	$self->{knob_x} = $value - $knob_w * 0.5;	2374	$self->{knob_x} = $value - $knob_w * 0.5;
2266	$self->{knob_w} = $knob_w;	2375	$self->{knob_w} = $knob_w;
2267	});	2376	}
2268
2269	$self->SUPER::update;
2270	}
2271
2272	sub _draw {
2273	my ($self) = @_;
2274		2377
2275	$self->SUPER::_draw ();	2378	$self->SUPER::_draw ();
2276		2379
2277	glScale $self->{w}, $self->{h};	2380	glScale $self->{w}, $self->{h};
2278		2381
…		…
2611	}	2714	}
2612		2715
2613	sub set_tooltip_from {	2716	sub set_tooltip_from {
2614	my ($self, $widget) = @_;	2717	my ($self, $widget) = @_;
2615		2718
		2719	my $tooltip = $widget->{tooltip};
		2720
		2721	if ($ENV{CFPLUS_DEBUG} & 2) {
		2722	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2723	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2724	. "req $widget->{req_w} $widget->{req_h}\n"
		2725	. "visible $widget->{visible}";
		2726	}
		2727
2616	$self->add (new CFClient::UI::Label	2728	$self->add (new CFClient::UI::Label
2617	markup => $widget->{tooltip},	2729	markup => $tooltip,
2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2730	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619	fontsize => 0.8,	2731	fontsize => 0.8,
2620	fg => [0, 0, 0, 1],	2732	fg => [0, 0, 0, 1],
2621	ellipsise => 0,	2733	ellipsise => 0,
2622	font => ($widget->{tooltip_font} || $::FONT_PROP),	2734	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2633		2745
2634	sub size_allocate {	2746	sub size_allocate {
2635	my ($self, $w, $h) = @_;	2747	my ($self, $w, $h) = @_;
2636		2748
2637	$self->SUPER::size_allocate ($w - 4, $h - 4);	2749	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2750	}
		2751
		2752	sub visibility_change {
		2753	my ($self, $visible) = @_;
		2754
		2755	return unless $visible;
		2756
		2757	$self->{root}->on_post_alloc ("move_$self" => sub {
		2758	my $widget = $self->{owner}
		2759	or return;
		2760
		2761	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2762
		2763	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2764	if $x + $self->{w} > $::WIDTH;
		2765
		2766	$self->move_abs ($x, $y);
		2767	});
2638	}	2768	}
2639		2769
2640	sub _draw {	2770	sub _draw {
2641	my ($self) = @_;	2771	my ($self) = @_;
2642		2772
…		…
2659	glVertex $w, $h;	2789	glVertex $w, $h;
2660	glVertex $w, 0;	2790	glVertex $w, 0;
2661	glEnd;	2791	glEnd;
2662		2792
2663	glTranslate 2 - 0.375, 2 - 0.375;	2793	glTranslate 2 - 0.375, 2 - 0.375;
		2794
2664	$self->SUPER::_draw;	2795	$self->SUPER::_draw;
2665	}	2796	}
2666		2797
2667	#############################################################################	2798	#############################################################################
2668		2799
…		…
2744	$self->SUPER::DESTROY;	2875	$self->SUPER::DESTROY;
2745	}	2876	}
2746		2877
2747	#############################################################################	2878	#############################################################################
2748		2879
2749	package CFClient::UI::Inventory;	2880	package CFClient::UI::Buttonbar;
2750		2881
2751	our @ISA = CFClient::UI::ScrolledWindow::;	2882	our @ISA = CFClient::UI::HBox::;
2752		2883
2753	sub new {	2884	# 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		2885
2789	#############################################################################	2886	#############################################################################
2790		2887
2791	package CFClient::UI::Menu;	2888	package CFClient::UI::Menu;
2792		2889
…		…
2833	# maybe save $GRAB? must be careful about events...	2930	# maybe save $GRAB? must be careful about events...
2834	$GRAB = $self;	2931	$GRAB = $self;
2835	$self->{button} = $ev->{button};	2932	$self->{button} = $ev->{button};
2836		2933
2837	$self->show;	2934	$self->show;
2838	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2935	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2839	}	2936	}
2840		2937
2841	sub mouse_motion {	2938	sub mouse_motion {
2842	my ($self, $ev, $x, $y) = @_;	2939	my ($self, $ev, $x, $y) = @_;
2843		2940
2844	# TODO: should use vbox->find_widget or so	2941	# TODO: should use vbox->find_widget or so
2845	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2942	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2846	$self->{hover} = $self->{item}{$HOVER};	2943	$self->{hover} = $self->{item}{$HOVER};
		2944
		2945	0
2847	}	2946	}
2848		2947
2849	sub button_up {	2948	sub button_up {
2850	my ($self, $ev, $x, $y) = @_;	2949	my ($self, $ev, $x, $y) = @_;
2851		2950
…		…
2853	undef $GRAB;	2952	undef $GRAB;
2854	$self->hide;	2953	$self->hide;
2855		2954
2856	$self->_emit ("popdown");	2955	$self->_emit ("popdown");
2857	$self->{hover}[1]->() if $self->{hover};	2956	$self->{hover}[1]->() if $self->{hover};
		2957	} else {
		2958	return 0
		2959	}
		2960
		2961	1
		2962	}
		2963
		2964	#############################################################################
		2965
		2966	package CFClient::UI::Multiplexer;
		2967
		2968	our @ISA = CFClient::UI::Container::;
		2969
		2970	sub new {
		2971	my $class = shift;
		2972
		2973	my $self = $class->SUPER::new (
		2974	@_,
		2975	);
		2976
		2977	$self->{current} = $self->{children}[0]
		2978	if @{ $self->{children} };
		2979
		2980	$self
		2981	}
		2982
		2983	sub add {
		2984	my ($self, @widgets) = @_;
		2985
		2986	$self->SUPER::add (@widgets);
		2987
		2988	$self->{current} = $self->{children}[0]
		2989	if @{ $self->{children} };
		2990	}
		2991
		2992	sub set_current_page {
		2993	my ($self, $page_or_widget) = @_;
		2994
		2995	my $widget = ref $page_or_widget
		2996	? $page_or_widget
		2997	: $self->{children}[$page_or_widget];
		2998
		2999	$self->{current} = $widget;
		3000	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3001
		3002	$self->_emit (page_changed => $self->{current});
		3003
		3004	$self->realloc;
		3005	}
		3006
		3007	sub visible_children {
		3008	$_[0]{current}
		3009	}
		3010
		3011	sub size_request {
		3012	my ($self) = @_;
		3013
		3014	$self->{current}->size_request
		3015	}
		3016
		3017	sub size_allocate {
		3018	my ($self, $w, $h) = @_;
		3019
		3020	$self->{current}->configure (0, 0, $w, $h);
		3021	}
		3022
		3023	sub _draw {
		3024	my ($self) = @_;
		3025
		3026	$self->{current}->draw;
		3027	}
		3028
		3029	#############################################################################
		3030
		3031	package CFClient::UI::Notebook;
		3032
		3033	our @ISA = CFClient::UI::VBox::;
		3034
		3035	sub new {
		3036	my $class = shift;
		3037
		3038	my $self = $class->SUPER::new (
		3039	buttonbar => (new CFClient::UI::Buttonbar),
		3040	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3041	# filter => # will be put between multiplexer and $self
		3042	@_,
		3043	);
2858	}	3044
		3045	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3046	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3047
		3048	$self
		3049	}
		3050
		3051	sub add {
		3052	my ($self, $title, $widget, $tooltip) = @_;
		3053
		3054	Scalar::Util::weaken $self;
		3055
		3056	$self->{buttonbar}->add (new CFClient::UI::Button
		3057	markup => $title,
		3058	tooltip => $tooltip,
		3059	on_activate => sub { $self->set_current_page ($widget) },
		3060	);
		3061
		3062	$self->{multiplexer}->add ($widget);
		3063	}
		3064
		3065	sub set_current_page {
		3066	my ($self, $page) = @_;
		3067
		3068	$self->{multiplexer}->set_current_page ($page);
		3069	$self->_emit (page_changed => $self->{multiplexer}{current});
2859	}	3070	}
2860		3071
2861	#############################################################################	3072	#############################################################################
2862		3073
2863	package CFClient::UI::Statusbox;	3074	package CFClient::UI::Statusbox;
…		…
2968	$self->SUPER::reconfigure;	3179	$self->SUPER::reconfigure;
2969	}	3180	}
2970		3181
2971	#############################################################################	3182	#############################################################################
2972		3183
2973	package CFClient::UI::Root;	3184	package CFClient::UI::Inventory;
2974		3185
2975	our @ISA = CFClient::UI::Container::;	3186	our @ISA = CFClient::UI::ScrolledWindow::;
2976
2977	use CFClient::OpenGL;
2978		3187
2979	sub new {	3188	sub new {
2980	my $class = shift;	3189	my $class = shift;
2981		3190
2982	$class->SUPER::new (	3191	my $self = $class->SUPER::new (
		3192	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3193	@_,
		3194	);
		3195
		3196	$self
		3197	}
		3198
		3199	sub set_items {
		3200	my ($self, $items) = @_;
		3201
		3202	$self->{child}->clear;
		3203	return unless $items;
		3204
		3205	my @items = sort {
		3206	($a->{type} <=> $b->{type})
		3207	or ($a->{name} cmp $b->{name})
		3208	} @$items;
		3209
		3210	$self->{real_items} = \@items;
		3211
		3212	my $row = 0;
		3213	for my $item (@items) {
		3214	CFClient::Item::update_widgets $item;
		3215
		3216	$self->{child}->add (0, $row, $item->{face_widget});
		3217	$self->{child}->add (1, $row, $item->{desc_widget});
		3218	$self->{child}->add (2, $row, $item->{weight_widget});
		3219
		3220	$row++;
		3221	}
		3222	}
		3223
		3224	#############################################################################
		3225
		3226	package CFClient::UI::BindEditor;
		3227
		3228	our @ISA = CFClient::UI::FancyFrame::;
		3229
		3230	sub new {
		3231	my $class = shift;
		3232
		3233	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3234
		3235	$self->add (my $vb = new CFClient::UI::VBox);
		3236
		3237
		3238	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3239	text => "start recording",
		3240	tooltip => "Start/Stops recording of actions."
		3241	."All subsequent actions after the recording started will be captured."
		3242	."The actions are displayed after the record was stopped."
		3243	."To bind the action you have to click on the 'Bind' button",
		3244	on_activate => sub {
		3245	unless ($self->{recording}) {
		3246	$self->start;
		3247	} else {
		3248	$self->stop;
		3249	}
		3250	});
		3251
		3252	$vb->add (new CFClient::UI::Label text => "Actions:");
		3253	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3254
		3255	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3256	$vb->add (my $hb = new CFClient::UI::HBox);
		3257	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3258	$hb->add (new CFClient::UI::Button
		3259	text => "bind",
		3260	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3261	on_activate => sub {
		3262	$self->ask_for_bind;
		3263	});
		3264
		3265	$vb->add (my $hb = new CFClient::UI::HBox);
		3266	$hb->add (new CFClient::UI::Button
		3267	text => "ok",
		3268	expand => 1,
		3269	tooltip => "This closes the binding editor and saves the binding",
		3270	on_activate => sub {
		3271	$self->hide;
		3272	$self->commit;
		3273	});
		3274
		3275	$hb->add (new CFClient::UI::Button
		3276	text => "cancel",
		3277	expand => 1,
		3278	tooltip => "This closes the binding editor without saving",
		3279	on_activate => sub {
		3280	$self->hide;
		3281	$self->{binding_cancel}->()
		3282	if $self->{binding_cancel};
		3283	});
		3284
		3285	$self->update_binding_widgets;
		3286
		3287	$self
		3288	}
		3289
		3290	sub commit {
		3291	my ($self) = @_;
		3292	my ($mod, $sym, $cmds) = $self->get_binding;
		3293	if ($sym != 0 && @$cmds > 0) {
		3294	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3295	."'. Don't forget 'Save Config'!");
		3296	$self->{binding_change}->($mod, $sym, $cmds)
		3297	if $self->{binding_change};
		3298	} else {
		3299	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3300	$self->{binding_cancel}->()
		3301	if $self->{binding_cancel};
		3302	}
		3303	}
		3304
		3305	sub start {
		3306	my ($self) = @_;
		3307
		3308	$self->{rec_btn}->set_text ("stop recording");
		3309	$self->{recording} = 1;
		3310	$self->clear_command_list;
		3311	$::CONN->start_record if $::CONN;
		3312	}
		3313
		3314	sub stop {
		3315	my ($self) = @_;
		3316
		3317	$self->{rec_btn}->set_text ("start recording");
		3318	$self->{recording} = 0;
		3319
		3320	my $rec;
		3321	$rec = $::CONN->stop_record if $::CONN;
		3322	return unless ref $rec eq 'ARRAY';
		3323	$self->set_command_list ($rec);
		3324	}
		3325
		3326
		3327	sub ask_for_bind_and_commit {
		3328	my ($self) = @_;
		3329	$self->ask_for_bind (1);
		3330	}
		3331
		3332	sub ask_for_bind {
		3333	my ($self, $commit) = @_;
		3334
		3335	CFClient::Binder::open_binding_dialog (sub {
		3336	my ($mod, $sym) = @_;
		3337	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3338	$self->update_binding_widgets;
		3339	$self->commit if $commit;
		3340	});
		3341	}
		3342
		3343	# $mod and $sym are the modifiers and key symbol
		3344	# $cmds is a array ref of strings (the commands)
		3345	# $cb is the callback that is executed on OK
		3346	# $ccb is the callback that is executed on CANCEL and
		3347	# when the binding was unsuccessful on OK
		3348	sub set_binding {
		3349	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3350
		3351	$self->clear_command_list;
		3352	$self->{recording} = 0;
		3353	$self->{rec_btn}->set_text ("start recording");
		3354
		3355	$self->{binding} = [$mod, $sym];
		3356	$self->{commands} = $cmds;
		3357
		3358	$self->{binding_change} = $cb;
		3359	$self->{binding_cancel} = $ccb;
		3360
		3361	$self->update_binding_widgets;
		3362	}
		3363
		3364	# this is a shortcut method that asks for a binding
		3365	# and then just binds it.
		3366	sub do_quick_binding {
		3367	my ($self, $cmds) = @_;
		3368	$self->set_binding (undef, undef, $cmds, sub {
		3369	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3370	});
		3371	$self->ask_for_bind (1);
		3372	}
		3373
		3374	sub update_binding_widgets {
		3375	my ($self) = @_;
		3376	my ($mod, $sym, $cmds) = $self->get_binding;
		3377	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3378	$self->set_command_list ($cmds);
		3379	}
		3380
		3381	sub get_binding {
		3382	my ($self) = @_;
		3383	return (
		3384	$self->{binding}->[0],
		3385	$self->{binding}->[1],
		3386	[ grep { defined $_ } @{$self->{commands}} ]
		3387	);
		3388	}
		3389
		3390	sub clear_command_list {
		3391	my ($self) = @_;
		3392	$self->{cmdbox}->clear ();
		3393	}
		3394
		3395	sub set_command_list {
		3396	my ($self, $cmds) = @_;
		3397
		3398	$self->{cmdbox}->clear ();
		3399	$self->{commands} = $cmds;
		3400
		3401	my $idx = 0;
		3402
		3403	for (@$cmds) {
		3404	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3405
		3406	my $i = $idx;
		3407	$hb->add (new CFClient::UI::Label text => $_);
		3408	$hb->add (new CFClient::UI::Button
		3409	text => "delete",
		3410	tooltip => "Deletes the action from the record",
		3411	on_activate => sub {
		3412	$self->{cmdbox}->remove ($hb);
		3413	$cmds->[$i] = undef;
		3414	});
		3415
		3416
		3417	$idx++
		3418	}
		3419	}
		3420
		3421	#############################################################################
		3422
		3423	package CFClient::UI::SpellList;
		3424
		3425	our @ISA = CFClient::UI::Table::;
		3426
		3427	sub new {
		3428	my $class = shift;
		3429
		3430	my $self = $class->SUPER::new (
		3431	binding => [],
		3432	commands => [],
		3433	@_,
		3434	)
		3435	}
		3436
		3437	# XXX: Do sorting? Argl...
		3438	sub add_spell {
		3439	my ($self, $spell) = @_;
		3440	$self->{spells}->{$spell->{name}} = $spell;
		3441
		3442	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3443	face => $spell->{face},
		3444	can_hover => 1,
		3445	can_events => 1,
		3446	tooltip => $spell->{message});
		3447
		3448	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3449	text => $spell->{name},
		3450	can_hover => 1,
		3451	can_events => 1,
		3452	tooltip => $spell->{message},
		3453	expand => 1);
		3454
		3455	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3456	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3457	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3458	expand => 1);
		3459
		3460	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3461	text => "bind to key",
		3462	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3463	}
		3464
		3465	sub rebuild_spell_list {
		3466	my ($self) = @_;
		3467	$self->{tbl_idx} = 0;
		3468	$self->add_spell ($_) for values %{$self->{spells}};
		3469	}
		3470
		3471	sub remove_spell {
		3472	my ($self, $spell) = @_;
		3473	delete $self->{spells}->{$spell->{name}};
		3474	$self->rebuild_spell_list;
		3475	}
		3476
		3477	#############################################################################
		3478
		3479	package CFClient::UI::Root;
		3480
		3481	our @ISA = CFClient::UI::Container::;
		3482
		3483	use CFClient::OpenGL;
		3484
		3485	sub new {
		3486	my $class = shift;
		3487
		3488	my $self = $class->SUPER::new (
2983	visible => 1,	3489	visible => 1,
2984	@_,	3490	@_,
2985	)	3491	);
2986	}
2987		3492
2988	sub configure {	3493	Scalar::Util::weaken ($self->{root} = $self);
2989	my ($self, $x, $y, $w, $h) = @_;
2990		3494
2991	$self->{w} = $w;	3495	$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	}	3496	}
3001		3497
3002	sub size_request {	3498	sub size_request {
3003	my ($self) = @_;	3499	my ($self) = @_;
3004		3500
3005	($self->{w}, $self->{h})	3501	($self->{w}, $self->{h})
		3502	}
		3503
		3504	sub _to_pixel {
		3505	my ($coord, $size, $max) = @_;
		3506
		3507	$coord =
		3508	$coord eq "center" ? ($max - $size) * 0.5
		3509	: $coord eq "max" ? $max
		3510	: $coord;
		3511
		3512	$coord = 0 if $coord < 0;
		3513	$coord = $max - $size if $coord > $max - $size;
		3514
		3515	int $coord + 0.5
3006	}	3516	}
3007		3517
3008	sub size_allocate {	3518	sub size_allocate {
3009	my ($self, $w, $h) = @_;	3519	my ($self, $w, $h) = @_;
3010		3520
3011	for my $child ($self->children) {	3521	for my $child ($self->children) {
3012	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3522	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3013		3523
3014	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3524	$X = $child->{force_x} if exists $child->{force_x};
3015	if exists $child->{req_x};	3525	$Y = $child->{force_y} if exists $child->{force_y};
3016		3526
3017	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3527	$X = _to_pixel $X, $W, $self->{w};
3018	if exists $child->{req_y};	3528	$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		3529
3025	$child->configure ($X, $Y, $W, $H);	3530	$child->configure ($X, $Y, $W, $H);
3026	}	3531	}
3027	}	3532	}
3028		3533
…		…
3039	}	3544	}
3040		3545
3041	sub update {	3546	sub update {
3042	my ($self) = @_;	3547	my ($self) = @_;
3043		3548
3044	$self->check_size;
3045	$::WANT_REFRESH++;	3549	$::WANT_REFRESH++;
3046	}	3550	}
3047		3551
3048	sub add {	3552	sub add {
3049	my ($self, @children) = @_;	3553	my ($self, @children) = @_;
3050		3554
3051	for my $child (@children) {
3052	$child->{is_toplevel} = 1;	3555	$_->{is_toplevel} = 1
3053		3556	for @children;
3054	# integerise window positions
3055	$child->{x} = int $child->{x};
3056	$child->{y} = int $child->{y};
3057	}
3058		3557
3059	$self->SUPER::add (@children);	3558	$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	}	3559	}
3067		3560
3068	sub remove {	3561	sub remove {
3069	my ($self, @children) = @_;	3562	my ($self, @children) = @_;
3070		3563
3071	$self->SUPER::remove (@children);	3564	$self->SUPER::remove (@children);
		3565
		3566	delete $self->{is_toplevel}
		3567	for @children;
3072		3568
3073	while (@children) {	3569	while (@children) {
3074	my $w = pop @children;	3570	my $w = pop @children;
3075	push @children, $w->children;	3571	push @children, $w->children;
3076	$w->set_invisible;	3572	$w->set_invisible;
…		…
3095	while ($self->{refresh_hook}) {	3591	while ($self->{refresh_hook}) {
3096	$_->()	3592	$_->()
3097	for values %{delete $self->{refresh_hook}};	3593	for values %{delete $self->{refresh_hook}};
3098	}	3594	}
3099		3595
3100	if ($self->{check_size}) {	3596	if ($self->{realloc}) {
		3597	my %queue;
3101	my @queue;	3598	my @queue;
		3599	my $widget;
3102		3600
		3601	outer:
3103	while () {	3602	while () {
3104	if ($self->{check_size}) {	3603	if (my $realloc = delete $self->{realloc}) {
3105	#TODO use array-of-depth approach	3604	for $widget (values %$realloc) {
		3605	$widget->{visible} or next; # do not resize invisible widgets
3106		3606
3107	@queue = sort { $a->{visible} <=> $b->{visible} }	3607	$queue{$widget+0}++ and next; # duplicates are common
3108	@queue, values %{delete $self->{check_size}};	3608
		3609	push @{ $queue[$widget->{visible}] }, $widget;
		3610	}
3109	}	3611	}
3110		3612
		3613	while () {
		3614	@queue or last outer;
		3615
3111	my $widget = pop @queue || last;	3616	$widget = pop @{ $queue[-1] || [] }
3112		3617	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		3618
		3619	pop @queue;
		3620	}
		3621
		3622	delete $queue{$widget+0};
		3623
		3624	my ($w, $h) = $widget->size_request;
		3625
		3626	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3627	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3628
		3629	$w = $widget->{force_w} if exists $widget->{force_w};
		3630	$h = $widget->{force_h} if exists $widget->{force_h};
		3631
		3632	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3633	|| delete $widget->{force_realloc}) {
3123	$widget->{req_w} = $w;	3634	$widget->{req_w} = $w;
3124	$widget->{req_h} = $h;	3635	$widget->{req_h} = $h;
3125		3636
3126	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3637	$self->{size_alloc}{$widget+0} = $widget;
3127		3638
3128	$widget->{parent}->check_size
3129	if $widget->{parent};	3639	if (my $parent = $widget->{parent}) {
		3640	$self->{realloc}{$parent+0} = $parent
		3641	unless $queue{$parent+0};
		3642
		3643	$parent->{force_size_alloc} = 1;
		3644	$self->{size_alloc}{$parent+0} = $parent;
		3645	}
3130	}	3646	}
		3647
		3648	delete $self->{realloc}{$widget+0};
3131	}	3649	}
3132	}	3650	}
3133		3651
3134	while (my $size_alloc = delete $self->{size_alloc}) {	3652	while (my $size_alloc = delete $self->{size_alloc}) {
3135	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3653	my @queue = sort { $b->{visible} <=> $a->{visible} }
3136	values %$size_alloc;	3654	values %$size_alloc;
3137		3655
3138	while () {	3656	while () {
3139	my ($widget, $w, $h) = @{ pop @queue or last };	3657	my $widget = pop @queue || last;
		3658
		3659	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3140		3660
3141	$w = 0 if $w < 0;	3661	$w = 0 if $w < 0;
3142	$h = 0 if $h < 0;	3662	$h = 0 if $h < 0;
3143		3663
		3664	$w = int $w + 0.5;
		3665	$h = int $h + 0.5;
		3666
		3667	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3668	$widget->{old_w} = $widget->{w};
		3669	$widget->{old_h} = $widget->{h};
		3670
3144	$widget->{w} = $w;	3671	$widget->{w} = $w;
3145	$widget->{h} = $h;	3672	$widget->{h} = $h;
		3673
3146	$widget->emit (size_allocate => $w, $h);	3674	$widget->emit (size_allocate => $w, $h);
		3675	}
3147	}	3676	}
3148	}	3677	}
3149		3678
3150	while ($self->{post_alloc_hook}) {	3679	while ($self->{post_alloc_hook}) {
3151	$_->()	3680	$_->()
3152	for values %{delete $self->{post_alloc_hook}};	3681	for values %{delete $self->{post_alloc_hook}};
3153	}	3682	}
		3683
3154		3684
3155	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3685	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3156	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3686	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3157	glClear GL_COLOR_BUFFER_BIT;	3687	glClear GL_COLOR_BUFFER_BIT;
3158		3688
…		…
3160	glLoadIdentity;	3690	glLoadIdentity;
3161	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3691	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3162	glMatrixMode GL_MODELVIEW;	3692	glMatrixMode GL_MODELVIEW;
3163	glLoadIdentity;	3693	glLoadIdentity;
3164		3694
		3695	{
		3696	package CFClient::UI::Base;
		3697
		3698	($draw_x, $draw_y, $draw_w, $draw_h) =
		3699	(0, 0, $self->{w}, $self->{h});
		3700	}
		3701
3165	$self->_draw;	3702	$self->_draw;
3166	}	3703	}
3167		3704
3168	#############################################################################	3705	#############################################################################
3169		3706

Diff Legend

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