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.248 by root, Sun May 28 01:37:45 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 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
…		…
246	return if $self->{parent};	249	return if $self->{parent};
247		250
248	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
249	}	252	}
250		253
251	sub center {
252	my ($self) = @_;
253
254	$CFClient::UI::ROOT->on_post_alloc (
255	"center_$self" => sub {
256	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
257	},
258	);
259
260	$self->update;
261	}
262
263	sub set_visible {	254	sub set_visible {
264	my ($self) = @_;	255	my ($self) = @_;
265		256
266	return if $self->{visible};	257	return if $self->{visible};
267		258
268	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
269	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
270		261
271	$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;
272	}	267	}
273		268
274	sub set_invisible {	269	sub set_invisible {
275	my ($self) = @_;	270	my ($self) = @_;
276		271
277	return unless $self->{visible};	272	return unless $self->{visible};
278		273
279	# broken show/hide model	274	$_->set_invisible for $self->children;
280		275
281	delete $self->{root};	276	delete $self->{root};
282	delete $self->{visible};	277	delete $self->{visible};
283		278
284	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
285	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
286		281
287	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
288	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
289		284
290	$self->focus_out;	285	$self->focus_out;
291		286
292	$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;
293	}	305	}
294		306
295	sub hide {	307	sub hide {
296	my ($self) = @_;	308	my ($self) = @_;
297		309
…		…
299		311
300	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
301	if $self->{parent};	313	if $self->{parent};
302	}	314	}
303		315
304	sub move {	316	sub move_abs {
305	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
306		318
307	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
308	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
309	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
310		322
311	$self->update;	323	$self->update;
312	}	324	}
313		325
314	sub set_size {	326	sub set_size {
315	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
316		328
317	$self->{def_w} = $w;	329	$self->{force_w} = $w;
318	$self->{def_h} = $h;	330	$self->{force_h} = $h;
319		331
320	$self->check_size;	332	$self->realloc;
321	}	333	}
322		334
323	sub size_request {	335	sub size_request {
324	require Carp;	336	require Carp;
325	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
327		339
328	sub configure {	340	sub configure {
329	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
330		342
331	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
332	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
333	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
334		348
335	# use alignment to adjust x, y	349	# use alignment to adjust x, y
336		350
337	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
338	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
339
340	($w, $h) = ($w2, $h2);
341	}	353	}
342		354
343	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
344	$self->{x} = $x;	356	$self->{x} = $x;
345	$self->{y} = $y;	357	$self->{y} = $y;
346	$self->update;	358	$self->update;
347	}	359	}
348		360
349	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350	$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;
351	}	368	}
352	}	369	}
353		370
354	sub size_allocate {	371	sub size_allocate {
355	# nothing to be done	372	# nothing to be done
356	}	373	}
357		374
358	sub reconfigure {
359	my ($self) = @_;
360
361	$self->check_size (1);
362	$self->update;
363	}
364
365	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
366	}	381	}
367		382
368	sub set_max_size {	383	sub set_max_size {
369	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
370		385
…		…
429		444
430	$::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
431	unless $FOCUS;	446	unless $FOCUS;
432	}	447	}
433		448
434	sub mouse_motion { }	449	sub mouse_motion { 0 }
435	sub button_up { }	450	sub button_up { 0 }
436	sub key_down { }	451	sub key_down { 0 }
437	sub key_up { }	452	sub key_up { 0 }
438		453
439	sub button_down {	454	sub button_down {
440	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
441		456
442	$self->focus_in;	457	$self->focus_in;
443	}
444		458
445	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
446	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
447	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
448	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
449	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
450		535
451	sub draw {	536	sub draw {
452	my ($self) = @_;	537	my ($self) = @_;
453		538
454	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);
455		550
456	glPushMatrix;	551	glPushMatrix;
457	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
458	$self->_draw;	553	$self->_draw;
459	glPopMatrix;	554	glPopMatrix;
…		…
471	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
472	glEnd;	567	glEnd;
473	glDisable GL_BLEND;	568	glDisable GL_BLEND;
474	}	569	}
475		570
476	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
477	glPushMatrix;	572	glPushMatrix;
478	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
480	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
481	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
492	my ($self) = @_;	587	my ($self) = @_;
493		588
494	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
495	}	590	}
496		591
497	sub find_widget {
498	my ($self, $x, $y) = @_;
499
500	return () unless $self->{can_events};
501
502	return $self
503	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506	()
507	}
508
509	sub set_parent {
510	my ($self, $parent) = @_;
511
512	Scalar::Util::weaken ($self->{parent} = $parent);
513
514	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
516	$self->check_size;
517	}
518
519	sub check_size {
520	my ($self, $forced) = @_;
521
522	$self->{force_alloc} = 1 if $forced;
523	$CFClient::UI::ROOT->{check_size}{$self} = $self;
524	}
525
526	sub update {
527	my ($self) = @_;
528
529	$self->{parent}->update
530	if $self->{parent};
531	}
532
533	sub connect {
534	my ($self, $signal, $cb) = @_;
535
536	push @{ $self->{signal_cb}{$signal} }, $cb;
537	}
538
539	sub _emit {
540	my ($self, $signal, @args) = @_;
541
542	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543	}
544
545	sub emit {
546	my ($self, $signal, @args) = @_;
547
548	$self->_emit ($signal, @args)
549	|| $self->$signal (@args);
550	}
551
552	sub visibility_change {
553	#my ($self, $visible) = @_;
554	}
555
556	sub DESTROY {	592	sub DESTROY {
557	my ($self) = @_;	593	my ($self) = @_;
558		594
559	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
560	#$self->deactivate;	596	#$self->deactivate;
…		…
616	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
617	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
618	}	654	}
619		655
620	sub size_request {	656	sub size_request {
621	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
622	}	660	}
623		661
624	sub draw { }	662	sub draw { }
625		663
626	#############################################################################	664	#############################################################################
…		…
630	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
631		669
632	sub new {	670	sub new {
633	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
634		672
635	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
636		674
637	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
638	children => [],	676	children => [],
639	can_events => 0,	677	can_events => 0,
640	%arg,	678	%arg,
641	);	679	);
		680
642	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
643		683
644	$self	684	$self
645	}	685	}
646		686
647	sub add {	687	sub add {
…		…
655	$self->{children} = [	695	$self->{children} = [
656	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
657	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
658	];	698	];
659		699
660	$self->check_size (1);	700	$self->realloc;
661	$self->update;
662	}	701	}
663		702
664	sub children {	703	sub children {
665	@{ $_[0]{children} }	704	@{ $_[0]{children} }
666	}	705	}
…		…
671	delete $child->{parent};	710	delete $child->{parent};
672	$child->hide;	711	$child->hide;
673		712
674	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675		714
676	$self->check_size (1);	715	$self->realloc;
677	$self->update;
678	}	716	}
679		717
680	sub clear {	718	sub clear {
681	my ($self) = @_;	719	my ($self) = @_;
682		720
…		…
686	for (@$children) {	724	for (@$children) {
687	delete $_->{parent};	725	delete $_->{parent};
688	$_->hide;	726	$_->hide;
689	}	727	}
690		728
691	$self->check_size;	729	$self->realloc;
692	$self->update;
693	}	730	}
694		731
695	sub find_widget {	732	sub find_widget {
696	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
697		734
698	$x -= $self->{x};	735	$x -= $self->{x};
699	$y -= $self->{y};	736	$y -= $self->{y};
700		737
701	my $res;	738	my $res;
702		739
703	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
704	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
705	and return $res;	742	and return $res;
706	}	743	}
707		744
708	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
784	$self->SUPER::size_allocate ($w, $h);	821	$self->SUPER::size_allocate ($w, $h);
785	$self->update;	822	$self->update;
786	}	823	}
787		824
788	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
789	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
790	}	829	}
791		830
792	sub render_child {	831	sub render_child {
793	my ($self) = @_;	832	my ($self) = @_;
794		833
795	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
796	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
797	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
798		837
		838	{
		839	package CFClient::UI::Base;
		840
		841	($draw_x, $draw_y, $draw_w, $draw_h) =
		842	(0, 0, $self->{w}, $self->{h});
		843	}
		844
799	$self->_render;	845	$self->_render;
800	};	846	};
801	}	847	}
802		848
803	sub _draw {	849	sub _draw {
804	my ($self) = @_;	850	my ($self) = @_;
805		851
806	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
807		853
808	my $tex = $self->{texture}	854	my $tex = $self->{texture}
809	or return;	855	or return;
810		856
811	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
834	}	880	}
835		881
836	sub size_request {	882	sub size_request {
837	my ($self) = @_;	883	my ($self) = @_;
838		884
839	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
840		886
841	$w = 10 if $self->{scroll_x};	887	$w = 10 if $self->{scroll_x};
842	$h = 10 if $self->{scroll_y};	888	$h = 10 if $self->{scroll_y};
843		889
844	($w, $h)	890	($w, $h)
845	}	891	}
846		892
847	sub size_allocate {	893	sub size_allocate {
848	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
849		895
		896	my $child = $self->child;
		897
850	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
851	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
852		900
853	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
854	$self->update;	902	$self->update;
855	}	903	}
856		904
…		…
892	}	940	}
893		941
894	sub _render {	942	sub _render {
895	my ($self) = @_;	943	my ($self) = @_;
896		944
		945	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		946	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		947
897	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
898		949
899	$self->SUPER::_render;	950	$self->SUPER::_render;
900	}	951	}
901		952
…		…
904	package CFClient::UI::ScrolledWindow;	955	package CFClient::UI::ScrolledWindow;
905		956
906	our @ISA = CFClient::UI::HBox::;	957	our @ISA = CFClient::UI::HBox::;
907		958
908	sub new {	959	sub new {
909	my $class = shift;	960	my ($class, %arg) = @_;
		961
		962	my $child = delete $arg{child};
910		963
911	my $self;	964	my $self;
912		965
913	my $slider = new CFClient::UI::Slider	966	my $slider = new CFClient::UI::Slider
914	vertical => 1,	967	vertical => 1,
…		…
919	;	972	;
920		973
921	$self = $class->SUPER::new (	974	$self = $class->SUPER::new (
922	vp => (new CFClient::UI::ViewPort expand => 1),	975	vp => (new CFClient::UI::ViewPort expand => 1),
923	slider => $slider,	976	slider => $slider,
924	@_,	977	%arg,
925	);	978	);
926		979
927	$self->{vp}->add ($self->{scrolled});
928	$self->add ($self->{vp});
929	$self->add ($self->{slider});	980	$self->SUPER::add ($self->{vp}, $self->{slider});
		981	$self->add ($child) if $child;
930		982
931	$self	983	$self
		984	}
		985
		986	sub add {
		987	my ($self, $widget) = @_;
		988
		989	$self->{vp}->add ($self->{child} = $widget);
932	}	990	}
933		991
934	sub update {	992	sub update {
935	my ($self) = @_;	993	my ($self) = @_;
936		994
…		…
999		1057
1000	our @ISA = CFClient::UI::Bin::;	1058	our @ISA = CFClient::UI::Bin::;
1001		1059
1002	use CFClient::OpenGL;	1060	use CFClient::OpenGL;
1003		1061
1004	my @tex =	1062	my $bg =
		1063	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1064	mipmap => 1, wrap => 1;
		1065
		1066	my @border =
1005	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1067	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1006	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1068	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1007		1069
1008	sub new {	1070	sub new {
1009	my $class = shift;	1071	my ($class, %arg) = @_;
		1072
		1073	my $title = delete $arg{title};
1010		1074
1011	my $self = $class->SUPER::new (	1075	my $self = $class->SUPER::new (
1012	bg => [1, 1, 1, 1],	1076	bg => [1, 1, 1, 1],
1013	border_bg => [1, 1, 1, 1],	1077	border_bg => [1, 1, 1, 1],
1014	border => 0.6,	1078	border => 0.6,
1015	is_toplevel => 1,
1016	can_events => 1,	1079	can_events => 1,
1017	@_	1080	min_w => 16,
		1081	min_h => 16,
		1082	%arg,
1018	);	1083	);
1019		1084
1020	$self->{title} &&= new CFClient::UI::Label	1085	$self->{title} = new CFClient::UI::Label
1021	align => 0,	1086	align => 0,
1022	valign => 1,	1087	valign => 1,
1023	text => $self->{title},	1088	text => $title,
1024	fontsize => $self->{border};	1089	fontsize => $self->{border}
		1090	if defined $title;
1025		1091
1026	$self	1092	$self
		1093	}
		1094
		1095	sub add {
		1096	my ($self, @widgets) = @_;
		1097
		1098	$self->SUPER::add (@widgets);
		1099	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1027	}	1100	}
1028		1101
1029	sub border {	1102	sub border {
1030	int $_[0]{border} * $::FONTSIZE	1103	int $_[0]{border} * $::FONTSIZE
1031	}	1104	}
1032		1105
1033	sub size_request {	1106	sub size_request {
1034	my ($self) = @_;	1107	my ($self) = @_;
		1108
		1109	$self->{title}->size_request
		1110	if $self->{title};
1035		1111
1036	my ($w, $h) = $self->SUPER::size_request;	1112	my ($w, $h) = $self->SUPER::size_request;
1037		1113
1038	(	1114	(
1039	$w + $self->border * 2,	1115	$w + $self->border * 2,
…		…
1042	}	1118	}
1043		1119
1044	sub size_allocate {	1120	sub size_allocate {
1045	my ($self, $w, $h) = @_;	1121	my ($self, $w, $h) = @_;
1046		1122
		1123	if ($self->{title}) {
		1124	$self->{title}{w} = $w;
		1125	$self->{title}{h} = $h;
		1126	$self->{title}->size_allocate ($w, $h);
		1127	}
		1128
		1129	my $border = $self->border;
		1130
1047	$h -= List::Util::max 0, $self->border * 2;	1131	$h -= List::Util::max 0, $border * 2;
1048	$w -= List::Util::max 0, $self->border * 2;	1132	$w -= List::Util::max 0, $border * 2;
1049		1133
1050	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051	if $self->{title};
1052
1053	$self->child->configure ($self->border, $self->border, $w, $h);	1134	$self->child->configure ($border, $border, $w, $h);
1054	}	1135	}
1055		1136
1056	sub button_down {	1137	sub button_down {
1057	my ($self, $ev, $x, $y) = @_;	1138	my ($self, $ev, $x, $y) = @_;
1058		1139
…		…
1074	my ($ev, $x, $y) = @_;	1155	my ($ev, $x, $y) = @_;
1075		1156
1076	my $dx = $ev->{x} - $ox;	1157	my $dx = $ev->{x} - $ox;
1077	my $dy = $ev->{y} - $oy;	1158	my $dy = $ev->{y} - $oy;
1078		1159
1079	$self->{user_x} = $wx + $dx * $mx;
1080	$self->{user_y} = $wy + $dy * $my;
1081	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1160	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1161	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083	$self->move ($self->{user_x}, $self->{user_y});	1162
1084	$self->check_size;	1163	$self->realloc;
		1164	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1085	};	1165	};
1086		1166
1087	} elsif ($lr ^ $td) {	1167	} elsif ($lr ^ $td) {
1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1168	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089	my ($bx, $by) = ($self->{x}, $self->{y});	1169	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1091	$self->{motion} = sub {	1171	$self->{motion} = sub {
1092	my ($ev, $x, $y) = @_;	1172	my ($ev, $x, $y) = @_;
1093		1173
1094	($x, $y) = ($ev->{x}, $ev->{y});	1174	($x, $y) = ($ev->{x}, $ev->{y});
1095		1175
1096	$self->{user_x} = $bx + $x - $ox;	1176	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097	$self->{user_y} = $by + $y - $oy;
1098
1099	$self->move ($self->{user_x}, $self->{user_y});
1100	$self->update;
1101	};	1177	};
		1178	} else {
		1179	return 0;
		1180	}
		1181
1102	}	1182	1
1103	}	1183	}
1104		1184
1105	sub button_up {	1185	sub button_up {
1106	my ($self, $ev, $x, $y) = @_;	1186	my ($self, $ev, $x, $y) = @_;
1107		1187
1108	delete $self->{motion};	1188	!!delete $self->{motion}
1109	}	1189	}
1110		1190
1111	sub mouse_motion {	1191	sub mouse_motion {
1112	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1113		1193
1114	$self->{motion}->($ev, $x, $y) if $self->{motion};	1194	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1195
		1196	!!$self->{motion}
1115	}	1197	}
1116		1198
1117	sub _draw {	1199	sub _draw {
1118	my ($self) = @_;	1200	my ($self) = @_;
1119		1201
		1202	my $child = $self->{children}[0];
		1203
1120	my ($w, $h ) = ($self->{w}, $self->{h});	1204	my ($w, $h ) = ($self->{w}, $self->{h});
1121	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1205	my ($cw, $ch) = ($child->{w}, $child->{h});
1122		1206
1123	glEnable GL_TEXTURE_2D;	1207	glEnable GL_TEXTURE_2D;
1124	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1208	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1125		1209
1126	my $border = $self->border;	1210	my $border = $self->border;
1127		1211
1128	glColor @{ $self->{border_bg} };	1212	glColor @{ $self->{border_bg} };
1129	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1213	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1130	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1214	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1131	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1215	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1132	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1216	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1133		1217
1134	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1218	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1135	my $bg = $tex[0];	1219	glColor @{ $self->{bg} };
1136		1220
1137	# TODO: repeat texture not scale	1221	# TODO: repeat texture not scale
		1222	# solve this better(?)
1138	my $rep_x = $cw / $bg->{w};	1223	$bg->{s} = $cw / $bg->{w};
1139	my $rep_y = $ch / $bg->{h};	1224	$bg->{t} = $ch / $bg->{h};
1140
1141	glColor @{ $self->{bg} };
1142
1143	$bg->{s} = $rep_x;
1144	$bg->{t} = $rep_y;
1145	$bg->{wrap_mode} = 1;
1146	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1225	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147	}	1226	}
1148		1227
1149	glDisable GL_TEXTURE_2D;	1228	glDisable GL_TEXTURE_2D;
1150		1229
1151	$self->{title}->draw if $self->{title};
1152
1153	$self->child->draw;	1230	$child->draw;
		1231
		1232	if ($self->{title}) {
		1233	glTranslate 0, $border - $self->{h};
		1234	$self->{title}->_draw;
		1235	}
1154	}	1236	}
1155		1237
1156	#############################################################################	1238	#############################################################################
1157		1239
1158	package CFClient::UI::Table;	1240	package CFClient::UI::Table;
…		…
1180	my ($self, $x, $y, $child) = @_;	1262	my ($self, $x, $y, $child) = @_;
1181		1263
1182	$child->set_parent ($self);	1264	$child->set_parent ($self);
1183	$self->{children}[$y][$x] = $child;	1265	$self->{children}[$y][$x] = $child;
1184		1266
1185	$self->check_size (1);	1267	$self->realloc;
1186	}	1268	}
1187		1269
1188	# TODO: move to container class maybe? send children a signal on removal?	1270	# TODO: move to container class maybe? send children a signal on removal?
1189	sub clear {	1271	sub clear {
1190	my ($self) = @_;	1272	my ($self) = @_;
…		…
1195	for (@children) {	1277	for (@children) {
1196	delete $_->{parent};	1278	delete $_->{parent};
1197	$_->hide;	1279	$_->hide;
1198	}	1280	}
1199		1281
1200	$self->check_size (1);	1282	$self->realloc;
1201	$self->update;
1202	}	1283	}
1203		1284
1204	sub get_wh {	1285	sub get_wh {
1205	my ($self) = @_;	1286	my ($self) = @_;
1206		1287
…		…
1414	ellipsise => 3, # end	1495	ellipsise => 3, # end
1415	layout => (new CFClient::Layout),	1496	layout => (new CFClient::Layout),
1416	fontsize => 1,	1497	fontsize => 1,
1417	align => -1,	1498	align => -1,
1418	valign => -1,	1499	valign => -1,
1419	padding => 2,	1500	padding_x => 2,
		1501	padding_y => 2,
1420	can_events => 0,	1502	can_events => 0,
1421	%arg	1503	%arg
1422	);	1504	);
1423		1505
1424	if (exists $self->{template}) {	1506	if (exists $self->{template}) {
…		…
1460	$self->{text} = "T$text";	1542	$self->{text} = "T$text";
1461		1543
1462	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1544	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463	$self->{layout}->set_text ($text);	1545	$self->{layout}->set_text ($text);
1464		1546
		1547	$self->realloc;
1465	$self->update;	1548	$self->update;
1466	$self->check_size;
1467	}	1549	}
1468		1550
1469	sub set_markup {	1551	sub set_markup {
1470	my ($self, $markup) = @_;	1552	my ($self, $markup) = @_;
1471		1553
…		…
1475	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1557	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476		1558
1477	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1559	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478	$self->{layout}->set_markup ($markup);	1560	$self->{layout}->set_markup ($markup);
1479		1561
		1562	$self->realloc;
1480	$self->update;	1563	$self->update;
1481	$self->check_size;
1482	}	1564	}
1483		1565
1484	sub size_request {	1566	sub size_request {
1485	my ($self) = @_;	1567	my ($self) = @_;
1486		1568
…		…
1500		1582
1501	$w = List::Util::max $w, $w2;	1583	$w = List::Util::max $w, $w2;
1502	$h = List::Util::max $h, $h2;	1584	$h = List::Util::max $h, $h2;
1503	}	1585	}
1504		1586
1505	(	1587	($w, $h)
1506	$w + $self->{padding} * 2,
1507	$h + $self->{padding} * 2,
1508	)
1509	}	1588	}
1510		1589
1511	sub size_allocate {	1590	sub size_allocate {
1512	my ($self, $w, $h) = @_;	1591	my ($self, $w, $h) = @_;
1513		1592
		1593	delete $self->{ox};
		1594
1514	delete $self->{texture};	1595	delete $self->{texture}
		1596	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515	}	1597	}
1516		1598
1517	sub set_fontsize {	1599	sub set_fontsize {
1518	my ($self, $fontsize) = @_;	1600	my ($self, $fontsize) = @_;
1519		1601
1520	$self->{fontsize} = $fontsize;	1602	$self->{fontsize} = $fontsize;
1521	delete $self->{texture};	1603	delete $self->{texture};
1522		1604
1523	$self->update;	1605	$self->realloc;
1524	$self->check_size;
1525	}	1606	}
1526		1607
1527	sub _draw {	1608	sub _draw {
1528	my ($self) = @_;	1609	my ($self) = @_;
1529		1610
…		…
1535	$self->{layout}->set_width ($self->{w});	1616	$self->{layout}->set_width ($self->{w});
1536	$self->{layout}->set_ellipsise ($self->{ellipsise});	1617	$self->{layout}->set_ellipsise ($self->{ellipsise});
1537	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1618	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1619	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539		1620
1540	my $tex = new_from_layout CFClient::Texture $self->{layout};	1621	new_from_layout CFClient::Texture $self->{layout}
		1622	};
1541		1623
		1624	unless (exists $self->{ox}) {
1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1625	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1626	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544	: ($self->{w} - $tex->{w}) * 0.5);	1627	: ($self->{w} - $tex->{w}) * 0.5);
1545		1628
1546	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1629	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1630	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548	: ($self->{h} - $tex->{h}) * 0.5);	1631	: ($self->{h} - $tex->{h}) * 0.5);
1549
1550	$tex
1551	};	1632	};
1552		1633
1553	glEnable GL_TEXTURE_2D;	1634	glEnable GL_TEXTURE_2D;
1554	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1555		1636
…		…
1609	sub set_text {	1690	sub set_text {
1610	my ($self, $text) = @_;	1691	my ($self, $text) = @_;
1611		1692
1612	$self->{cursor} = length $text;	1693	$self->{cursor} = length $text;
1613	$self->_set_text ($text);	1694	$self->_set_text ($text);
1614	$self->update;	1695
1615	$self->check_size;	1696	$self->realloc;
1616	}	1697	}
1617		1698
1618	sub get_text {	1699	sub get_text {
1619	$_[0]{text}	1700	$_[0]{text}
1620	}	1701	}
…		…
1650	$self->{cursor} = length $text;	1731	$self->{cursor} = length $text;
1651	} elsif ($uni == 27) {	1732	} elsif ($uni == 27) {
1652	$self->_emit ('escape');	1733	$self->_emit ('escape');
1653	} elsif ($uni) {	1734	} elsif ($uni) {
1654	substr $text, $self->{cursor}++, 0, chr $uni;	1735	substr $text, $self->{cursor}++, 0, chr $uni;
		1736	} else {
		1737	return 0;
1655	}	1738	}
1656		1739
1657	$self->_set_text ($text);	1740	$self->_set_text ($text);
1658	$self->update;	1741
1659	$self->check_size;	1742	$self->realloc;
		1743
		1744	1
1660	}	1745	}
1661		1746
1662	sub focus_in {	1747	sub focus_in {
1663	my ($self) = @_;	1748	my ($self) = @_;
1664		1749
…		…
1679	utf8::encode $text;	1764	utf8::encode $text;
1680	$self->{cursor} = length substr $text, 0, $idx;	1765	$self->{cursor} = length substr $text, 0, $idx;
1681		1766
1682	$self->_set_text ($self->{text});	1767	$self->_set_text ($self->{text});
1683	$self->update;	1768	$self->update;
		1769
		1770	1
1684	}	1771	}
1685		1772
1686	sub mouse_motion {	1773	sub mouse_motion {
1687	my ($self, $ev, $x, $y) = @_;	1774	my ($self, $ev, $x, $y) = @_;
1688	# 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
1689	}	1778	}
1690		1779
1691	sub _draw {	1780	sub _draw {
1692	my ($self) = @_;	1781	my ($self) = @_;
1693		1782
…		…
1770	} else {	1859	} else {
1771	$self->set_text ($self->{history_saveback});	1860	$self->set_text ($self->{history_saveback});
1772	}	1861	}
1773		1862
1774	} else {	1863	} else {
1775	$self->SUPER::key_down ($ev);	1864	return $self->SUPER::key_down ($ev)
		1865	}
		1866
1776	}	1867	1
1777
1778	}	1868	}
1779		1869
1780	#############################################################################	1870	#############################################################################
1781		1871
1782	package CFClient::UI::Button;	1872	package CFClient::UI::Button;
…		…
1791		1881
1792	sub new {	1882	sub new {
1793	my $class = shift;	1883	my $class = shift;
1794		1884
1795	$class->SUPER::new (	1885	$class->SUPER::new (
1796	padding => 4,	1886	padding_x => 4,
		1887	padding_y => 4,
1797	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1798	active_fg => [0, 0, 1],	1889	active_fg => [0, 0, 1],
1799	can_hover => 1,	1890	can_hover => 1,
1800	align => 0,	1891	align => 0,
1801	valign => 0,	1892	valign => 0,
…		…
1810	my ($self, $ev, $x, $y) = @_;	1901	my ($self, $ev, $x, $y) = @_;
1811		1902
1812	$self->emit ("activate")	1903	$self->emit ("activate")
1813	if $x >= 0 && $x < $self->{w}	1904	if $x >= 0 && $x < $self->{w}
1814	&& $y >= 0 && $y < $self->{h};	1905	&& $y >= 0 && $y < $self->{h};
		1906
		1907	1
1815	}	1908	}
1816		1909
1817	sub _draw {	1910	sub _draw {
1818	my ($self) = @_;	1911	my ($self) = @_;
1819		1912
…		…
1848		1941
1849	sub new {	1942	sub new {
1850	my $class = shift;	1943	my $class = shift;
1851		1944
1852	$class->SUPER::new (	1945	$class->SUPER::new (
1853	padding => 2,	1946	padding_x => 2,
		1947	padding_y => 2,
1854	fg => [1, 1, 1],	1948	fg => [1, 1, 1],
1855	active_fg => [1, 1, 0],	1949	active_fg => [1, 1, 0],
1856	bg => [0, 0, 0, 0.2],	1950	bg => [0, 0, 0, 0.2],
1857	active_bg => [1, 1, 1, 0.5],	1951	active_bg => [1, 1, 1, 0.5],
1858	state => 0,	1952	state => 0,
…		…
1862	}	1956	}
1863		1957
1864	sub size_request {	1958	sub size_request {
1865	my ($self) = @_;	1959	my ($self) = @_;
1866		1960
1867	($self->{padding} * 2 + 6) x 2	1961	(6) x 2
1868	}	1962	}
1869		1963
1870	sub button_down {	1964	sub button_down {
1871	my ($self, $ev, $x, $y) = @_;	1965	my ($self, $ev, $x, $y) = @_;
1872		1966
1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1967	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1968	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875	$self->{state} = !$self->{state};	1969	$self->{state} = !$self->{state};
1876	$self->_emit (changed => $self->{state});	1970	$self->_emit (changed => $self->{state});
		1971	} else {
		1972	return 0
		1973	}
		1974
1877	}	1975	1
1878	}	1976	}
1879		1977
1880	sub _draw {	1978	sub _draw {
1881	my ($self) = @_;	1979	my ($self) = @_;
1882		1980
1883	$self->SUPER::_draw;	1981	$self->SUPER::_draw;
1884		1982
1885	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1983	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886		1984
1887	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1985	my ($w, $h) = @$self{qw(w h)};
		1986
		1987	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888		1988
1889	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1989	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890		1990
1891	my $tex = $self->{state} ? $tex[1] : $tex[0];	1991	my $tex = $self->{state} ? $tex[1] : $tex[0];
1892		1992
…		…
2157	fg => [1, 1, 1],	2257	fg => [1, 1, 1],
2158	active_fg => [0, 0, 0],	2258	active_fg => [0, 0, 0],
2159	bg => [0, 0, 0, 0.2],	2259	bg => [0, 0, 0, 0.2],
2160	active_bg => [1, 1, 1, 0.5],	2260	active_bg => [1, 1, 1, 0.5],
2161	range => [0, 0, 100, 10, 0],	2261	range => [0, 0, 100, 10, 0],
2162	req_w => $::WIDTH / 80,	2262	min_w => $::WIDTH / 80,
2163	req_h => $::WIDTH / 80,	2263	min_h => $::WIDTH / 80,
2164	vertical => 0,	2264	vertical => 0,
2165	can_hover => 1,	2265	can_hover => 1,
2166	inner_pad => 0.02,	2266	inner_pad => 0.02,
2167	@_	2267	@_
2168	);	2268	);
…		…
2171	$self->update;	2271	$self->update;
2172		2272
2173	$self	2273	$self
2174	}	2274	}
2175		2275
		2276	sub changed { }
		2277
2176	sub set_range {	2278	sub set_range {
2177	my ($self, $range) = @_;	2279	my ($self, $range) = @_;
2178		2280
2179	($range, $self->{range}) = ($self->{range}, $range);	2281	($range, $self->{range}) = ($self->{range}, $range);
2180		2282
…		…
2206	}	2308	}
2207		2309
2208	sub size_request {	2310	sub size_request {
2209	my ($self) = @_;	2311	my ($self) = @_;
2210		2312
2211	my $w = $self->{req_w};	2313	($self->{req_w}, $self->{req_h})
2212	my $h = $self->{req_h};
2213
2214	$self->{vertical} ? ($h, $w) : ($w, $h)
2215	}	2314	}
2216		2315
2217	sub button_down {	2316	sub button_down {
2218	my ($self, $ev, $x, $y) = @_;	2317	my ($self, $ev, $x, $y) = @_;
2219		2318
2220	$self->SUPER::button_down ($ev, $x, $y);	2319	$self->SUPER::button_down ($ev, $x, $y);
2221		2320
2222	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2321	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223		2322
2224	$self->mouse_motion ($ev, $x, $y);	2323	$self->mouse_motion ($ev, $x, $y)
2225	}	2324	}
2226		2325
2227	sub mouse_motion {	2326	sub mouse_motion {
2228	my ($self, $ev, $x, $y) = @_;	2327	my ($self, $ev, $x, $y) = @_;
2229		2328
…		…
2233	my (undef, $lo, $hi, $page) = @{$self->{range}};	2332	my (undef, $lo, $hi, $page) = @{$self->{range}};
2234		2333
2235	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2334	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236		2335
2237	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2336	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2337	} else {
		2338	return 0;
		2339	}
		2340
2238	}	2341	1
2239	}	2342	}
2240		2343
2241	sub update {	2344	sub update {
2242	my ($self) = @_;	2345	my ($self) = @_;
2243		2346
…		…
2604	}	2707	}
2605		2708
2606	sub set_tooltip_from {	2709	sub set_tooltip_from {
2607	my ($self, $widget) = @_;	2710	my ($self, $widget) = @_;
2608		2711
		2712	my $tooltip = $widget->{tooltip};
		2713
		2714	if ($ENV{CFPLUS_DEBUG} & 2) {
		2715	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2716	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2717	. "req $widget->{req_w} $widget->{req_h}\n"
		2718	. "visible $widget->{visible}";
		2719	}
		2720
2609	$self->add (new CFClient::UI::Label	2721	$self->add (new CFClient::UI::Label
2610	markup => $widget->{tooltip},	2722	markup => $tooltip,
2611	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2723	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2612	fontsize => 0.8,	2724	fontsize => 0.8,
2613	fg => [0, 0, 0, 1],	2725	fg => [0, 0, 0, 1],
2614	ellipsise => 0,	2726	ellipsise => 0,
2615	font => ($widget->{tooltip_font} || $::FONT_PROP),	2727	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2626		2738
2627	sub size_allocate {	2739	sub size_allocate {
2628	my ($self, $w, $h) = @_;	2740	my ($self, $w, $h) = @_;
2629		2741
2630	$self->SUPER::size_allocate ($w - 4, $h - 4);	2742	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2743	}
		2744
		2745	sub visibility_change {
		2746	my ($self, $visible) = @_;
		2747
		2748	return unless $visible;
		2749
		2750	$self->{root}->on_post_alloc ("move_$self" => sub {
		2751	my $widget = $self->{owner}
		2752	or return;
		2753
		2754	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2755
		2756	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2757	if $x + $self->{w} > $::WIDTH;
		2758
		2759	$self->move_abs ($x, $y);
		2760	});
2631	}	2761	}
2632		2762
2633	sub _draw {	2763	sub _draw {
2634	my ($self) = @_;	2764	my ($self) = @_;
2635		2765
…		…
2652	glVertex $w, $h;	2782	glVertex $w, $h;
2653	glVertex $w, 0;	2783	glVertex $w, 0;
2654	glEnd;	2784	glEnd;
2655		2785
2656	glTranslate 2 - 0.375, 2 - 0.375;	2786	glTranslate 2 - 0.375, 2 - 0.375;
		2787
2657	$self->SUPER::_draw;	2788	$self->SUPER::_draw;
2658	}	2789	}
2659		2790
2660	#############################################################################	2791	#############################################################################
2661		2792
…		…
2737	$self->SUPER::DESTROY;	2868	$self->SUPER::DESTROY;
2738	}	2869	}
2739		2870
2740	#############################################################################	2871	#############################################################################
2741		2872
2742	package CFClient::UI::Inventory;	2873	package CFClient::UI::Buttonbar;
2743		2874
2744	our @ISA = CFClient::UI::ScrolledWindow::;	2875	our @ISA = CFClient::UI::HBox::;
2745		2876
2746	sub new {	2877	# TODO: should actualyl wrap buttons and other goodies.
2747	my $class = shift;
2748
2749	my $self = $class->SUPER::new (
2750	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2751	@_,
2752	);
2753
2754	$self
2755	}
2756
2757	sub set_items {
2758	my ($self, $items) = @_;
2759
2760	$self->{scrolled}->clear;
2761	return unless $items;
2762
2763	my @items = sort {
2764	($a->{type} <=> $b->{type})
2765	or ($a->{name} cmp $b->{name})
2766	} @$items;
2767
2768	$self->{real_items} = \@items;
2769
2770	my $row = 0;
2771	for my $item (@items) {
2772	CFClient::Item::update_widgets $item;
2773
2774	$self->{scrolled}->add (0, $row, $item->{face_widget});
2775	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2776	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2777
2778	$row++;
2779	}
2780	}
2781		2878
2782	#############################################################################	2879	#############################################################################
2783		2880
2784	package CFClient::UI::Menu;	2881	package CFClient::UI::Menu;
2785		2882
…		…
2826	# maybe save $GRAB? must be careful about events...	2923	# maybe save $GRAB? must be careful about events...
2827	$GRAB = $self;	2924	$GRAB = $self;
2828	$self->{button} = $ev->{button};	2925	$self->{button} = $ev->{button};
2829		2926
2830	$self->show;	2927	$self->show;
2831	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2928	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2832	}	2929	}
2833		2930
2834	sub mouse_motion {	2931	sub mouse_motion {
2835	my ($self, $ev, $x, $y) = @_;	2932	my ($self, $ev, $x, $y) = @_;
2836		2933
2837	# TODO: should use vbox->find_widget or so	2934	# TODO: should use vbox->find_widget or so
2838	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2839	$self->{hover} = $self->{item}{$HOVER};	2936	$self->{hover} = $self->{item}{$HOVER};
		2937
		2938	0
2840	}	2939	}
2841		2940
2842	sub button_up {	2941	sub button_up {
2843	my ($self, $ev, $x, $y) = @_;	2942	my ($self, $ev, $x, $y) = @_;
2844		2943
…		…
2846	undef $GRAB;	2945	undef $GRAB;
2847	$self->hide;	2946	$self->hide;
2848		2947
2849	$self->_emit ("popdown");	2948	$self->_emit ("popdown");
2850	$self->{hover}[1]->() if $self->{hover};	2949	$self->{hover}[1]->() if $self->{hover};
		2950	} else {
		2951	return 0
		2952	}
		2953
		2954	1
		2955	}
		2956
		2957	#############################################################################
		2958
		2959	package CFClient::UI::Multiplexer;
		2960
		2961	our @ISA = CFClient::UI::Container::;
		2962
		2963	sub new {
		2964	my $class = shift;
		2965
		2966	my $self = $class->SUPER::new (
		2967	@_,
		2968	);
		2969
		2970	$self->{current} = $self->{children}[0]
		2971	if @{ $self->{children} };
		2972
		2973	$self
		2974	}
		2975
		2976	sub add {
		2977	my ($self, @widgets) = @_;
		2978
		2979	$self->SUPER::add (@widgets);
		2980
		2981	$self->{current} = $self->{children}[0]
		2982	if @{ $self->{children} };
		2983	}
		2984
		2985	sub set_current_page {
		2986	my ($self, $page_or_widget) = @_;
		2987
		2988	my $widget = ref $page_or_widget
		2989	? $page_or_widget
		2990	: $self->{children}[$page_or_widget];
		2991
		2992	$self->{current} = $widget;
		2993	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2994
		2995	$self->_emit (page_changed => $self->{current});
		2996
		2997	$self->realloc;
		2998	}
		2999
		3000	sub visible_children {
		3001	$_[0]{current}
		3002	}
		3003
		3004	sub size_request {
		3005	my ($self) = @_;
		3006
		3007	$self->{current}->size_request
		3008	}
		3009
		3010	sub size_allocate {
		3011	my ($self, $w, $h) = @_;
		3012
		3013	$self->{current}->configure (0, 0, $w, $h);
		3014	}
		3015
		3016	sub _draw {
		3017	my ($self) = @_;
		3018
		3019	$self->{current}->draw;
		3020	}
		3021
		3022	#############################################################################
		3023
		3024	package CFClient::UI::Notebook;
		3025
		3026	our @ISA = CFClient::UI::VBox::;
		3027
		3028	sub new {
		3029	my $class = shift;
		3030
		3031	my $self = $class->SUPER::new (
		3032	buttonbar => (new CFClient::UI::Buttonbar),
		3033	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3034	# filter => # will be put between multiplexer and $self
		3035	@_,
		3036	);
2851	}	3037
		3038	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3039	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3040
		3041	$self
		3042	}
		3043
		3044	sub add {
		3045	my ($self, $title, $widget, $tooltip) = @_;
		3046
		3047	Scalar::Util::weaken $self;
		3048
		3049	$self->{buttonbar}->add (new CFClient::UI::Button
		3050	markup => $title,
		3051	tooltip => $tooltip,
		3052	on_activate => sub { $self->set_current_page ($widget) },
		3053	);
		3054
		3055	$self->{multiplexer}->add ($widget);
		3056	}
		3057
		3058	sub set_current_page {
		3059	my ($self, $page) = @_;
		3060
		3061	$self->{multiplexer}->set_current_page ($page);
		3062	$self->_emit (page_changed => $self->{multiplexer}{current});
2852	}	3063	}
2853		3064
2854	#############################################################################	3065	#############################################################################
2855		3066
2856	package CFClient::UI::Statusbox;	3067	package CFClient::UI::Statusbox;
…		…
2961	$self->SUPER::reconfigure;	3172	$self->SUPER::reconfigure;
2962	}	3173	}
2963		3174
2964	#############################################################################	3175	#############################################################################
2965		3176
2966	package CFClient::UI::Root;	3177	package CFClient::UI::Inventory;
2967		3178
2968	our @ISA = CFClient::UI::Container::;	3179	our @ISA = CFClient::UI::ScrolledWindow::;
2969
2970	use CFClient::OpenGL;
2971		3180
2972	sub new {	3181	sub new {
2973	my $class = shift;	3182	my $class = shift;
2974		3183
2975	$class->SUPER::new (	3184	my $self = $class->SUPER::new (
		3185	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3186	@_,
		3187	);
		3188
		3189	$self
		3190	}
		3191
		3192	sub set_items {
		3193	my ($self, $items) = @_;
		3194
		3195	$self->{child}->clear;
		3196	return unless $items;
		3197
		3198	my @items = sort {
		3199	($a->{type} <=> $b->{type})
		3200	or ($a->{name} cmp $b->{name})
		3201	} @$items;
		3202
		3203	$self->{real_items} = \@items;
		3204
		3205	my $row = 0;
		3206	for my $item (@items) {
		3207	CFClient::Item::update_widgets $item;
		3208
		3209	$self->{child}->add (0, $row, $item->{face_widget});
		3210	$self->{child}->add (1, $row, $item->{desc_widget});
		3211	$self->{child}->add (2, $row, $item->{weight_widget});
		3212
		3213	$row++;
		3214	}
		3215	}
		3216
		3217	#############################################################################
		3218
		3219	package CFClient::UI::BindEditor;
		3220
		3221	our @ISA = CFClient::UI::FancyFrame::;
		3222
		3223	sub new {
		3224	my $class = shift;
		3225
		3226	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3227
		3228	$self->add (my $vb = new CFClient::UI::VBox);
		3229
		3230
		3231	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3232	text => "start recording",
		3233	tooltip => "Start/Stops recording of actions."
		3234	."All subsequent actions after the recording started will be captured."
		3235	."The actions are displayed after the record was stopped."
		3236	."To bind the action you have to click on the 'Bind' button",
		3237	on_activate => sub {
		3238	unless ($self->{recording}) {
		3239	$self->start;
		3240	} else {
		3241	$self->stop;
		3242	}
		3243	});
		3244
		3245	$vb->add (new CFClient::UI::Label text => "Actions:");
		3246	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3247
		3248	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3251	$hb->add (new CFClient::UI::Button
		3252	text => "bind",
		3253	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3254	on_activate => sub {
		3255	$self->ask_for_bind;
		3256	});
		3257
		3258	$vb->add (my $hb = new CFClient::UI::HBox);
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "ok",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor and saves the binding",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->commit;
		3266	});
		3267
		3268	$hb->add (new CFClient::UI::Button
		3269	text => "cancel",
		3270	expand => 1,
		3271	tooltip => "This closes the binding editor without saving",
		3272	on_activate => sub {
		3273	$self->hide;
		3274	$self->{binding_cancel}->()
		3275	if $self->{binding_cancel};
		3276	});
		3277
		3278	$self->update_binding_widgets;
		3279
		3280	$self
		3281	}
		3282
		3283	sub commit {
		3284	my ($self) = @_;
		3285	my ($mod, $sym, $cmds) = $self->get_binding;
		3286	if ($sym != 0 && @$cmds > 0) {
		3287	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3288	."'. Don't forget 'Save Config'!");
		3289	$self->{binding_change}->($mod, $sym, $cmds)
		3290	if $self->{binding_change};
		3291	} else {
		3292	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3293	$self->{binding_cancel}->()
		3294	if $self->{binding_cancel};
		3295	}
		3296	}
		3297
		3298	sub start {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("stop recording");
		3302	$self->{recording} = 1;
		3303	$self->clear_command_list;
		3304	$::CONN->start_record if $::CONN;
		3305	}
		3306
		3307	sub stop {
		3308	my ($self) = @_;
		3309
		3310	$self->{rec_btn}->set_text ("start recording");
		3311	$self->{recording} = 0;
		3312
		3313	my $rec;
		3314	$rec = $::CONN->stop_record if $::CONN;
		3315	return unless ref $rec eq 'ARRAY';
		3316	$self->set_command_list ($rec);
		3317	}
		3318
		3319
		3320	sub ask_for_bind_and_commit {
		3321	my ($self) = @_;
		3322	$self->ask_for_bind (1);
		3323	}
		3324
		3325	sub ask_for_bind {
		3326	my ($self, $commit) = @_;
		3327
		3328	CFClient::Binder::open_binding_dialog (sub {
		3329	my ($mod, $sym) = @_;
		3330	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3331	$self->update_binding_widgets;
		3332	$self->commit if $commit;
		3333	});
		3334	}
		3335
		3336	# $mod and $sym are the modifiers and key symbol
		3337	# $cmds is a array ref of strings (the commands)
		3338	# $cb is the callback that is executed on OK
		3339	# $ccb is the callback that is executed on CANCEL and
		3340	# when the binding was unsuccessful on OK
		3341	sub set_binding {
		3342	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3343
		3344	$self->clear_command_list;
		3345	$self->{recording} = 0;
		3346	$self->{rec_btn}->set_text ("start recording");
		3347
		3348	$self->{binding} = [$mod, $sym];
		3349	$self->{commands} = $cmds;
		3350
		3351	$self->{binding_change} = $cb;
		3352	$self->{binding_cancel} = $ccb;
		3353
		3354	$self->update_binding_widgets;
		3355	}
		3356
		3357	# this is a shortcut method that asks for a binding
		3358	# and then just binds it.
		3359	sub do_quick_binding {
		3360	my ($self, $cmds) = @_;
		3361	$self->set_binding (undef, undef, $cmds, sub {
		3362	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3363	});
		3364	$self->ask_for_bind (1);
		3365	}
		3366
		3367	sub update_binding_widgets {
		3368	my ($self) = @_;
		3369	my ($mod, $sym, $cmds) = $self->get_binding;
		3370	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3371	$self->set_command_list ($cmds);
		3372	}
		3373
		3374	sub get_binding {
		3375	my ($self) = @_;
		3376	return (
		3377	$self->{binding}->[0],
		3378	$self->{binding}->[1],
		3379	[ grep { defined $_ } @{$self->{commands}} ]
		3380	);
		3381	}
		3382
		3383	sub clear_command_list {
		3384	my ($self) = @_;
		3385	$self->{cmdbox}->clear ();
		3386	}
		3387
		3388	sub set_command_list {
		3389	my ($self, $cmds) = @_;
		3390
		3391	$self->{cmdbox}->clear ();
		3392	$self->{commands} = $cmds;
		3393
		3394	my $idx = 0;
		3395
		3396	for (@$cmds) {
		3397	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3398
		3399	my $i = $idx;
		3400	$hb->add (new CFClient::UI::Label text => $_);
		3401	$hb->add (new CFClient::UI::Button
		3402	text => "delete",
		3403	tooltip => "Deletes the action from the record",
		3404	on_activate => sub {
		3405	$self->{cmdbox}->remove ($hb);
		3406	$cmds->[$i] = undef;
		3407	});
		3408
		3409
		3410	$idx++
		3411	}
		3412	}
		3413
		3414	#############################################################################
		3415
		3416	package CFClient::UI::SpellList;
		3417
		3418	our @ISA = CFClient::UI::Table::;
		3419
		3420	sub new {
		3421	my $class = shift;
		3422
		3423	my $self = $class->SUPER::new (
		3424	binding => [],
		3425	commands => [],
		3426	@_,
		3427	)
		3428	}
		3429
		3430	# XXX: Do sorting? Argl...
		3431	sub add_spell {
		3432	my ($self, $spell) = @_;
		3433	$self->{spells}->{$spell->{name}} = $spell;
		3434
		3435	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3436	face => $spell->{face},
		3437	can_hover => 1,
		3438	can_events => 1,
		3439	tooltip => $spell->{message});
		3440
		3441	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3442	text => $spell->{name},
		3443	can_hover => 1,
		3444	can_events => 1,
		3445	tooltip => $spell->{message},
		3446	expand => 1);
		3447
		3448	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3449	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3450	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3451	expand => 1);
		3452
		3453	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3454	text => "bind to key",
		3455	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3456	}
		3457
		3458	sub rebuild_spell_list {
		3459	my ($self) = @_;
		3460	$self->{tbl_idx} = 0;
		3461	$self->add_spell ($_) for values %{$self->{spells}};
		3462	}
		3463
		3464	sub remove_spell {
		3465	my ($self, $spell) = @_;
		3466	delete $self->{spells}->{$spell->{name}};
		3467	$self->rebuild_spell_list;
		3468	}
		3469
		3470	#############################################################################
		3471
		3472	package CFClient::UI::Root;
		3473
		3474	our @ISA = CFClient::UI::Container::;
		3475
		3476	use CFClient::OpenGL;
		3477
		3478	sub new {
		3479	my $class = shift;
		3480
		3481	my $self = $class->SUPER::new (
2976	visible => 1,	3482	visible => 1,
2977	@_,	3483	@_,
2978	)	3484	);
2979	}
2980		3485
2981	sub configure {	3486	Scalar::Util::weaken ($self->{root} = $self);
2982	my ($self, $x, $y, $w, $h) = @_;
2983		3487
2984	$self->{w} = $w;	3488	$self
2985	$self->{h} = $h;
2986	}
2987
2988	sub check_size {
2989	my ($self) = @_;
2990
2991	$self->size_allocate ($self->{w}, $self->{h})
2992	if $self->{w};
2993	}	3489	}
2994		3490
2995	sub size_request {	3491	sub size_request {
2996	my ($self) = @_;	3492	my ($self) = @_;
2997		3493
2998	($self->{w}, $self->{h})	3494	($self->{w}, $self->{h})
		3495	}
		3496
		3497	sub _to_pixel {
		3498	my ($coord, $size, $max) = @_;
		3499
		3500	$coord =
		3501	$coord eq "center" ? ($max - $size) * 0.5
		3502	: $coord eq "max" ? $max
		3503	: $coord;
		3504
		3505	$coord = 0 if $coord < 0;
		3506	$coord = $max - $size if $coord > $max - $size;
		3507
		3508	int $coord + 0.5
2999	}	3509	}
3000		3510
3001	sub size_allocate {	3511	sub size_allocate {
3002	my ($self, $w, $h) = @_;	3512	my ($self, $w, $h) = @_;
3003		3513
3004	for my $child ($self->children) {	3514	for my $child ($self->children) {
3005	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3515	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3006		3516
3007	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3517	$X = $child->{force_x} if exists $child->{force_x};
3008	if exists $child->{req_x};	3518	$Y = $child->{force_y} if exists $child->{force_y};
3009		3519
3010	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3520	$X = _to_pixel $X, $W, $self->{w};
3011	if exists $child->{req_y};	3521	$Y = _to_pixel $Y, $H, $self->{h};
3012
3013	delete @$child{qw(req_x req_y)};
3014
3015	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3016	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3017		3522
3018	$child->configure ($X, $Y, $W, $H);	3523	$child->configure ($X, $Y, $W, $H);
3019	}	3524	}
3020	}	3525	}
3021		3526
…		…
3032	}	3537	}
3033		3538
3034	sub update {	3539	sub update {
3035	my ($self) = @_;	3540	my ($self) = @_;
3036		3541
3037	$self->check_size;
3038	$::WANT_REFRESH++;	3542	$::WANT_REFRESH++;
3039	}	3543	}
3040		3544
3041	sub add {	3545	sub add {
3042	my ($self, @children) = @_;	3546	my ($self, @children) = @_;
3043		3547
3044	for my $child (@children) {
3045	$child->{is_toplevel} = 1;	3548	$_->{is_toplevel} = 1
3046		3549	for @children;
3047	# integerise window positions
3048	$child->{x} = int $child->{x};
3049	$child->{y} = int $child->{y};
3050	}
3051		3550
3052	$self->SUPER::add (@children);	3551	$self->SUPER::add (@children);
3053
3054	for (my @widgets = @children; my $w = pop @widgets; ) {
3055	push @widgets, $w->children;
3056	$w->set_visible;
3057	}
3058
3059	}	3552	}
3060		3553
3061	sub remove {	3554	sub remove {
3062	my ($self, @children) = @_;	3555	my ($self, @children) = @_;
3063		3556
3064	$self->SUPER::remove (@children);	3557	$self->SUPER::remove (@children);
		3558
		3559	delete $self->{is_toplevel}
		3560	for @children;
3065		3561
3066	while (@children) {	3562	while (@children) {
3067	my $w = pop @children;	3563	my $w = pop @children;
3068	push @children, $w->children;	3564	push @children, $w->children;
3069	$w->set_invisible;	3565	$w->set_invisible;
…		…
3088	while ($self->{refresh_hook}) {	3584	while ($self->{refresh_hook}) {
3089	$_->()	3585	$_->()
3090	for values %{delete $self->{refresh_hook}};	3586	for values %{delete $self->{refresh_hook}};
3091	}	3587	}
3092		3588
3093	if ($self->{check_size}) {	3589	if ($self->{realloc}) {
		3590	my %queue;
3094	my @queue;	3591	my @queue;
		3592	my $widget;
3095		3593
3096	for (;;) {	3594	outer:
3097	if ($self->{check_size}) {	3595	while () {
3098	#TODO use array-of-depth approach	3596	if (my $realloc = delete $self->{realloc}) {
		3597	for $widget (values %$realloc) {
		3598	$widget->{visible} or next; # do not resize invisible widgets
3099		3599
3100	@queue = sort { $a->{visible} <=> $b->{visible} }	3600	$queue{$widget+0}++ and next; # duplicates are common
3101	@queue, values %{delete $self->{check_size}};	3601
		3602	push @{ $queue[$widget->{visible}] }, $widget;
		3603	}
3102	}	3604	}
3103		3605
		3606	while () {
		3607	@queue or last outer;
		3608
3104	my $widget = pop @queue || last;	3609	$widget = pop @{ $queue[-1] || [] }
3105		3610	and last;
3106	defined $widget->{visible} or last; # do not resize invisible widgets
3107
3108	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3109	? @$widget{qw(def_w def_h)}
3110	: $widget->size_request;
3111
3112	if (delete $widget->{force_alloc}
3113	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3114	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3115		3611
		3612	pop @queue;
		3613	}
		3614
		3615	delete $queue{$widget+0};
		3616
		3617	my ($w, $h) = $widget->size_request;
		3618
		3619	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3620	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3621
		3622	$w = $widget->{force_w} if exists $widget->{force_w};
		3623	$h = $widget->{force_h} if exists $widget->{force_h};
		3624
		3625	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3626	|| delete $widget->{force_realloc}) {
3116	$widget->{req_w} = $w;	3627	$widget->{req_w} = $w;
3117	$widget->{req_h} = $h;	3628	$widget->{req_h} = $h;
3118		3629
3119	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3630	$self->{size_alloc}{$widget+0} = $widget;
3120		3631
3121	$widget->{parent}->check_size
3122	if $widget->{parent};	3632	if (my $parent = $widget->{parent}) {
		3633	$self->{realloc}{$parent+0} = $parent
		3634	unless $queue{$parent+0};
		3635
		3636	$parent->{force_size_alloc} = 1;
		3637	$self->{size_alloc}{$parent+0} = $parent;
		3638	}
3123	}	3639	}
		3640
		3641	delete $self->{realloc}{$widget+0};
3124	}	3642	}
3125	}	3643	}
3126		3644
3127	while ($self->{size_alloc}) {	3645	while (my $size_alloc = delete $self->{size_alloc}) {
3128	for (values %{delete $self->{size_alloc}}) {	3646	my @queue = sort { $b->{visible} <=> $a->{visible} }
3129	my ($widget, $w, $h) = @$_;	3647	values %$size_alloc;
		3648
		3649	while () {
		3650	my $widget = pop @queue || last;
		3651
		3652	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3130		3653
3131	$w = 0 if $w < 0;	3654	$w = 0 if $w < 0;
3132	$h = 0 if $h < 0;	3655	$h = 0 if $h < 0;
3133		3656
		3657	$w = int $w + 0.5;
		3658	$h = int $h + 0.5;
		3659
		3660	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3661	$widget->{old_w} = $widget->{w};
		3662	$widget->{old_h} = $widget->{h};
		3663
3134	$widget->{w} = $w;	3664	$widget->{w} = $w;
3135	$widget->{h} = $h;	3665	$widget->{h} = $h;
		3666
3136	$widget->emit (size_allocate => $w, $h);	3667	$widget->emit (size_allocate => $w, $h);
		3668	}
3137	}	3669	}
3138	}	3670	}
3139		3671
3140	while ($self->{post_alloc_hook}) {	3672	while ($self->{post_alloc_hook}) {
3141	$_->()	3673	$_->()
3142	for values %{delete $self->{post_alloc_hook}};	3674	for values %{delete $self->{post_alloc_hook}};
3143	}	3675	}
		3676
3144		3677
3145	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3678	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3146	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3679	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3147	glClear GL_COLOR_BUFFER_BIT;	3680	glClear GL_COLOR_BUFFER_BIT;
3148		3681
…		…
3150	glLoadIdentity;	3683	glLoadIdentity;
3151	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3684	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3152	glMatrixMode GL_MODELVIEW;	3685	glMatrixMode GL_MODELVIEW;
3153	glLoadIdentity;	3686	glLoadIdentity;
3154		3687
		3688	{
		3689	package CFClient::UI::Base;
		3690
		3691	($draw_x, $draw_y, $draw_w, $draw_h) =
		3692	(0, 0, $self->{w}, $self->{h});
		3693	}
		3694
3155	$self->_draw;	3695	$self->_draw;
3156	}	3696	}
3157		3697
3158	#############################################################################	3698	#############################################################################
3159		3699

Diff Legend

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