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.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.395 by root, Sat Jul 21 13:56:00 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
		7	use Event;
8		8
9	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
10	use CFClient::Texture;	11	use CFPlus::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		14
14	our $LAYOUT;	15	our $LAYOUT;
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
		28	$TOOLTIP->hide;
		29
		30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
		32
		33	return if $ENV{CFPLUS_DEBUG} & 8;
		34
		35	my $tip = $widget->{tooltip};
		36
		37	$tip = $tip->($widget) if CODE:: eq ref $tip;
		38
		39	$TOOLTIP->set_tooltip_from ($widget);
		40	$TOOLTIP->show;
		41	}
		42
		43	return;
		44	}
		45	}
		46	}
		47
		48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
		50	delete $TOOLTIP->{owner};
		51	});
20		52
21	sub get_layout {	53	sub get_layout {
22	my $layout;	54	my $layout;
23		55
24	for (grep { $_->{name} } values %WIDGET) {	56	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	71	my ($layout) = @_;
40		72
41	$LAYOUT = $layout;	73	$LAYOUT = $layout;
42	}	74	}
43		75
44	sub check_tooltip {
45	return if $ENV{CFPLUS_DEBUG} & 8;
46
47	if (!$GRAB) {
48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49	if (length $widget->{tooltip}) {
50	if ($TOOLTIP->{owner} != $widget) {
51	$TOOLTIP->hide;
52
53	$TOOLTIP->{owner} = $widget;
54
55	my $tip = $widget->{tooltip};
56
57	$tip = $tip->($widget) if CODE:: eq ref $tip;
58
59	$TOOLTIP->set_tooltip_from ($widget);
60	$TOOLTIP->show;
61	}
62
63	return;
64	}
65	}
66	}
67
68	$TOOLTIP->hide;
69	delete $TOOLTIP->{owner};
70	}
71
72	# class methods for events	76	# class methods for events
73	sub feed_sdl_key_down_event {	77	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	78	$FOCUS->emit (key_down => $_[0])
75	if $FOCUS;	79	if $FOCUS;
76	}	80	}
…		…
78	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
79	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
80	if $FOCUS;	84	if $FOCUS;
81	}	85	}
82		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
83	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
84	my ($ev) = @_;	101	my ($ev) = @_;
85	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
86		103
87	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
88	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
89		108
90	$GRAB = $widget;	109	$GRAB = $widget;
91	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
92		111
93	check_tooltip;	112	$TOOLTIP_WATCHER->cb->();
94	}	113	}
95		114
96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
97		120
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
99	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
100	}	129	}
101		130
102	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
103	my ($ev) = @_;	132	my ($ev) = @_;
104	my ($x, $y) = ($ev->{x}, $ev->{y});
105		133
106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107		135
108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109		137
110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
111	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112		140
113	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	143	$grab->update if $grab;
116	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
117		145
118	check_tooltip;	146	check_hover $widget;
		147	$TOOLTIP_WATCHER->cb->();
119	}	148	}
120	}	149	}
121		150
122	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
123	my ($ev) = @_;	152	my ($ev) = @_;
124	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
125		154
126	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127		156
128	if ($widget != $HOVER) {	157	check_hover $widget;
129	my $hover = $HOVER; $HOVER = $widget;
130		158
131	$hover->update if $hover && $hover->{can_hover};	159	$HOVER->emit (mouse_motion => $ev)
132	$HOVER->update if $HOVER && $HOVER->{can_hover};
133
134	check_tooltip;
135	}
136
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	160	if $HOVER;
139	}	161	}
140		162
141	# convert position array to integers	163	# convert position array to integers
142	sub harmonize {	164	sub harmonize {
…		…
192	reconfigure_widgets;	214	reconfigure_widgets;
193	}	215	}
194		216
195	#############################################################################	217	#############################################################################
196		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
197	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
198		228
199	use strict;	229	use strict;
200		230
201	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
202		232
203	sub new {	233	sub new {
204	my $class = shift;	234	my $class = shift;
205		235
206	my $self = bless {	236	my $self = bless {
…		…
211	h => undef,	241	h => undef,
212	can_events => 1,	242	can_events => 1,
213	@_	243	@_
214	}, $class;	244	}, $class;
215		245
216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217		247
218	for (keys %$self) {	248	for (keys %$self) {
219	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
220	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
221	}	251	}
222	}	252	}
223		253
224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229		259
230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232		262
233	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
238		268
239	sub destroy {	269	sub destroy {
240	my ($self) = @_;	270	my ($self) = @_;
241		271
242	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
243	%$self = ();	274	%$self = ();
244	}	275	}
245		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
246	sub show {	281	sub show {
247	my ($self) = @_;	282	my ($self) = @_;
248		283
249	return if $self->{parent};	284	return if $self->{parent};
250		285
251	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
252	}	287	}
253		288
254	sub set_visible {	289	sub set_visible {
255	my ($self) = @_;	290	my ($self) = @_;
256		291
…		…
271		306
272	return unless $self->{visible};	307	return unless $self->{visible};
273		308
274	$_->set_invisible for $self->children;	309	$_->set_invisible for $self->children;
275		310
		311	delete $self->{visible};
276	delete $self->{root};	312	delete $self->{root};
277	delete $self->{visible};
278		313
279	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
280	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
281		316
282	CFClient::UI::check_tooltip	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
283	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
284		319
285	$self->focus_out;	320	$self->emit ("focus_out");
286
287	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
288	}	322	}
289		323
290	sub set_visibility {	324	sub set_visibility {
291	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
292		326
293	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
294		328
295	$visible ? $self->hide	329	$visible ? $self->show
296	: $self->show;	330	: $self->hide;
297	}	331	}
298		332
299	sub toggle_visibility {	333	sub toggle_visibility {
300	my ($self) = @_;	334	my ($self) = @_;
301		335
…		…
314	}	348	}
315		349
316	sub move_abs {	350	sub move_abs {
317	my ($self, $x, $y, $z) = @_;	351	my ($self, $x, $y, $z) = @_;
318		352
319	$self->{x} = List::Util::max 0, int $x;	353	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320	$self->{y} = List::Util::max 0, int $y;	354	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321	$self->{z} = $z if defined $z;	355	$self->{z} = $z if defined $z;
322		356
323	$self->update;	357	$self->update;
324	}	358	}
325		359
…		…
335	sub size_request {	369	sub size_request {
336	require Carp;	370	require Carp;
337	Carp::confess "size_request is abstract";	371	Carp::confess "size_request is abstract";
338	}	372	}
339		373
		374	sub baseline_shift {
		375	0
		376	}
		377
340	sub configure {	378	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
342		380
343	if ($self->{aspect}) {	381	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
345		383
346	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		386
349	# use alignment to adjust x, y	387	# use alignment to adjust x, y
350		388
351	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
366		404
367	$self->{root}{size_alloc}{$self+0} = $self;	405	$self->{root}{size_alloc}{$self+0} = $self;
368	}	406	}
369	}	407	}
370		408
371	sub size_allocate {
372	# nothing to be done
373	}
374
375	sub children {	409	sub children {
376	# nop	410	# nop
377	}	411	}
378		412
379	sub visible_children {	413	sub visible_children {
…		…
381	}	415	}
382		416
383	sub set_max_size {	417	sub set_max_size {
384	my ($self, $w, $h) = @_;	418	my ($self, $w, $h) = @_;
385		419
386	delete $self->{max_w}; $self->{max_w} = $w if $w;	420	$self->{max_w} = int $w if defined $w;
387	delete $self->{max_h}; $self->{max_h} = $h if $h;	421	$self->{max_h} = int $h if defined $h;
		422
		423	$self->realloc;
388	}	424	}
389		425
390	sub set_tooltip {	426	sub set_tooltip {
391	my ($self, $tooltip) = @_;	427	my ($self, $tooltip) = @_;
392		428
…		…
395		431
396	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
397		433
398	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
399		435
400	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
401	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
402	CFClient::UI::check_tooltip;	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
403	}	439	}
404	}	440	}
405		441
406	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
407	sub coord2local {	443	sub coord2local {
408	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
409		445
		446	Carp::confess unless $self->{parent};#d#
		447
410	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411	}	449	}
412		450
413	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
414	sub coord2global {	452	sub coord2global {
415	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
416		454
		455	Carp::confess unless $self->{parent};#d#
		456
417	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418	}	458	}
419		459
420	sub focus_in {	460	sub invoke_focus_in {
421	my ($self) = @_;	461	my ($self) = @_;
422		462
423	return if $FOCUS == $self;	463	return if $FOCUS == $self;
424	return unless $self->{can_focus};	464	return unless $self->{can_focus};
425		465
426	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
427		467
428	$self->_emit (focus_in => $focus);	468	$self->update;
429		469
430	$focus->update if $focus;	470	0
431	$FOCUS->update;
432	}	471	}
433		472
434	sub focus_out {	473	sub invoke_focus_out {
435	my ($self) = @_;	474	my ($self) = @_;
436		475
437	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
438		477
439	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
440		479
441	$self->_emit (focus_out => $focus);	480	$self->update;
442		481
443	$focus->update if $focus; #?
444
445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	483	unless $FOCUS;
447	}
448		484
		485	0
		486	}
		487
		488	sub grab_focus {
		489	my ($self) = @_;
		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
		492	$self->emit ("focus_in");
		493	}
		494
449	sub mouse_motion { 0 }	495	sub invoke_mouse_motion { 0 }
450	sub button_up { 0 }	496	sub invoke_button_up { 0 }
451	sub key_down { 0 }	497	sub invoke_key_down { 0 }
452	sub key_up { 0 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
453		500
454	sub button_down {	501	sub invoke_button_down {
455	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
456		503
457	$self->focus_in;	504	$self->grab_focus;
458		505
459	0	506	0
460	}	507	}
461		508
		509	sub connect {
		510	my ($self, $signal, $cb) = @_;
		511
		512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
		532
		533	sub emit {
		534	my ($self, $signal, @args) = @_;
		535
		536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
		547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
		553	$self->{parent} && $self->{parent}->emit ($signal, @args)
		554	}
		555
462	sub find_widget {	556	#sub find_widget {
463	my ($self, $x, $y) = @_;	557	# in .xs
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		558
474	sub set_parent {	559	sub set_parent {
475	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
476		561
477	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
478	$self->set_visible if $parent->{visible};	563	$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	}	564	}
503		565
504	sub realloc {	566	sub realloc {
505	my ($self) = @_;	567	my ($self) = @_;
506		568
…		…
539	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
540		602
541	# update screen rectangle	603	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};	604	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};	605	local $draw_y = $draw_y + $self->{y};
544	local $draw_w = $draw_x + $self->{w};
545	local $draw_h = $draw_y + $self->{h};
546		606
547	# skip widgets that are entirely outside the drawing area	607	# skip widgets that are entirely outside the drawing area
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550		610
…		…
573	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
576	glEnd;	636	glEnd;
577	glPopMatrix;	637	glPopMatrix;
578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579	}	639	}
580		640
581	$self->_draw;	641	$self->_draw;
582	glPopMatrix;	642	glPopMatrix;
583	}	643	}
…		…
586	my ($self) = @_;	646	my ($self) = @_;
587		647
588	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
589	}	649	}
590		650
		651	my $cntx;#d#
591	sub DESTROY {	652	sub DESTROY {
592	my ($self) = @_;	653	my ($self) = @_;
593		654
		655	return if CFPlus::in_destruct;
		656
		657	eval { $self->destroy };
		658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
594	delete $WIDGET{$self+0};	660	delete $WIDGET{$self+0};
595	#$self->deactivate;
596	}	661	}
597		662
598	#############################################################################	663	#############################################################################
599		664
600	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
601		666
602	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
603		668
604	use strict;	669	use strict;
605	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
606		671
607	sub new {	672	sub new {
608	my $class = shift;	673	my $class = shift;
609		674
610	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
641	}	706	}
642	}	707	}
643		708
644	#############################################################################	709	#############################################################################
645		710
646	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
647		712
648	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
649		714
650	sub new {	715	sub new {
651	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
653	}	718	}
…		…
660		725
661	sub draw { }	726	sub draw { }
662		727
663	#############################################################################	728	#############################################################################
664		729
665	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
666		731
667	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
668		733
669	sub new {	734	sub new {
670	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
671		736
672	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
676	can_events => 0,	741	can_events => 0,
677	%arg,	742	%arg,
678	);	743	);
679		744
680	$self->add (@$children)	745	$self->add (@$children)
681	if $children;	746	if $children && @$children;
682		747
683	$self	748	$self
		749	}
		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
684	}	757	}
685		758
686	sub add {	759	sub add {
687	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
688		761
689	$_->set_parent ($self)	762	$_->set_parent ($self)
690	for @widgets;	763	for @widgets;
691		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
692	use sort 'stable';	766	use sort 'stable';
693		767
694	$self->{children} = [	768	$self->{children} = [
695	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
696	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
…		…
715	}	789	}
716		790
717	sub clear {	791	sub clear {
718	my ($self) = @_;	792	my ($self) = @_;
719		793
720	my $children = delete $self->{children};	794	my $children = $self->{children};
721	$self->{children} = [];	795	$self->{children} = [];
722		796
723	for (@$children) {	797	for (@$children) {
724	delete $_->{parent};	798	delete $_->{parent};
725	$_->hide;	799	$_->hide;
…		…
750	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
751	}	825	}
752		826
753	#############################################################################	827	#############################################################################
754		828
755	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
756		830
757	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
758		832
759	sub new {	833	sub new {
760	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
761		835
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		837
764	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
765	}	839	}
766		840
767	sub add {	841	sub add {
768	my ($self, $child) = @_;	842	my ($self, $child) = @_;
769		843
770	$self->{children} = [];	844	$self->SUPER::remove ($_) for @{ $self->{children} };
771
772	$self->SUPER::add ($child);	845	$self->SUPER::add ($child);
773	}	846	}
774		847
775	sub remove {	848	sub remove {
776	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
777		850
778	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
779		852
780	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
781	unless @{$self->{children}};	854	unless @{$self->{children}};
782	}	855	}
783		856
784	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
785		858
786	sub size_request {	859	sub size_request {
787	$_[0]{children}[0]->size_request	860	$_[0]{children}[0]->size_request
788	}	861	}
789		862
790	sub size_allocate {	863	sub invoke_size_allocate {
791	my ($self, $w, $h) = @_;	864	my ($self, $w, $h) = @_;
792		865
793	$self->{children}[0]->configure (0, 0, $w, $h);	866	$self->{children}[0]->configure (0, 0, $w, $h);
		867
		868	1
794	}	869	}
795		870
796	#############################################################################	871	#############################################################################
797		872
798	# back-buffered drawing area	873	# back-buffered drawing area
799		874
800	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
801		876
802	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
803		878
804	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
805		880
806	sub new {	881	sub new {
807	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
808		883
809	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
814		889
815	$ROOT->on_post_alloc ($self => sub { $self->render_child });	890	$ROOT->on_post_alloc ($self => sub { $self->render_child });
816	$self->SUPER::update;	891	$self->SUPER::update;
817	}	892	}
818		893
819	sub size_allocate {	894	sub invoke_size_allocate {
820	my ($self, $w, $h) = @_;	895	my ($self, $w, $h) = @_;
821		896
822	$self->SUPER::size_allocate ($w, $h);
823	$self->update;	897	$self->update;
		898
		899	$self->SUPER::invoke_size_allocate ($w, $h)
824	}	900	}
825		901
826	sub _render {	902	sub _render {
827	my ($self) = @_;	903	my ($self) = @_;
828		904
…		…
830	}	906	}
831		907
832	sub render_child {	908	sub render_child {
833	my ($self) = @_;	909	my ($self) = @_;
834		910
835	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	911	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
837	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
838		914
839	{	915	{
840	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
841		917
842	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
843	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
844	}	922	}
845
846	$self->_render;
847	};	923	};
848	}	924	}
849		925
850	sub _draw {	926	sub _draw {
851	my ($self) = @_;	927	my ($self) = @_;
852
853	my ($w, $h) = @$self{qw(w h)};
854		928
855	my $tex = $self->{texture}	929	my $tex = $self->{texture}
856	or return;	930	or return;
857		931
858	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
861		935
862	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
863		937
864	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
865	}	939	}
866		940
867	#############################################################################	941	#############################################################################
868		942
869	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
870		944
		945	use List::Util qw(min max);
		946
871	our @ISA = CFClient::UI::Window::;	947	our @ISA = CFPlus::UI::Window::;
872		948
873	sub new {	949	sub new {
874	my $class = shift;	950	my $class = shift;
875		951
876	$class->SUPER::new (	952	$class->SUPER::new (
…		…
883	sub size_request {	959	sub size_request {
884	my ($self) = @_;	960	my ($self) = @_;
885		961
886	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	962	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
887		963
888	$w = 10 if $self->{scroll_x};	964	$w = 1 if $self->{scroll_x};
889	$h = 10 if $self->{scroll_y};	965	$h = 1 if $self->{scroll_y};
890		966
891	($w, $h)	967	($w, $h)
892	}	968	}
893		969
894	sub size_allocate {	970	sub invoke_size_allocate {
895	my ($self, $w, $h) = @_;	971	my ($self, $w, $h) = @_;
896		972
897	my $child = $self->child;	973	my $child = $self->child;
898		974
899	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	975	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	976	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901		977
902	$self->child->configure (0, 0, $w, $h);	978	$self->child->configure (0, 0, $w, $h);
903	$self->update;	979	$self->update;
		980
		981	1
904	}	982	}
905		983
906	sub set_offset {	984	sub set_offset {
907	my ($self, $x, $y) = @_;	985	my ($self, $x, $y) = @_;
908		986
		987	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		988	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		989
		990	if ($x != $self->{view_x} or $y != $self->{view_y}) {
909	$self->{view_x} = int $x;	991	$self->{view_x} = $x;
910	$self->{view_y} = int $y;	992	$self->{view_y} = $y;
911		993
		994	$self->emit (changed => $x, $y);
912	$self->update;	995	$self->update;
		996	}
913	}	997	}
914		998
915	# hmm, this does not work for topleft of $self... but we should not ask for that	999	# hmm, this does not work for topleft of $self... but we should not ask for that
916	sub coord2local {	1000	sub coord2local {
917	my ($self, $x, $y) = @_;	1001	my ($self, $x, $y) = @_;
…		…
932	my ($self, $x, $y) = @_;	1016	my ($self, $x, $y) = @_;
933		1017
934	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1018	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
935	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1019	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
936	) {	1020	) {
937	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1021	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
938	} else {	1022	} else {
939	$self->CFClient::UI::Base::find_widget ($x, $y)	1023	$self->CFPlus::UI::Base::find_widget ($x, $y)
940	}	1024	}
941	}	1025	}
942		1026
943	sub _render {	1027	sub _render {
944	my ($self) = @_;	1028	my ($self) = @_;
945		1029
946	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1030	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
947	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1031	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
948		1032
949	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1033	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
950		1034
951	$self->SUPER::_render;	1035	$self->SUPER::_render;
952	}	1036	}
953		1037
954	#############################################################################	1038	#############################################################################
955		1039
956	package CFClient::UI::ScrolledWindow;	1040	package CFPlus::UI::ScrolledWindow;
957		1041
958	our @ISA = CFClient::UI::HBox::;	1042	our @ISA = CFPlus::UI::Table::;
959		1043
960	sub new {	1044	sub new {
961	my ($class, %arg) = @_;	1045	my ($class, %arg) = @_;
962		1046
963	my $child = delete $arg{child};	1047	my $child = delete $arg{child};
964		1048
965	my $self;	1049	my $self;
966		1050
967	my $slider = new CFClient::UI::Slider	1051	my $hslider = new CFPlus::UI::Slider
		1052	col => 0,
		1053	row => 1,
		1054	vertical => 0,
		1055	range => [0, 0, 1, 0.01], # HACK fix
		1056	on_changed => sub {
		1057	$self->{hpos} = $_[1];
		1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1059	},
		1060	;
		1061
		1062	my $vslider = new CFPlus::UI::Slider
		1063	col => 1,
		1064	row => 0,
968	vertical => 1,	1065	vertical => 1,
969	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
970	on_changed => sub {	1067	on_changed => sub {
971	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
972	},	1070	},
973	;	1071	;
974		1072
975	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
976	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
		1076	can_events => 1,
977	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
978	%arg,	1081	%arg,
979	);	1082	);
980		1083
		1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	col => 0,
		1086	row => 0,
		1087	expand => 1,
		1088	scroll_x => $self->{scroll_x},
		1089	scroll_y => $self->{scroll_y},
		1090	on_changed => sub {
		1091	my ($vp, $x, $y) = @_;
		1092
		1093	$vp->{parent}{hslider}->set_value ($x);
		1094	$vp->{parent}{vslider}->set_value ($y);
		1095
		1096	0
		1097	},
		1098	;
		1099
981	$self->SUPER::add ($self->{vp}, $self->{slider});	1100	$self->SUPER::add ($self->{vp});
		1101
982	$self->add ($child) if $child;	1102	$self->add ($child) if $child;
983		1103
984	$self	1104	$self
985	}	1105	}
986		1106
…		…
988	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
989		1109
990	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
991	}	1111	}
992		1112
993	sub update {	1113	sub update_slider {
		1114	my ($self) = @_;
		1115
		1116	my $child = ($self->{vp} or return)->child;
		1117
		1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1120
		1121	my $visible = $w1 > $w2;
		1122	if ($visible != $self->{hslider_visible}) {
		1123	$self->{hslider_visible} = $visible;
		1124	$visible ? $self->SUPER::add ($self->{hslider})
		1125	: $self->SUPER::remove ($self->{hslider});
		1126	}
		1127
		1128	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1129	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1130
		1131	my $visible = $h1 > $h2;
		1132	if ($visible != $self->{vslider_visible}) {
		1133	$self->{vslider_visible} = $visible;
		1134	$visible ? $self->SUPER::add ($self->{vslider})
		1135	: $self->SUPER::remove ($self->{vslider});
		1136	}
		1137	}
		1138
		1139	sub invoke_mouse_wheel {
994	my ($self) = @_;	1140	my ($self, $ev) = @_;
995		1141
996	$self->SUPER::update;	1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
997		1144
998	# todo: overwrite size_allocate of child	1145	$self->{hslider}->emit (mouse_wheel => $ev)
999	my $child = $self->{vp}->child;	1146	if $ev->{dx};
1000	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1001	}
1002		1147
		1148	1
		1149	}
		1150
		1151	sub invoke_button_down {
		1152	my ($self, $ev, $x, $y) = @_;
		1153
		1154	if ($ev->{button} == 2) {
		1155	$self->grab_focus;
		1156
		1157	my $ox = $self->{vp}{view_x} + $ev->{x};
		1158	my $oy = $self->{vp}{view_y} + $ev->{y};
		1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
		1162
		1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1164	$self->update;
		1165	};
		1166
		1167	return 1;
		1168	}
		1169
		1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
		1192	}
		1193
1003	sub size_allocate {	1194	sub invoke_size_allocate {
1004	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1005		1196
		1197	$self->update_slider;
1006	$self->SUPER::size_allocate ($w, $h);	1198	$self->SUPER::invoke_size_allocate ($w, $h)
1007
1008	my $child = $self->{vp}->child;
1009	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010	}	1199	}
1011
1012	#TODO# update range on size_allocate depending on child
1013	# update viewport offset on scroll
1014		1200
1015	#############################################################################	1201	#############################################################################
1016		1202
1017	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
1018		1204
1019	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
1020		1206
1021	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
1022		1208
1023	sub new {	1209	sub new {
1024	my $class = shift;	1210	my $class = shift;
1025		1211
1026	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
1052	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
1053	}	1239	}
1054		1240
1055	#############################################################################	1241	#############################################################################
1056		1242
1057	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
1058		1244
1059	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
1060		1246
1061	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
1062
1063	my $bg =
1064	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065	mipmap => 1, wrap => 1;
1066
1067	my @border =
1068	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1069	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1070		1248
1071	sub new {	1249	sub new {
1072	my ($class, %arg) = @_;	1250	my ($class, %arg) = @_;
1073		1251
1074	my $title = delete $arg{title};	1252	if ((exists $arg{label}) && !ref $arg{label}) {
		1253	$arg{label} = new CFPlus::UI::Label
		1254	align => 1,
		1255	valign => 0,
		1256	text => $arg{label},
		1257	fontsize => ($arg{border} || 0.8) * 0.75;
		1258	}
		1259
		1260	my $self = $class->SUPER::new (
		1261	# label => "",
		1262	fg => [0.6, 0.3, 0.1],
		1263	border => 0.8,
		1264	style => 'single',
		1265	%arg,
		1266	);
		1267
		1268	$self
		1269	}
		1270
		1271	sub add {
		1272	my ($self, @widgets) = @_;
		1273
		1274	$self->SUPER::add (@widgets);
		1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1276	}
		1277
		1278	sub border {
		1279	int $_[0]{border} * $::FONTSIZE
		1280	}
		1281
		1282	sub size_request {
		1283	my ($self) = @_;
		1284
		1285	($self->{label_w}, undef) = $self->{label}->size_request
		1286	if $self->{label};
		1287
		1288	my ($w, $h) = $self->SUPER::size_request;
		1289
		1290	(
		1291	$w + $self->border * 2,
		1292	$h + $self->border * 2,
		1293	)
		1294	}
		1295
		1296	sub invoke_size_allocate {
		1297	my ($self, $w, $h) = @_;
		1298
		1299	my $border = $self->border;
		1300
		1301	$w -= List::Util::max 0, $border * 2;
		1302	$h -= List::Util::max 0, $border * 2;
		1303
		1304	if (my $label = $self->{label}) {
		1305	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1306	$label->{h} = List::Util::min $h, $border;
		1307	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1308	}
		1309
		1310	$self->child->configure ($border, $border, $w, $h);
		1311
		1312	1
		1313	}
		1314
		1315	sub _draw {
		1316	my ($self) = @_;
		1317
		1318	my $child = $self->{children}[0];
		1319
		1320	my $border = $self->border;
		1321	my ($w, $h) = ($self->{w}, $self->{h});
		1322
		1323	$child->draw;
		1324
		1325	glColor @{$self->{fg}};
		1326	glBegin GL_LINE_STRIP;
		1327	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1328	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1330	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1331	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1333	glEnd;
		1334
		1335	if ($self->{label}) {
		1336	glTranslate $border * 2, 0;
		1337	$self->{label}->_draw;
		1338	}
		1339	}
		1340
		1341	#############################################################################
		1342
		1343	package CFPlus::UI::Toplevel;
		1344
		1345	our @ISA = CFPlus::UI::Bin::;
		1346
		1347	use CFPlus::OpenGL;
		1348
		1349	my $bg =
		1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1351	mipmap => 1, wrap => 1;
		1352
		1353	my @border =
		1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
		1360
		1361	sub new {
		1362	my ($class, %arg) = @_;
1075		1363
1076	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1077	bg => [1, 1, 1, 1],	1365	bg => [1, 1, 1, 1],
1078	border_bg => [1, 1, 1, 1],	1366	border_bg => [1, 1, 1, 1],
1079	border => 0.6,	1367	border => 0.6,
1080	can_events => 1,	1368	can_events => 1,
1081	min_w => 16,	1369	min_w => 64,
1082	min_h => 16,	1370	min_h => 32,
1083	%arg,	1371	%arg,
1084	);	1372	);
1085		1373
1086	$self->{title} = new CFClient::UI::Label	1374	$self->{title_widget} = new CFPlus::UI::Label
1087	align => 0,	1375	align => 0,
1088	valign => 1,	1376	valign => 1,
1089	text => $title,	1377	text => $self->{title},
1090	fontsize => $self->{border}	1378	fontsize => $self->{border},
1091	if defined $title;	1379	if exists $self->{title};
		1380
		1381	if ($self->{has_close_button}) {
		1382	$self->{close_button} =
		1383	new CFPlus::UI::ImageButton
		1384	path => 'x1_close.png',
		1385	on_activate => sub { $self->emit ("delete") };
		1386
		1387	$self->CFPlus::UI::Container::add ($self->{close_button});
		1388	}
1092		1389
1093	$self	1390	$self
1094	}	1391	}
1095		1392
1096	sub add {	1393	sub add {
1097	my ($self, @widgets) = @_;	1394	my ($self, @widgets) = @_;
1098		1395
1099	$self->SUPER::add (@widgets);	1396	$self->SUPER::add (@widgets);
		1397	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1100	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1101	}	1399	}
1102		1400
1103	sub border {	1401	sub border {
1104	int $_[0]{border} * $::FONTSIZE	1402	int $_[0]{border} * $::FONTSIZE
1105	}	1403	}
1106		1404
1107	sub size_request {	1405	sub size_request {
1108	my ($self) = @_;	1406	my ($self) = @_;
1109		1407
1110	$self->{title}->size_request	1408	$self->{title_widget}->size_request
1111	if $self->{title};	1409	if $self->{title_widget};
		1410
		1411	$self->{close_button}->size_request
		1412	if $self->{close_button};
1112		1413
1113	my ($w, $h) = $self->SUPER::size_request;	1414	my ($w, $h) = $self->SUPER::size_request;
1114		1415
1115	(	1416	(
1116	$w + $self->border * 2,	1417	$w + $self->border * 2,
1117	$h + $self->border * 2,	1418	$h + $self->border * 2,
1118	)	1419	)
1119	}	1420	}
1120		1421
1121	sub size_allocate {	1422	sub invoke_size_allocate {
1122	my ($self, $w, $h) = @_;	1423	my ($self, $w, $h) = @_;
1123		1424
1124	if ($self->{title}) {	1425	if ($self->{title_widget}) {
1125	$self->{title}{w} = $w;	1426	$self->{title_widget}{w} = $w;
1126	$self->{title}{h} = $h;	1427	$self->{title_widget}{h} = $h;
1127	$self->{title}->size_allocate ($w, $h);	1428	$self->{title_widget}->invoke_size_allocate ($w, $h);
1128	}	1429	}
1129		1430
1130	my $border = $self->border;	1431	my $border = $self->border;
1131		1432
1132	$h -= List::Util::max 0, $border * 2;	1433	$h -= List::Util::max 0, $border * 2;
1133	$w -= List::Util::max 0, $border * 2;	1434	$w -= List::Util::max 0, $border * 2;
		1435
		1436	$self->child->configure ($border, $border, $w, $h);
		1437
		1438	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1439	if $self->{close_button};
		1440
		1441	1
		1442	}
		1443
		1444	sub invoke_delete {
		1445	my ($self) = @_;
		1446
		1447	$self->hide;
1134		1448
1135	$self->child->configure ($border, $border, $w, $h);	1449	1
1136	}	1450	}
1137		1451
1138	sub button_down {	1452	sub invoke_button_down {
1139	my ($self, $ev, $x, $y) = @_;	1453	my ($self, $ev, $x, $y) = @_;
1140		1454
1141	my ($w, $h) = @$self{qw(w h)};	1455	my ($w, $h) = @$self{qw(w h)};
1142	my $border = $self->border;	1456	my $border = $self->border;
1143		1457
…		…
1174		1488
1175	($x, $y) = ($ev->{x}, $ev->{y});	1489	($x, $y) = ($ev->{x}, $ev->{y});
1176		1490
1177	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1491	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1178	# HACK: the next line is required to enforce placement	1492	# HACK: the next line is required to enforce placement
1179	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1493	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1180	};	1494	};
1181	} else {	1495	} else {
1182	return 0;	1496	return 0;
1183	}	1497	}
1184		1498
1185	1	1499	1
1186	}	1500	}
1187		1501
1188	sub button_up {	1502	sub invoke_button_up {
1189	my ($self, $ev, $x, $y) = @_;	1503	my ($self, $ev, $x, $y) = @_;
1190		1504
1191	!!delete $self->{motion}	1505	! ! delete $self->{motion}
1192	}	1506	}
1193		1507
1194	sub mouse_motion {	1508	sub invoke_mouse_motion {
1195	my ($self, $ev, $x, $y) = @_;	1509	my ($self, $ev, $x, $y) = @_;
1196		1510
1197	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
1198		1512
1199	!!$self->{motion}	1513	! ! $self->{motion}
		1514	}
		1515
		1516	sub invoke_visibility_change {
		1517	my ($self, $visible) = @_;
		1518
		1519	delete $self->{motion} unless $visible;
		1520
		1521	0
1200	}	1522	}
1201		1523
1202	sub _draw {	1524	sub _draw {
1203	my ($self) = @_;	1525	my ($self) = @_;
1204		1526
…		…
1211	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1212		1534
1213	my $border = $self->border;	1535	my $border = $self->border;
1214		1536
1215	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1216	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1217	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1218	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1219	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1220		1556
1221	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1222	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1223		1559
1224	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1230		1566
1231	glDisable GL_TEXTURE_2D;	1567	glDisable GL_TEXTURE_2D;
1232		1568
1233	$child->draw;	1569	$child->draw;
1234		1570
1235	if ($self->{title}) {	1571	if ($self->{title_widget}) {
1236	glTranslate 0, $border - $self->{h};	1572	glTranslate 0, $border - $self->{h};
1237	$self->{title}->_draw;	1573	$self->{title_widget}->_draw;
		1574
		1575	glTranslate 0, - ($border - $self->{h});
1238	}	1576	}
		1577
		1578	$self->{close_button}->draw
		1579	if $self->{close_button};
1239	}	1580	}
1240		1581
1241	#############################################################################	1582	#############################################################################
1242		1583
1243	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1244		1585
1245	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Container::;
1246		1587
1247	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1248		1589
1249	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1250		1591
1251	sub new {	1592	sub new {
1252	my $class = shift;	1593	my $class = shift;
1253		1594
1254	$class->SUPER::new (	1595	$class->SUPER::new (
1255	col_expand => [],	1596	col_expand => [],
		1597	row_expand => [],
1256	@_,	1598	@_,
1257	)	1599	)
1258	}	1600	}
1259		1601
1260	sub children {
1261	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1262	}
1263
1264	sub add {	1602	sub add {
1265	my ($self, $x, $y, $child) = @_;
1266
1267	$child->set_parent ($self);
1268	$self->{children}[$y][$x] = $child;
1269
1270	$self->realloc;
1271	}
1272
1273	# TODO: move to container class maybe? send children a signal on removal?
1274	sub clear {
1275	my ($self) = @_;	1603	my ($self, @widgets) = @_;
		1604
		1605	for my $child (@widgets) {
		1606	$child->{rowspan} ||= 1;
		1607	$child->{colspan} ||= 1;
		1608	}
		1609
		1610	$self->SUPER::add (@widgets);
		1611	}
		1612
		1613	sub add_at {
		1614	my $self = shift;
		1615
		1616	my @widgets;
		1617
		1618	while (@_) {
		1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
		1621	$child->{row} = $row;
		1622	$child->{col} = $col;
		1623
		1624	push @widgets, $child;
		1625	}
		1626
		1627	$self->add (@widgets);
		1628	}
		1629
		1630	sub get_wh {
		1631	my ($self) = @_;
		1632
		1633	my (@w, @h);
1276		1634
1277	my @children = $self->children;	1635	my @children = $self->children;
1278	delete $self->{children};	1636
		1637	# first pass, columns
		1638	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1639	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1640
		1641	my $sw = sum @w[$c .. $c + $cs - 1];
		1642
		1643	if ($w > $sw) {
		1644	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1645	}
1279		1646	}
1280	for (@children) {
1281	delete $_->{parent};
1282	$_->hide;
1283	}
1284		1647
1285	$self->realloc;	1648	# second pass, rows
1286	}	1649	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1287
1288	sub get_wh {
1289	my ($self) = @_;
1290
1291	my (@w, @h);
1292
1293	for my $y (0 .. $#{$self->{children}}) {
1294	my $row = $self->{children}[$y]
1295	or next;
1296
1297	for my $x (0 .. $#$row) {
1298	my $widget = $row->[$x]
1299	or next;
1300	my ($w, $h) = @$widget{qw(req_w req_h)};	1650	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1301		1651
1302	$w[$x] = max $w[$x], $w;	1652	my $sh = sum @h[$r .. $r + $rs - 1];
1303	$h[$y] = max $h[$y], $h;	1653
		1654	if ($h > $sh) {
		1655	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1304	}	1656	}
1305	}	1657	}
1306		1658
1307	(\@w, \@h)	1659	(\@w, \@h)
1308	}	1660	}
…		…
1316	(sum @$ws),	1668	(sum @$ws),
1317	(sum @$hs),	1669	(sum @$hs),
1318	)	1670	)
1319	}	1671	}
1320		1672
1321	sub size_allocate {	1673	sub invoke_size_allocate {
1322	my ($self, $w, $h) = @_;	1674	my ($self, $w, $h) = @_;
1323		1675
1324	my ($ws, $hs) = $self->get_wh;	1676	my ($ws, $hs) = $self->get_wh;
1325		1677
1326	my $req_w = (sum @$ws) || 1;	1678	my $req_w = (sum @$ws) || 1;
1327	my $req_h = (sum @$hs) || 1;	1679	my $req_h = (sum @$hs) || 1;
1328		1680
1329	# TODO: nicer code && do row_expand	1681	# now linearly scale the rows/columns to the allocated size
1330	my @col_expand = @{$self->{col_expand}};	1682	my @col_expand = @{$self->{col_expand}};
1331	@col_expand = (1) x @$ws unless @col_expand;	1683	@col_expand = (1) x @$ws unless @col_expand;
1332	my $col_expand = (sum @col_expand) || 1;	1684	my $col_expand = (sum @col_expand) || 1;
1333		1685
1334	# linearly scale sizes
1335	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1686	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1336	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1337		1687
1338	CFClient::UI::harmonize $ws;	1688	CFPlus::UI::harmonize $ws;
		1689
		1690	my @row_expand = @{$self->{row_expand}};
		1691	@row_expand = (1) x @$ws unless @row_expand;
		1692	my $row_expand = (sum @row_expand) || 1;
		1693
		1694	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1695
1339	CFClient::UI::harmonize $hs;	1696	CFPlus::UI::harmonize $hs;
1340		1697
1341	my $y;	1698	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1699	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1342		1700
1343	for my $r (0 .. $#{$self->{children}}) {	1701	for my $widget ($self->children) {
1344	my $row = $self->{children}[$r]	1702	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1345	or next;
1346		1703
1347	my $x = 0;	1704	$widget->configure (
1348	my $row_h = $hs->[$r];	1705	$x[$c], $y[$r],
		1706	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1349		1707	);
1350	for my $c (0 .. $#$row) {	1708	}
1351	my $col_w = $ws->[$c];
1352		1709
1353	if (my $widget = $row->[$c]) {	1710	1
1354	$widget->configure ($x, $y, $col_w, $row_h);	1711	}
1355	}
1356		1712
1357	$x += $col_w;	1713	#############################################################################
		1714
		1715	package CFPlus::UI::Fixed;
		1716
		1717	use List::Util qw(min max);
		1718
		1719	our @ISA = CFPlus::UI::Container::;
		1720
		1721	sub add {
		1722	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1723
		1724	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1725	$self->SUPER::add ($child);
		1726	}
		1727
		1728	sub _scale($$$) {
		1729	my ($mode, $val, $max) = @_;
		1730
		1731	$mode eq "abs" ? $val
		1732	: $mode eq "rel" ? $val * $max
		1733	: 0
		1734	}
		1735
		1736	sub size_request {
		1737	my ($self) = @_;
		1738
		1739	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1740
		1741	# determine overall size by querying abs widgets
		1742	for my $child ($self->visible_children) {
		1743	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1744
		1745	if ($pos eq "abs") {
		1746	$w = _scale $size, $w, $child->{req_w};
		1747	$h = _scale $size, $h, $child->{req_h};
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1358	}	1751	}
1359
1360	$y += $row_h;
1361	}	1752	}
1362		1753
1363	}	1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
1364		1756
1365	sub find_widget {	1757	# now layout remaining widgets
		1758	for my $child ($self->visible_children) {
		1759	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1760
		1761	if ($pos ne "abs") {
		1762	$x = _scale $pos, $x, $W;
		1763	$y = _scale $pos, $x, $H;
		1764	$w = _scale $size, $w, $child->{req_w};
		1765	$h = _scale $size, $h, $child->{req_h};
		1766
		1767	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1768	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1769	}
		1770	}
		1771
		1772	my $W = $x2 - $x1;
		1773	my $H = $y2 - $y1;
		1774
		1775	($W, $H)
		1776	}
		1777
		1778	sub invoke_size_allocate {
1366	my ($self, $x, $y) = @_;	1779	my ($self, $W, $H) = @_;
1367		1780
1368	$x -= $self->{x};	1781	for my $child ($self->visible_children) {
1369	$y -= $self->{y};	1782	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1370		1783
1371	my $res;	1784	$x = _scale $pos, $x, $W;
		1785	$y = _scale $pos, $x, $H;
		1786	$w = _scale $size, $w, $child->{req_w};
		1787	$h = _scale $size, $h, $child->{req_h};
1372		1788
1373	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {	1789	$child->configure ($x, $y, $w, $h);
1374	$res = $_->find_widget ($x, $y)	1790	}
1375	and return $res;	1791
1376	}	1792	1
1377
1378	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1379	}
1380
1381	sub _draw {
1382	my ($self) = @_;
1383
1384	for (grep $_, @{$self->{children}}) {
1385	$_->draw for grep $_, @$_;
1386	}
1387	}	1793	}
1388		1794
1389	#############################################################################	1795	#############################################################################
1390		1796
1391	package CFClient::UI::Box;	1797	package CFPlus::UI::Box;
1392		1798
1393	our @ISA = CFClient::UI::Container::;	1799	our @ISA = CFPlus::UI::Container::;
1394		1800
1395	sub size_request {	1801	sub size_request {
1396	my ($self) = @_;	1802	my ($self) = @_;
1397		1803
1398	$self->{vertical}	1804	$self->{vertical}
…		…
1404	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1810	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1811	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1406	)	1812	)
1407	}	1813	}
1408		1814
1409	sub size_allocate {	1815	sub invoke_size_allocate {
1410	my ($self, $w, $h) = @_;	1816	my ($self, $w, $h) = @_;
1411		1817
1412	my $space = $self->{vertical} ? $h : $w;	1818	my $space = $self->{vertical} ? $h : $w;
1413	my $children = $self->{children};	1819	my @children = $self->visible_children;
1414		1820
1415	my @req;	1821	my @req;
1416		1822
1417	if ($self->{homogeneous}) {	1823	if ($self->{homogeneous}) {
1418	@req = ($space / (@$children || 1)) x @$children;	1824	@req = ($space / (@children || 1)) x @children;
1419	} else {	1825	} else {
1420	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1826	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1421	my $req = List::Util::sum @req;	1827	my $req = List::Util::sum @req;
1422		1828
1423	if ($req > $space) {	1829	if ($req > $space) {
1424	# ah well, not enough space	1830	# ah well, not enough space
1425	$_ *= $space / $req for @req;	1831	$_ *= $space / $req for @req;
1426	} else {	1832	} else {
1427	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1833	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1428		1834
1429	$space = ($space - $req) / $expand; # remaining space to give away	1835	$space = ($space - $req) / $expand; # remaining space to give away
1430		1836
1431	$req[$_] += $space * $children->[$_]{expand}	1837	$req[$_] += $space * $children[$_]{expand}
1432	for 0 .. $#$children;	1838	for 0 .. $#children;
1433	}	1839	}
1434	}	1840	}
1435		1841
1436	CFClient::UI::harmonize \@req;	1842	CFPlus::UI::harmonize \@req;
1437		1843
1438	my $pos = 0;	1844	my $pos = 0;
1439	for (0 .. $#$children) {	1845	for (0 .. $#children) {
1440	my $alloc = $req[$_];	1846	my $alloc = $req[$_];
1441	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1847	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1442		1848
1443	$pos += $alloc;	1849	$pos += $alloc;
1444	}	1850	}
1445		1851
1446	1	1852	1
1447	}	1853	}
1448		1854
1449	#############################################################################	1855	#############################################################################
1450		1856
1451	package CFClient::UI::HBox;	1857	package CFPlus::UI::HBox;
1452		1858
1453	our @ISA = CFClient::UI::Box::;	1859	our @ISA = CFPlus::UI::Box::;
1454		1860
1455	sub new {	1861	sub new {
1456	my $class = shift;	1862	my $class = shift;
1457		1863
1458	$class->SUPER::new (	1864	$class->SUPER::new (
…		…
1461	)	1867	)
1462	}	1868	}
1463		1869
1464	#############################################################################	1870	#############################################################################
1465		1871
1466	package CFClient::UI::VBox;	1872	package CFPlus::UI::VBox;
1467		1873
1468	our @ISA = CFClient::UI::Box::;	1874	our @ISA = CFPlus::UI::Box::;
1469		1875
1470	sub new {	1876	sub new {
1471	my $class = shift;	1877	my $class = shift;
1472		1878
1473	$class->SUPER::new (	1879	$class->SUPER::new (
…		…
1476	)	1882	)
1477	}	1883	}
1478		1884
1479	#############################################################################	1885	#############################################################################
1480		1886
1481	package CFClient::UI::Label;	1887	package CFPlus::UI::Label;
1482		1888
1483	our @ISA = CFClient::UI::DrawBG::;	1889	our @ISA = CFPlus::UI::DrawBG::;
1484		1890
1485	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1486		1892
1487	sub new {	1893	sub new {
1488	my ($class, %arg) = @_;	1894	my ($class, %arg) = @_;
1489		1895
1490	my $self = $class->SUPER::new (	1896	my $self = $class->SUPER::new (
…		…
1493	#active_bg => none	1899	#active_bg => none
1494	#font => default_font	1900	#font => default_font
1495	#text => initial text	1901	#text => initial text
1496	#markup => initial narkup	1902	#markup => initial narkup
1497	#max_w => maximum pixel width	1903	#max_w => maximum pixel width
		1904	#style => 0, # render flags
1498	ellipsise => 3, # end	1905	ellipsise => 3, # end
1499	layout => (new CFClient::Layout),	1906	layout => (new CFPlus::Layout),
1500	fontsize => 1,	1907	fontsize => 1,
1501	align => -1,	1908	align => -1,
1502	valign => -1,	1909	valign => -1,
1503	padding_x => 2,	1910	padding_x => 2,
1504	padding_y => 2,	1911	padding_y => 2,
1505	can_events => 0,	1912	can_events => 0,
1506	%arg	1913	%arg
1507	);	1914	);
1508		1915
1509	if (exists $self->{template}) {	1916	if (exists $self->{template}) {
1510	my $layout = new CFClient::Layout;	1917	my $layout = new CFPlus::Layout;
1511	$layout->set_text (delete $self->{template});	1918	$layout->set_text (delete $self->{template});
1512	$self->{template} = $layout;	1919	$self->{template} = $layout;
1513	}	1920	}
1514		1921
1515	if (exists $self->{markup}) {	1922	if (exists $self->{markup}) {
…		…
1519	}	1926	}
1520		1927
1521	$self	1928	$self
1522	}	1929	}
1523		1930
1524	sub escape($) {
1525	local $_ = $_[0];
1526
1527	s/&/&amp;/g;
1528	s/>/&gt;/g;
1529	s/</&lt;/g;
1530
1531	$_
1532	}
1533
1534	sub update {	1931	sub update {
1535	my ($self) = @_;	1932	my ($self) = @_;
1536		1933
1537	delete $self->{texture};	1934	delete $self->{texture};
1538	$self->SUPER::update;	1935	$self->SUPER::update;
1539	}	1936	}
1540		1937
		1938	sub realloc {
		1939	my ($self) = @_;
		1940
		1941	delete $self->{ox};
		1942	$self->SUPER::realloc;
		1943	}
		1944
1541	sub set_text {	1945	sub set_text {
1542	my ($self, $text) = @_;	1946	my ($self, $text) = @_;
1543		1947
1544	return if $self->{text} eq "T$text";	1948	return if $self->{text} eq "T$text";
1545	$self->{text} = "T$text";	1949	$self->{text} = "T$text";
1546		1950
1547	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548	$self->{layout}->set_text ($text);	1951	$self->{layout}->set_text ($text);
1549		1952
		1953	delete $self->{size_req};
1550	$self->realloc;	1954	$self->realloc;
1551	$self->update;	1955	$self->update;
1552	}	1956	}
1553		1957
1554	sub set_markup {	1958	sub set_markup {
…		…
1557	return if $self->{text} eq "M$markup";	1961	return if $self->{text} eq "M$markup";
1558	$self->{text} = "M$markup";	1962	$self->{text} = "M$markup";
1559		1963
1560	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1964	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561		1965
1562	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1563	$self->{layout}->set_markup ($markup);	1966	$self->{layout}->set_markup ($markup);
1564		1967
		1968	delete $self->{size_req};
1565	$self->realloc;	1969	$self->realloc;
1566	$self->update;	1970	$self->update;
1567	}	1971	}
1568		1972
1569	sub size_request {	1973	sub size_request {
1570	my ($self) = @_;	1974	my ($self) = @_;
1571		1975
		1976	$self->{size_req} ||= do {
1572	$self->{layout}->set_font ($self->{font}) if $self->{font};	1977	$self->{layout}->set_font ($self->{font}) if $self->{font};
1573	$self->{layout}->set_width ($self->{max_w} || -1);	1978	$self->{layout}->set_width ($self->{max_w} || -1);
1574	$self->{layout}->set_ellipsise ($self->{ellipsise});	1979	$self->{layout}->set_ellipsise ($self->{ellipsise});
1575	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1980	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1981	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577		1982
1578	my ($w, $h) = $self->{layout}->size;	1983	my ($w, $h) = $self->{layout}->size;
1579		1984
1580	if (exists $self->{template}) {	1985	if (exists $self->{template}) {
1581	$self->{template}->set_font ($self->{font}) if $self->{font};	1986	$self->{template}->set_font ($self->{font}) if $self->{font};
		1987	$self->{template}->set_width ($self->{max_w} || -1);
1582	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1988	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583		1989
1584	my ($w2, $h2) = $self->{template}->size;	1990	my ($w2, $h2) = $self->{template}->size;
1585		1991
1586	$w = List::Util::max $w, $w2;	1992	$w = List::Util::max $w, $w2;
1587	$h = List::Util::max $h, $h2;	1993	$h = List::Util::max $h, $h2;
		1994	}
		1995
		1996	[$w, $h]
1588	}	1997	};
1589		1998
1590	($w, $h)	1999	@{ $self->{size_req} }
1591	}	2000	}
1592		2001
		2002	sub baseline_shift {
		2003	$_[0]{layout}->descent
		2004	}
		2005
1593	sub size_allocate {	2006	sub invoke_size_allocate {
1594	my ($self, $w, $h) = @_;	2007	my ($self, $w, $h) = @_;
1595		2008
1596	delete $self->{ox};	2009	delete $self->{ox};
1597		2010
1598	delete $self->{texture}	2011	delete $self->{texture}
1599	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	2012	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2013
		2014	1
1600	}	2015	}
1601		2016
1602	sub set_fontsize {	2017	sub set_fontsize {
1603	my ($self, $fontsize) = @_;	2018	my ($self, $fontsize) = @_;
1604		2019
1605	$self->{fontsize} = $fontsize;	2020	$self->{fontsize} = $fontsize;
		2021	delete $self->{size_req};
1606	delete $self->{texture};	2022	delete $self->{texture};
1607		2023
1608	$self->realloc;	2024	$self->realloc;
1609	}	2025	}
1610		2026
		2027	sub reconfigure {
		2028	my ($self) = @_;
		2029
		2030	delete $self->{size_req};
		2031	delete $self->{texture};
		2032
		2033	$self->SUPER::reconfigure;
		2034	}
		2035
1611	sub _draw {	2036	sub _draw {
1612	my ($self) = @_;	2037	my ($self) = @_;
1613		2038
1614	$self->SUPER::_draw; # draw background, if applicable	2039	$self->SUPER::_draw; # draw background, if applicable
1615		2040
1616	my $tex = $self->{texture} ||= do {	2041	my $size = $self->{texture} ||= do {
1617	$self->{layout}->set_foreground (@{$self->{fg}});	2042	$self->{layout}->set_foreground (@{$self->{fg}});
1618	$self->{layout}->set_font ($self->{font}) if $self->{font};	2043	$self->{layout}->set_font ($self->{font}) if $self->{font};
1619	$self->{layout}->set_width ($self->{w});	2044	$self->{layout}->set_width ($self->{w});
1620	$self->{layout}->set_ellipsise ($self->{ellipsise});	2045	$self->{layout}->set_ellipsise ($self->{ellipsise});
1621	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2046	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1622	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2047	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623		2048
1624	new_from_layout CFClient::Texture $self->{layout}	2049	[$self->{layout}->size]
1625	};	2050	};
1626		2051
1627	unless (exists $self->{ox}) {	2052	unless (exists $self->{ox}) {
1628	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2053	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1629	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2054	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1630	: ($self->{w} - $tex->{w}) * 0.5);	2055	: ($self->{w} - $size->[0]) * 0.5);
1631		2056
1632	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2057	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1633	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2058	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1634	: ($self->{h} - $tex->{h}) * 0.5);	2059	: ($self->{h} - $size->[1]) * 0.5);
1635	};	2060	};
1636		2061
1637	glEnable GL_TEXTURE_2D;	2062	my $w = List::Util::min $self->{w} + 4, $size->[0];
1638	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2063	my $h = List::Util::min $self->{h} + 2, $size->[1];
1639		2064
1640	glColor_premultiply @{$self->{fg}}	2065	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1641	if $tex->{format} == GL_ALPHA;
1642
1643	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644
1645	glDisable GL_TEXTURE_2D;
1646	}	2066	}
1647		2067
1648	#############################################################################	2068	#############################################################################
1649		2069
1650	package CFClient::UI::EntryBase;	2070	package CFPlus::UI::EntryBase;
1651		2071
1652	our @ISA = CFClient::UI::Label::;	2072	our @ISA = CFPlus::UI::Label::;
1653		2073
1654	use CFClient::OpenGL;	2074	use CFPlus::OpenGL;
1655		2075
1656	sub new {	2076	sub new {
1657	my $class = shift;	2077	my $class = shift;
1658		2078
1659	$class->SUPER::new (	2079	$class->SUPER::new (
…		…
1663	active_fg => [0, 0, 0],	2083	active_fg => [0, 0, 0],
1664	can_hover => 1,	2084	can_hover => 1,
1665	can_focus => 1,	2085	can_focus => 1,
1666	valign => 0,	2086	valign => 0,
1667	can_events => 1,	2087	can_events => 1,
		2088	ellipsise => 0,
1668	#text => ...	2089	#text => ...
		2090	#hidden => "*",
1669	@_	2091	@_
1670	)	2092	)
1671	}	2093	}
1672		2094
1673	sub _set_text {	2095	sub _set_text {
…		…
1680	$self->{last_activity} = $::NOW;	2102	$self->{last_activity} = $::NOW;
1681	$self->{text} = $text;	2103	$self->{text} = $text;
1682		2104
1683	$text =~ s/./*/g if $self->{hidden};	2105	$text =~ s/./*/g if $self->{hidden};
1684	$self->{layout}->set_text ("$text ");	2106	$self->{layout}->set_text ("$text ");
		2107	delete $self->{size_req};
1685		2108
1686	$self->_emit (changed => $self->{text});	2109	$self->emit (changed => $self->{text});
		2110
		2111	$self->realloc;
1687	$self->update;	2112	$self->update;
1688	}	2113	}
1689		2114
1690	sub set_text {	2115	sub set_text {
1691	my ($self, $text) = @_;	2116	my ($self, $text) = @_;
1692		2117
1693	$self->{cursor} = length $text;	2118	$self->{cursor} = length $text;
1694	$self->_set_text ($text);	2119	$self->_set_text ($text);
1695
1696	$self->realloc;
1697	}	2120	}
1698		2121
1699	sub get_text {	2122	sub get_text {
1700	$_[0]{text}	2123	$_[0]{text}
1701	}	2124	}
…		…
1706	my ($w, $h) = $self->SUPER::size_request;	2129	my ($w, $h) = $self->SUPER::size_request;
1707		2130
1708	($w + 1, $h) # add 1 for cursor	2131	($w + 1, $h) # add 1 for cursor
1709	}	2132	}
1710		2133
1711	sub key_down {	2134	sub invoke_key_down {
1712	my ($self, $ev) = @_;	2135	my ($self, $ev) = @_;
1713		2136
1714	my $mod = $ev->{mod};	2137	my $mod = $ev->{mod};
1715	my $sym = $ev->{sym};	2138	my $sym = $ev->{sym};
1716	my $uni = $ev->{unicode};	2139	my $uni = $ev->{unicode};
1717		2140
1718	my $text = $self->get_text;	2141	my $text = $self->get_text;
		2142
		2143	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1719		2144
1720	if ($uni == 8) {	2145	if ($uni == 8) {
1721	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2146	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1722	} elsif ($uni == 127) {	2147	} elsif ($uni == 127) {
1723	substr $text, $self->{cursor}, 1, "";	2148	substr $text, $self->{cursor}, 1, "";
1724	} elsif ($sym == CFClient::SDLK_LEFT) {	2149	} elsif ($sym == CFPlus::SDLK_LEFT) {
1725	--$self->{cursor} if $self->{cursor};	2150	--$self->{cursor} if $self->{cursor};
1726	} elsif ($sym == CFClient::SDLK_RIGHT) {	2151	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1727	++$self->{cursor} if $self->{cursor} < length $self->{text};	2152	++$self->{cursor} if $self->{cursor} < length $self->{text};
1728	} elsif ($sym == CFClient::SDLK_HOME) {	2153	} elsif ($sym == CFPlus::SDLK_HOME) {
		2154	# what a hack
		2155	$self->{cursor} =
		2156	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2157	? length $1
		2158	: 0;
		2159	} elsif ($sym == CFPlus::SDLK_END) {
		2160	# uh, again
		2161	$self->{cursor} =
		2162	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2163	? $self->{cursor} + length $1
		2164	: length $self->{text};
		2165	} elsif ($uni == 21) { # ctrl-u
		2166	$text = "";
1729	$self->{cursor} = 0;	2167	$self->{cursor} = 0;
1730	} elsif ($sym == CFClient::SDLK_END) {
1731	$self->{cursor} = length $text;
1732	} elsif ($uni == 27) {	2168	} elsif ($uni == 27) {
1733	$self->_emit ('escape');	2169	$self->emit ('escape');
1734	} elsif ($uni) {	2170	} elsif ($uni == 0x0d) {
		2171	substr $text, $self->{cursor}++, 0, "\012";
		2172	} elsif ($uni >= 0x20) {
1735	substr $text, $self->{cursor}++, 0, chr $uni;	2173	substr $text, $self->{cursor}++, 0, chr $uni;
1736	} else {	2174	} else {
1737	return 0;	2175	return 0;
1738	}	2176	}
1739		2177
1740	$self->_set_text ($text);	2178	$self->_set_text ($text);
1741		2179
1742	$self->realloc;	2180	$self->realloc;
		2181	$self->update;
1743		2182
1744	1	2183	1
1745	}	2184	}
1746		2185
1747	sub focus_in {	2186	sub invoke_focus_in {
1748	my ($self) = @_;	2187	my ($self) = @_;
1749		2188
1750	$self->{last_activity} = $::NOW;	2189	$self->{last_activity} = $::NOW;
1751		2190
1752	$self->SUPER::focus_in;	2191	$self->SUPER::invoke_focus_in
1753	}	2192	}
1754		2193
1755	sub button_down {	2194	sub invoke_button_down {
1756	my ($self, $ev, $x, $y) = @_;	2195	my ($self, $ev, $x, $y) = @_;
1757		2196
1758	$self->SUPER::button_down ($ev, $x, $y);	2197	$self->SUPER::invoke_button_down ($ev, $x, $y);
1759		2198
1760	my $idx = $self->{layout}->xy_to_index ($x, $y);	2199	my $idx = $self->{layout}->xy_to_index ($x, $y);
1761		2200
1762	# byte-index to char-index	2201	# byte-index to char-index
1763	my $text = $self->{text};	2202	my $text = $self->{text};
1764	utf8::encode $text;	2203	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765	$self->{cursor} = length substr $text, 0, $idx;	2204	$self->{cursor} = length $text;
1766		2205
1767	$self->_set_text ($self->{text});	2206	$self->_set_text ($self->{text});
1768	$self->update;	2207	$self->update;
1769		2208
1770	1	2209	1
1771	}	2210	}
1772		2211
1773	sub mouse_motion {	2212	sub invoke_mouse_motion {
1774	my ($self, $ev, $x, $y) = @_;	2213	my ($self, $ev, $x, $y) = @_;
1775	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2214	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776		2215
1777	0	2216	1
1778	}	2217	}
1779		2218
1780	sub _draw {	2219	sub _draw {
1781	my ($self) = @_;	2220	my ($self) = @_;
1782		2221
…		…
1809	utf8::encode $text;	2248	utf8::encode $text;
1810		2249
1811	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2250	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1812	}	2251	}
1813		2252
1814	glColor @{$self->{fg}};
1815	glBegin GL_LINES;	2253	glBegin GL_LINES;
1816	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2254	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1817	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2255	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1818	glEnd;	2256	glEnd;
1819	}	2257	}
1820	}	2258	}
1821		2259
		2260	#############################################################################
		2261
1822	package CFClient::UI::Entry;	2262	package CFPlus::UI::Entry;
1823		2263
1824	our @ISA = CFClient::UI::EntryBase::;	2264	our @ISA = CFPlus::UI::EntryBase::;
1825		2265
1826	use CFClient::OpenGL;	2266	use CFPlus::OpenGL;
1827		2267
1828	sub key_down {	2268	sub invoke_key_down {
1829	my ($self, $ev) = @_;	2269	my ($self, $ev) = @_;
1830		2270
1831	my $sym = $ev->{sym};	2271	my $sym = $ev->{sym};
1832		2272
1833	if ($sym == 13) {	2273	if ($ev->{uni} == 0x0d || $sym == 13) {
1834	unshift @{$self->{history}},	2274	unshift @{$self->{history}},
1835	my $txt = $self->get_text;	2275	my $txt = $self->get_text;
		2276
1836	$self->{history_pointer} = -1;	2277	$self->{history_pointer} = -1;
1837	$self->{history_saveback} = '';	2278	$self->{history_saveback} = '';
1838	$self->_emit (activate => $txt);	2279	$self->emit (activate => $txt);
1839	$self->update;	2280	$self->update;
1840		2281
1841	} elsif ($sym == CFClient::SDLK_UP) {	2282	} elsif ($sym == CFPlus::SDLK_UP) {
1842	if ($self->{history_pointer} < 0) {	2283	if ($self->{history_pointer} < 0) {
1843	$self->{history_saveback} = $self->get_text;	2284	$self->{history_saveback} = $self->get_text;
1844	}	2285	}
1845	if (@{$self->{history} || []} > 0) {	2286	if (@{$self->{history} || []} > 0) {
1846	$self->{history_pointer}++;	2287	$self->{history_pointer}++;
…		…
1848	$self->{history_pointer} = @{$self->{history} || []} - 1;	2289	$self->{history_pointer} = @{$self->{history} || []} - 1;
1849	}	2290	}
1850	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2291	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1851	}	2292	}
1852		2293
1853	} elsif ($sym == CFClient::SDLK_DOWN) {	2294	} elsif ($sym == CFPlus::SDLK_DOWN) {
1854	$self->{history_pointer}--;	2295	$self->{history_pointer}--;
1855	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2296	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1856		2297
1857	if ($self->{history_pointer} >= 0) {	2298	if ($self->{history_pointer} >= 0) {
1858	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2299	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1859	} else {	2300	} else {
1860	$self->set_text ($self->{history_saveback});	2301	$self->set_text ($self->{history_saveback});
1861	}	2302	}
1862		2303
1863	} else {	2304	} else {
1864	return $self->SUPER::key_down ($ev)	2305	return $self->SUPER::invoke_key_down ($ev)
1865	}	2306	}
1866		2307
1867	1	2308	1
1868	}	2309	}
1869		2310
1870	#############################################################################	2311	#############################################################################
1871		2312
		2313	package CFPlus::UI::TextEdit;
		2314
		2315	our @ISA = CFPlus::UI::EntryBase::;
		2316
		2317	use CFPlus::OpenGL;
		2318
		2319	sub move_cursor_ver {
		2320	my ($self, $dy) = @_;
		2321
		2322	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2323
		2324	$y += $dy;
		2325
		2326	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2327	$self->{cursor} = $index;
		2328	delete $self->{cur_h};
		2329	$self->update;
		2330	return;
		2331	}
		2332	}
		2333
		2334	sub invoke_key_down {
		2335	my ($self, $ev) = @_;
		2336
		2337	my $sym = $ev->{sym};
		2338
		2339	if ($sym == CFPlus::SDLK_UP) {
		2340	$self->move_cursor_ver (-1);
		2341	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2342	$self->move_cursor_ver (+1);
		2343	} else {
		2344	return $self->SUPER::invoke_key_down ($ev)
		2345	}
		2346
		2347	1
		2348	}
		2349
		2350	#############################################################################
		2351
1872	package CFClient::UI::Button;	2352	package CFPlus::UI::Button;
1873		2353
1874	our @ISA = CFClient::UI::Label::;	2354	our @ISA = CFPlus::UI::Label::;
1875		2355
1876	use CFClient::OpenGL;	2356	use CFPlus::OpenGL;
1877		2357
1878	my @tex =	2358	my @tex =
1879	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2359	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1880	qw(b1_button_active.png);	2360	qw(b1_button_inactive.png b1_button_active.png);
1881		2361
1882	sub new {	2362	sub new {
1883	my $class = shift;	2363	my $class = shift;
1884		2364
1885	$class->SUPER::new (	2365	$class->SUPER::new (
1886	padding_x => 4,	2366	padding_x => 4,
1887	padding_y => 4,	2367	padding_y => 4,
1888	fg => [1, 1, 1],	2368	fg => [1.0, 1.0, 1.0],
1889	active_fg => [0, 0, 1],	2369	active_fg => [0.8, 0.8, 0.8],
1890	can_hover => 1,	2370	can_hover => 1,
1891	align => 0,	2371	align => 0,
1892	valign => 0,	2372	valign => 0,
1893	can_events => 1,	2373	can_events => 1,
1894	@_	2374	@_
1895	)	2375	)
1896	}	2376	}
1897		2377
1898	sub activate { }
1899
1900	sub button_up {	2378	sub invoke_button_up {
1901	my ($self, $ev, $x, $y) = @_;	2379	my ($self, $ev, $x, $y) = @_;
1902		2380
1903	$self->emit ("activate")	2381	$self->emit ("activate")
1904	if $x >= 0 && $x < $self->{w}	2382	if $x >= 0 && $x < $self->{w}
1905	&& $y >= 0 && $y < $self->{h};	2383	&& $y >= 0 && $y < $self->{h};
…		…
1914		2392
1915	glEnable GL_TEXTURE_2D;	2393	glEnable GL_TEXTURE_2D;
1916	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2394	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1917	glColor 0, 0, 0, 1;	2395	glColor 0, 0, 0, 1;
1918		2396
		2397	my $tex = $tex[$GRAB == $self];
1919	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2398	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1920		2399
1921	glDisable GL_TEXTURE_2D;	2400	glDisable GL_TEXTURE_2D;
1922		2401
1923	$self->SUPER::_draw;	2402	$self->SUPER::_draw;
1924	}	2403	}
1925		2404
1926	#############################################################################	2405	#############################################################################
1927		2406
1928	package CFClient::UI::CheckBox;	2407	package CFPlus::UI::CheckBox;
1929		2408
1930	our @ISA = CFClient::UI::DrawBG::;	2409	our @ISA = CFPlus::UI::DrawBG::;
1931		2410
1932	my @tex =	2411	my @tex =
1933	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2412	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1934	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2413	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1935		2414
1936	use CFClient::OpenGL;	2415	use CFPlus::OpenGL;
1937		2416
1938	sub new {	2417	sub new {
1939	my $class = shift;	2418	my $class = shift;
1940		2419
1941	$class->SUPER::new (	2420	$class->SUPER::new (
…		…
1955	my ($self) = @_;	2434	my ($self) = @_;
1956		2435
1957	(6) x 2	2436	(6) x 2
1958	}	2437	}
1959		2438
		2439	sub toggle {
		2440	my ($self) = @_;
		2441
		2442	$self->{state} = !$self->{state};
		2443	$self->emit (changed => $self->{state});
		2444	$self->update;
		2445	}
		2446
1960	sub button_down {	2447	sub invoke_button_down {
1961	my ($self, $ev, $x, $y) = @_;	2448	my ($self, $ev, $x, $y) = @_;
1962		2449
1963	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2450	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1964	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2451	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1965	$self->{state} = !$self->{state};	2452	$self->toggle;
1966	$self->_emit (changed => $self->{state});
1967	} else {	2453	} else {
1968	return 0	2454	return 0
1969	}	2455	}
1970		2456
1971	1	2457	1
…		…
1991	glDisable GL_TEXTURE_2D;	2477	glDisable GL_TEXTURE_2D;
1992	}	2478	}
1993		2479
1994	#############################################################################	2480	#############################################################################
1995		2481
1996	package CFClient::UI::Image;	2482	package CFPlus::UI::Image;
1997		2483
1998	our @ISA = CFClient::UI::Base::;	2484	our @ISA = CFPlus::UI::Base::;
1999		2485
2000	use CFClient::OpenGL;	2486	use CFPlus::OpenGL;
2001	use Carp qw/confess/;
2002		2487
2003	our %loaded_images;	2488	our %texture_cache;
2004		2489
2005	sub new {	2490	sub new {
2006	my $class = shift;	2491	my $class = shift;
2007		2492
2008	my $self = $class->SUPER::new (can_events => 0, @_);	2493	my $self = $class->SUPER::new (
		2494	can_events => 0,
		2495	@_,
		2496	);
2009		2497
2010	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2498	$self->{path} || $self->{tex}
		2499	or Carp::croak "'path' or 'tex' attributes required";
2011		2500
2012	$loaded_images{$self->{image}} ||=	2501	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2013	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2502	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2014		2503
2015	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2504	CFPlus::weaken $texture_cache{$self->{path}};
2016		2505
2017	Scalar::Util::weaken $loaded_images{$self->{image}};	2506	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2018
2019	$self->{aspect} = $tex->{w} / $tex->{h};
2020		2507
2021	$self	2508	$self
2022	}	2509	}
2023		2510
		2511	sub STORABLE_freeze {
		2512	my ($self, $cloning) = @_;
		2513
		2514	$self->{path}
		2515	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2516
		2517	$self->{path}
		2518	}
		2519
		2520	sub STORABLE_attach {
		2521	my ($self, $cloning, $path) = @_;
		2522
		2523	$self->new (path => $path)
		2524	}
		2525
2024	sub size_request {	2526	sub size_request {
2025	my ($self) = @_;	2527	my ($self) = @_;
2026		2528
2027	($self->{tex}->{w}, $self->{tex}->{h})	2529	($self->{tex}{w}, $self->{tex}{h})
2028	}	2530	}
2029		2531
2030	sub _draw {	2532	sub _draw {
2031	my ($self) = @_;	2533	my ($self) = @_;
2032		2534
…		…
2042	}	2544	}
2043		2545
2044	glEnable GL_TEXTURE_2D;	2546	glEnable GL_TEXTURE_2D;
2045	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2046		2548
2047	$tex->draw_quad_alpha (0, 0, $w, $h);	2549	$tex->draw_quad (0, 0, $w, $h);
2048		2550
2049	glDisable GL_TEXTURE_2D;	2551	glDisable GL_TEXTURE_2D;
2050	}	2552	}
2051		2553
2052	#############################################################################	2554	#############################################################################
2053		2555
		2556	package CFPlus::UI::ImageButton;
		2557
		2558	our @ISA = CFPlus::UI::Image::;
		2559
		2560	use CFPlus::OpenGL;
		2561
		2562	my %textures;
		2563
		2564	sub new {
		2565	my $class = shift;
		2566
		2567	my $self = $class->SUPER::new (
		2568	padding_x => 4,
		2569	padding_y => 4,
		2570	fg => [1, 1, 1],
		2571	active_fg => [0, 0, 1],
		2572	can_hover => 1,
		2573	align => 0,
		2574	valign => 0,
		2575	can_events => 1,
		2576	@_
		2577	);
		2578	}
		2579
		2580	sub invoke_button_up {
		2581	my ($self, $ev, $x, $y) = @_;
		2582
		2583	$self->emit ("activate")
		2584	if $x >= 0 && $x < $self->{w}
		2585	&& $y >= 0 && $y < $self->{h};
		2586
		2587	1
		2588	}
		2589
		2590	#############################################################################
		2591
2054	package CFClient::UI::VGauge;	2592	package CFPlus::UI::VGauge;
2055		2593
2056	our @ISA = CFClient::UI::Base::;	2594	our @ISA = CFPlus::UI::Base::;
2057		2595
2058	use List::Util qw(min max);	2596	use List::Util qw(min max);
2059		2597
2060	use CFClient::OpenGL;	2598	use CFPlus::OpenGL;
2061		2599
2062	my %tex = (	2600	my %tex = (
2063	food => [	2601	food => [
2064	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2602	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2065	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2603	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2066	],	2604	],
2067	grace => [	2605	grace => [
2068	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2606	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2069	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2607	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2070	],	2608	],
2071	hp => [	2609	hp => [
2072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2610	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2073	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2611	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2074	],	2612	],
2075	mana => [	2613	mana => [
2076	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2614	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2077	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2615	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2078	],	2616	],
2079	);	2617	);
2080		2618
2081	# eg. VGauge->new (gauge => 'food'), default gauge: food	2619	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2141	my $ycut1 = max 0, min 1, $ycut;	2679	my $ycut1 = max 0, min 1, $ycut;
2142	my $ycut2 = max 0, min 1, $ycut - 1;	2680	my $ycut2 = max 0, min 1, $ycut - 1;
2143		2681
2144	my $h1 = $self->{h} * (1 - $ycut1);	2682	my $h1 = $self->{h} * (1 - $ycut1);
2145	my $h2 = $self->{h} * (1 - $ycut2);	2683	my $h2 = $self->{h} * (1 - $ycut2);
		2684	my $h3 = $self->{h};
		2685
		2686	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2146		2687
2147	glEnable GL_BLEND;	2688	glEnable GL_BLEND;
2148	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2689	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2690	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150	glEnable GL_TEXTURE_2D;	2691	glEnable GL_TEXTURE_2D;
…		…
2169		2710
2170	if ($t3) {	2711	if ($t3) {
2171	glBindTexture GL_TEXTURE_2D, $t3->{name};	2712	glBindTexture GL_TEXTURE_2D, $t3->{name};
2172	glBegin GL_QUADS;	2713	glBegin GL_QUADS;
2173	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2714	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2174	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2715	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2175	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2716	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2176	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2717	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2177	glEnd;	2718	glEnd;
2178	}	2719	}
2179		2720
2180	glDisable GL_BLEND;	2721	glDisable GL_BLEND;
2181	glDisable GL_TEXTURE_2D;	2722	glDisable GL_TEXTURE_2D;
2182	}	2723	}
2183		2724
2184	#############################################################################	2725	#############################################################################
2185		2726
2186	package CFClient::UI::Gauge;	2727	package CFPlus::UI::Gauge;
2187		2728
2188	our @ISA = CFClient::UI::VBox::;	2729	our @ISA = CFPlus::UI::VBox::;
2189		2730
2190	sub new {	2731	sub new {
2191	my ($class, %arg) = @_;	2732	my ($class, %arg) = @_;
2192		2733
2193	my $self = $class->SUPER::new (	2734	my $self = $class->SUPER::new (
…		…
2195	can_hover => 1,	2736	can_hover => 1,
2196	can_events => 1,	2737	can_events => 1,
2197	%arg,	2738	%arg,
2198	);	2739	);
2199		2740
2200	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2741	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2201	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2742	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2202	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2743	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2203		2744
2204	$self	2745	$self
2205	}	2746	}
2206		2747
2207	sub set_fontsize {	2748	sub set_fontsize {
…		…
2228	$self->{value}->set_text ($val);	2769	$self->{value}->set_text ($val);
2229	}	2770	}
2230		2771
2231	#############################################################################	2772	#############################################################################
2232		2773
2233	package CFClient::UI::Slider;	2774	package CFPlus::UI::Slider;
2234		2775
2235	use strict;	2776	use strict;
2236		2777
2237	use CFClient::OpenGL;	2778	use CFPlus::OpenGL;
2238		2779
2239	our @ISA = CFClient::UI::DrawBG::;	2780	our @ISA = CFPlus::UI::DrawBG::;
2240		2781
2241	my @tex =	2782	my @tex =
2242	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2783	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2243	qw(s1_slider.png s1_slider_bg.png);	2784	qw(s1_slider.png s1_slider_bg.png);
2244		2785
2245	sub new {	2786	sub new {
2246	my $class = shift;	2787	my $class = shift;
2247		2788
…		…
2268	$self->update;	2809	$self->update;
2269		2810
2270	$self	2811	$self
2271	}	2812	}
2272		2813
2273	sub changed { }
2274
2275	sub set_range {	2814	sub set_range {
2276	my ($self, $range) = @_;	2815	my ($self, $range) = @_;
2277		2816
2278	($range, $self->{range}) = ($self->{range}, $range);	2817	($range, $self->{range}) = ($self->{range}, $range);
2279		2818
2280	$self->update
2281	if "@$range" ne "@{$self->{range}}";	2819	if ("@$range" ne "@{$self->{range}}") {
		2820	$self->update;
		2821	$self->set_value ($self->{range}[0]);
		2822	}
2282	}	2823	}
2283		2824
2284	sub set_value {	2825	sub set_value {
2285	my ($self, $value) = @_;	2826	my ($self, $value) = @_;
2286		2827
…		…
2297	if $unit;	2838	if $unit;
2298		2839
2299	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2840	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300		2841
2301	if ($value != $old_value) {	2842	if ($value != $old_value) {
2302	$self->_emit (changed => $value);	2843	$self->emit (changed => $value);
2303	$self->update;	2844	$self->update;
2304	}	2845	}
2305	}	2846	}
2306		2847
2307	sub size_request {	2848	sub size_request {
2308	my ($self) = @_;	2849	my ($self) = @_;
2309		2850
2310	($self->{req_w}, $self->{req_h})	2851	($self->{req_w}, $self->{req_h})
2311	}	2852	}
2312		2853
2313	sub button_down {	2854	sub invoke_button_down {
2314	my ($self, $ev, $x, $y) = @_;	2855	my ($self, $ev, $x, $y) = @_;
2315		2856
2316	$self->SUPER::button_down ($ev, $x, $y);	2857	$self->SUPER::invoke_button_down ($ev, $x, $y);
2317		2858
2318	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2859	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319		2860
2320	$self->mouse_motion ($ev, $x, $y)	2861	$self->invoke_mouse_motion ($ev, $x, $y)
2321	}	2862	}
2322		2863
2323	sub mouse_motion {	2864	sub invoke_mouse_motion {
2324	my ($self, $ev, $x, $y) = @_;	2865	my ($self, $ev, $x, $y) = @_;
2325		2866
2326	if ($GRAB == $self) {	2867	if ($GRAB == $self) {
2327	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2868	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328		2869
…		…
2334	} else {	2875	} else {
2335	return 0;	2876	return 0;
2336	}	2877	}
2337		2878
2338	1	2879	1
		2880	}
		2881
		2882	sub invoke_mouse_wheel {
		2883	my ($self, $ev) = @_;
		2884
		2885	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2886
		2887	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2888
		2889	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2890
		2891	! ! $delta
2339	}	2892	}
2340		2893
2341	sub update {	2894	sub update {
2342	my ($self) = @_;	2895	my ($self) = @_;
2343		2896
…		…
2392	glDisable GL_TEXTURE_2D;	2945	glDisable GL_TEXTURE_2D;
2393	}	2946	}
2394		2947
2395	#############################################################################	2948	#############################################################################
2396		2949
2397	package CFClient::UI::ValSlider;	2950	package CFPlus::UI::ValSlider;
2398		2951
2399	our @ISA = CFClient::UI::HBox::;	2952	our @ISA = CFPlus::UI::HBox::;
2400		2953
2401	sub new {	2954	sub new {
2402	my ($class, %arg) = @_;	2955	my ($class, %arg) = @_;
2403		2956
2404	my $range = delete $arg{range};	2957	my $range = delete $arg{range};
2405		2958
2406	my $self = $class->SUPER::new (	2959	my $self = $class->SUPER::new (
2407	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2960	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2408	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2961	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2409	to_value => sub { shift },	2962	to_value => sub { shift },
2410	from_value => sub { shift },	2963	from_value => sub { shift },
2411	%arg,	2964	%arg,
2412	);	2965	);
2413		2966
…		…
2433	sub set_range { shift->{slider}->set_range (@_) }	2986	sub set_range { shift->{slider}->set_range (@_) }
2434	sub set_value { shift->{slider}->set_value (@_) }	2987	sub set_value { shift->{slider}->set_value (@_) }
2435		2988
2436	#############################################################################	2989	#############################################################################
2437		2990
2438	package CFClient::UI::TextView;	2991	package CFPlus::UI::TextScroller;
2439		2992
2440	our @ISA = CFClient::UI::HBox::;	2993	our @ISA = CFPlus::UI::HBox::;
2441		2994
2442	use CFClient::OpenGL;	2995	use CFPlus::OpenGL;
2443		2996
2444	sub new {	2997	sub new {
2445	my $class = shift;	2998	my $class = shift;
2446		2999
2447	my $self = $class->SUPER::new (	3000	my $self = $class->SUPER::new (
2448	fontsize => 1,	3001	fontsize => 1,
2449	can_events => 0,	3002	can_events => 1,
		3003	indent => 0,
2450	#font => default_font	3004	#font => default_font
2451	@_,	3005	@_,
2452		3006
2453	layout => (new CFClient::Layout 1),	3007	layout => (new CFPlus::Layout),
2454	par => [],	3008	par => [],
		3009	max_par => 0,
2455	height => 0,	3010	height => 0,
2456	children => [	3011	children => [
2457	(new CFClient::UI::Empty expand => 1),	3012	(new CFPlus::UI::Empty expand => 1),
2458	(new CFClient::UI::Slider vertical => 1),	3013	(new CFPlus::UI::Slider vertical => 1),
2459	],	3014	],
2460	);	3015	);
2461		3016
2462	$self->{children}[1]->connect (changed => sub { $self->update });	3017	$self->{children}[1]->connect (changed => sub { $self->update });
2463		3018
…		…
2469		3024
2470	$self->{fontsize} = $fontsize;	3025	$self->{fontsize} = $fontsize;
2471	$self->reflow;	3026	$self->reflow;
2472	}	3027	}
2473		3028
		3029	sub size_request {
		3030	my ($self) = @_;
		3031
		3032	my ($empty, $slider) = @{ $self->{children} };
		3033
		3034	local $self->{children} = [$empty, $slider];
		3035	$self->SUPER::size_request
		3036	}
		3037
2474	sub size_allocate {	3038	sub invoke_size_allocate {
2475	my ($self, $w, $h) = @_;	3039	my ($self, $w, $h) = @_;
2476		3040
2477	$self->SUPER::size_allocate ($w, $h);	3041	my ($empty, $slider, @other) = @{ $self->{children} };
		3042	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2478		3043
2479	$self->{layout}->set_font ($self->{font}) if $self->{font};	3044	$self->{layout}->set_font ($self->{font}) if $self->{font};
2480	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3045	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481	$self->{layout}->set_width ($self->{children}[0]{w});	3046	$self->{layout}->set_width ($empty->{w});
		3047	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2482		3048
2483	$self->reflow;	3049	$self->reflow;
2484	}
2485		3050
2486	sub text_size {	3051	local $self->{children} = [$empty, $slider];
		3052	$self->SUPER::invoke_size_allocate ($w, $h)
		3053	}
		3054
		3055	sub invoke_mouse_wheel {
2487	my ($self, $text, $indent) = @_;	3056	my ($self, $ev) = @_;
		3057
		3058	return 0 unless $ev->{dy}; # only vertical movements
		3059
		3060	$self->{children}[1]->emit (mouse_wheel => $ev);
		3061
		3062	1
		3063	}
		3064
		3065	sub get_layout {
		3066	my ($self, $para) = @_;
2488		3067
2489	my $layout = $self->{layout};	3068	my $layout = $self->{layout};
2490		3069
		3070	$layout->set_font ($self->{font}) if $self->{font};
		3071	$layout->set_foreground (@{$para->{fg}});
2491	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3072	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492	$layout->set_width ($self->{children}[0]{w} - $indent);	3073	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3074	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2493	$layout->set_markup ($text);	3075	$layout->set_markup ($para->{markup});
		3076
		3077	$layout->set_shapes (
		3078	map
		3079	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3080	@{$para->{widget}}
2494		3081	);
		3082
2495	$layout->size	3083	$layout
2496	}	3084	}
2497		3085
2498	sub reflow {	3086	sub reflow {
2499	my ($self) = @_;	3087	my ($self) = @_;
2500		3088
…		…
2507		3095
2508	# todo: base offset on lines or so, not on pixels	3096	# todo: base offset on lines or so, not on pixels
2509	$self->{children}[1]->set_value ($offset);	3097	$self->{children}[1]->set_value ($offset);
2510	}	3098	}
2511		3099
		3100	sub current_paragraph {
		3101	my ($self) = @_;
		3102
		3103	$self->{top_paragraph} - 1
		3104	}
		3105
		3106	sub scroll_to {
		3107	my ($self, $para) = @_;
		3108
		3109	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3110
		3111	$self->{scroll_to} = $para;
		3112	$self->update;
		3113	}
		3114
2512	sub clear {	3115	sub clear {
2513	my ($self) = @_;	3116	my ($self) = @_;
		3117
		3118	my (undef, undef, @other) = @{ $self->{children} };
		3119	$self->remove ($_) for @other;
2514		3120
2515	$self->{par} = [];	3121	$self->{par} = [];
2516	$self->{height} = 0;	3122	$self->{height} = 0;
2517	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3123	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518	}	3124	}
2519		3125
2520	sub add_paragraph {	3126	sub add_paragraph {
2521	my ($self, $color, $text, $indent) = @_;	3127	my $self = shift;
2522		3128
2523	for my $line (split /\n/, $text) {	3129	for my $para (@_) {
2524	my ($w, $h) = $self->text_size ($line);	3130	$para = {
		3131	fg => [1, 1, 1, 1],
		3132	indent => 0,
		3133	markup => "",
		3134	widget => [],
		3135	ref $para ? %$para : (markup => $para),
		3136	w => 1e10,
		3137	wrapped => 1,
		3138	};
		3139
		3140	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3141	push @{$self->{par}}, $para;
		3142	}
		3143
		3144	if (my $max = $self->{max_par}) {
		3145	shift @{$self->{par}} while @{$self->{par}} > $max;
		3146	}
		3147
		3148	$self->{need_reflow}++;
		3149	$self->update;
		3150	}
		3151
		3152	sub scroll_to_bottom {
		3153	my ($self) = @_;
		3154
		3155	$self->{scroll_to} = $#{$self->{par}};
		3156	$self->update;
		3157	}
		3158
		3159	sub force_uptodate {
		3160	my ($self) = @_;
		3161
		3162	if (delete $self->{need_reflow}) {
		3163	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3164
		3165	my $height = 0;
		3166
		3167	for my $para (@{$self->{par}}) {
		3168	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3169	my $layout = $self->get_layout ($para);
		3170	my ($w, $h) = $layout->size;
		3171
		3172	$para->{w} = $w + $para->{indent};
		3173	$para->{h} = $h;
		3174	$para->{wrapped} = $layout->has_wrapped;
		3175	}
		3176
		3177	$para->{y} = $height;
		3178	$height += $para->{h};
		3179	}
		3180
2525	$self->{height} += $h;	3181	$self->{height} = $height;
2526	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3182	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2527	}
2528		3183
2529	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3184	delete $self->{texture};
		3185	}
		3186
		3187	if (my $paridx = delete $self->{scroll_to}) {
		3188	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3189	}
2530	}	3190	}
2531		3191
2532	sub update {	3192	sub update {
2533	my ($self) = @_;	3193	my ($self) = @_;
2534		3194
…		…
2536		3196
2537	return unless $self->{h} > 0;	3197	return unless $self->{h} > 0;
2538		3198
2539	delete $self->{texture};	3199	delete $self->{texture};
2540		3200
2541	$ROOT->on_post_alloc ($self, sub {	3201	$ROOT->on_post_alloc ($self => sub {
		3202	$self->force_uptodate;
		3203
2542	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3204	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543		3205
2544	if (delete $self->{need_reflow}) {
2545	my $height = 0;
2546
2547	my $layout = $self->{layout};
2548
2549	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2551	for (@{$self->{par}}) {
2552	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2553	$layout->set_width ($W - $_->[3]);
2554	$layout->set_markup ($_->[4]);
2555	my ($w, $h) = $layout->size;
2556	$_->[0] = $w + $_->[3];
2557	$_->[1] = $h;
2558	}
2559
2560	$height += $_->[1];
2561	}
2562
2563	$self->{height} = $height;
2564
2565	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2566
2567	delete $self->{texture};
2568	}
2569
2570	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3206	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2571	glClearColor 0, 0, 0, 0;	3207	glClearColor 0, 0, 0, 0;
2572	glClear GL_COLOR_BUFFER_BIT;	3208	glClear GL_COLOR_BUFFER_BIT;
2573		3209
		3210	package CFPlus::UI::Base;
		3211	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3212	(0, 0, $self->{w}, $self->{h});
		3213
		3214	my $top = int $self->{children}[1]{range}[0];
		3215
		3216	my $paridx = 0;
		3217	my $top_paragraph;
2574	my $top = int $self->{children}[1]{range}[0];	3218	my $top = int $self->{children}[1]{range}[0];
2575		3219
2576	my $y0 = $top;	3220	my $y0 = $top;
2577	my $y1 = $top + $H;	3221	my $y1 = $top + $H;
2578		3222
2579	my $y = 0;
2580
2581	my $layout = $self->{layout};
2582
2583	$layout->set_font ($self->{font}) if $self->{font};
2584
2585	glEnable GL_BLEND;
2586	#TODO# not correct in windows where rgba is forced off
2587	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2588
2589	for my $par (@{$self->{par}}) {	3223	for my $para (@{$self->{par}}) {
2590	my $h = $par->[1];	3224	my $h = $para->{h};
		3225	my $y = $para->{y};
2591		3226
2592	if ($y0 < $y + $h && $y < $y1) {	3227	if ($y0 < $y + $h && $y < $y1) {
2593	$layout->set_foreground (@{ $par->[2] });	3228	my $layout = $self->get_layout ($para);
2594	$layout->set_width ($W - $par->[3]);
2595	$layout->set_markup ($par->[4]);
2596		3229
2597	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3230	$layout->render ($para->{indent}, $y - $y0);
2598		3231
2599	glRasterPos $par->[3], $y - $y0;	3232	if (my @w = @{ $para->{widget} }) {
2600	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3233	my @s = $layout->get_shapes;
		3234
		3235	for (@w) {
		3236	my ($dx, $dy) = splice @s, 0, 2, ();
		3237
		3238	$_->{x} = $dx + $para->{indent};
		3239	$_->{y} = $dy + $y - $y0;
		3240
		3241	$_->draw;
		3242	}
		3243	}
2601	}	3244	}
2602		3245
2603	$y += $h;	3246	$paridx++;
		3247	$top_paragraph ||= $paridx if $y >= $top;
2604	}	3248	}
2605		3249
2606	glDisable GL_BLEND;	3250	$self->{top_paragraph} = $top_paragraph;
2607	};	3251	};
2608	});	3252	});
		3253	}
		3254
		3255	sub reconfigure {
		3256	my ($self) = @_;
		3257
		3258	$self->SUPER::reconfigure;
		3259
		3260	$_->{w} = 1e10 for @{ $self->{par} };
		3261	$self->reflow;
2609	}	3262	}
2610		3263
2611	sub _draw {	3264	sub _draw {
2612	my ($self) = @_;	3265	my ($self) = @_;
2613		3266
…		…
2616	glColor 0, 0, 0, 1;	3269	glColor 0, 0, 0, 1;
2617	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3270	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2618	glDisable GL_TEXTURE_2D;	3271	glDisable GL_TEXTURE_2D;
2619		3272
2620	$self->{children}[1]->draw;	3273	$self->{children}[1]->draw;
2621
2622	}	3274	}
2623		3275
2624	#############################################################################	3276	#############################################################################
2625		3277
2626	package CFClient::UI::Animator;	3278	package CFPlus::UI::Animator;
2627		3279
2628	use CFClient::OpenGL;	3280	use CFPlus::OpenGL;
2629		3281
2630	our @ISA = CFClient::UI::Bin::;	3282	our @ISA = CFPlus::UI::Bin::;
2631		3283
2632	sub moveto {	3284	sub moveto {
2633	my ($self, $x, $y) = @_;	3285	my ($self, $x, $y) = @_;
2634		3286
2635	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3287	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2663	glPopMatrix;	3315	glPopMatrix;
2664	}	3316	}
2665		3317
2666	#############################################################################	3318	#############################################################################
2667		3319
2668	package CFClient::UI::Flopper;	3320	package CFPlus::UI::Flopper;
2669		3321
2670	our @ISA = CFClient::UI::Button::;	3322	our @ISA = CFPlus::UI::Button::;
2671		3323
2672	sub new {	3324	sub new {
2673	my $class = shift;	3325	my $class = shift;
2674		3326
2675	my $self = $class->SUPER::new (	3327	my $self = $class->SUPER::new (
…		…
2687	$self->{other}->toggle_visibility;	3339	$self->{other}->toggle_visibility;
2688	}	3340	}
2689		3341
2690	#############################################################################	3342	#############################################################################
2691		3343
2692	package CFClient::UI::Tooltip;	3344	package CFPlus::UI::Tooltip;
2693		3345
2694	our @ISA = CFClient::UI::Bin::;	3346	our @ISA = CFPlus::UI::Bin::;
2695		3347
2696	use CFClient::OpenGL;	3348	use CFPlus::OpenGL;
2697		3349
2698	sub new {	3350	sub new {
2699	my $class = shift;	3351	my $class = shift;
2700		3352
2701	$class->SUPER::new (	3353	$class->SUPER::new (
…		…
2704	)	3356	)
2705	}	3357	}
2706		3358
2707	sub set_tooltip_from {	3359	sub set_tooltip_from {
2708	my ($self, $widget) = @_;	3360	my ($self, $widget) = @_;
		3361
		3362	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3363	if $widget->{tooltip} =~ /^#(.*)$/;
2709		3364
2710	my $tooltip = $widget->{tooltip};	3365	my $tooltip = $widget->{tooltip};
2711		3366
2712	if ($ENV{CFPLUS_DEBUG} & 2) {	3367	if ($ENV{CFPLUS_DEBUG} & 2) {
2713	$tooltip .= "\n\n" . (ref $widget) . "\n"	3368	$tooltip .= "\n\n" . (ref $widget) . "\n"
2714	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3369	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715	. "req $widget->{req_w} $widget->{req_h}\n"	3370	. "req $widget->{req_w} $widget->{req_h}\n"
2716	. "visible $widget->{visible}";	3371	. "visible $widget->{visible}";
2717	}	3372	}
2718		3373
		3374	$tooltip =~ s/^\n+//;
		3375	$tooltip =~ s/\n+$//;
		3376
2719	$self->add (new CFClient::UI::Label	3377	$self->add (new CFPlus::UI::Label
2720	markup => $tooltip,	3378	markup => $tooltip,
2721	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3379	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722	fontsize => 0.8,	3380	fontsize => 0.8,
2723	fg => [0, 0, 0, 1],	3381	style => 1, # FLAG_INVERSE
2724	ellipsise => 0,	3382	ellipsise => 0,
2725	font => ($widget->{tooltip_font} || $::FONT_PROP),	3383	font => ($widget->{tooltip_font} || $::FONT_PROP),
2726	);	3384	);
2727	}	3385	}
2728		3386
…		…
2732	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3390	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2733		3391
2734	($w + 4, $h + 4)	3392	($w + 4, $h + 4)
2735	}	3393	}
2736		3394
2737	sub size_allocate {	3395	sub invoke_size_allocate {
2738	my ($self, $w, $h) = @_;	3396	my ($self, $w, $h) = @_;
2739		3397
2740	$self->SUPER::size_allocate ($w - 4, $h - 4);	3398	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2741	}	3399	}
2742		3400
2743	sub visibility_change {	3401	sub invoke_visibility_change {
2744	my ($self, $visible) = @_;	3402	my ($self, $visible) = @_;
2745		3403
2746	return unless $visible;	3404	return unless $visible;
2747		3405
2748	$self->{root}->on_post_alloc ("move_$self" => sub {	3406	$self->{root}->on_post_alloc ("move_$self" => sub {
2749	my $widget = $self->{owner}	3407	my $widget = $self->{owner}
2750	or return;	3408	or return;
2751		3409
		3410	if ($widget->{visible}) {
2752	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3411	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753		3412
2754	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3413	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755	if $x + $self->{w} > $::WIDTH;	3414	if $x + $self->{w} > $self->{root}{w};
2756		3415
2757	$self->move_abs ($x, $y);	3416	$self->move_abs ($x, $y);
		3417	} else {
		3418	$self->hide;
		3419	}
2758	});	3420	});
2759	}	3421	}
2760		3422
2761	sub _draw {	3423	sub _draw {
2762	my ($self) = @_;	3424	my ($self) = @_;
…		…
2786	$self->SUPER::_draw;	3448	$self->SUPER::_draw;
2787	}	3449	}
2788		3450
2789	#############################################################################	3451	#############################################################################
2790		3452
2791	package CFClient::UI::Face;	3453	package CFPlus::UI::Face;
2792		3454
2793	our @ISA = CFClient::UI::Base::;	3455	our @ISA = CFPlus::UI::DrawBG::;
2794		3456
2795	use CFClient::OpenGL;	3457	use CFPlus::OpenGL;
2796		3458
2797	sub new {	3459	sub new {
2798	my $class = shift;	3460	my $class = shift;
2799		3461
2800	my $self = $class->SUPER::new (	3462	my $self = $class->SUPER::new (
		3463	size_w => 32,
		3464	size_h => 8,
2801	aspect => 1,	3465	aspect => 1,
2802	can_events => 0,	3466	can_events => 0,
2803	@_,	3467	@_,
2804	);	3468	);
2805		3469
2806	if ($self->{anim} && $self->{animspeed}) {	3470	if ($self->{anim} && $self->{animspeed}) {
2807	Scalar::Util::weaken (my $widget = $self);	3471	CFPlus::weaken (my $widget = $self);
2808		3472
		3473	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3474	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2809	$self->{timer} = Event->timer (	3475	$self->{timer} = Event->timer (
2810	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2811	hard => 1,	3476	parked => 1,
2812	interval => $self->{animspeed},
2813	cb => sub {	3477	cb => sub {
		3478	return unless $::CONN && $widget;
		3479
2814	++$widget->{frame};	3480	++$widget->{frame};
		3481	$widget->update_face;
2815	$widget->update;	3482	$widget->update;
		3483
		3484	$widget->update_timer;
2816	},	3485	},
2817	);	3486	);
		3487
		3488	$self->update_face;
		3489	$self->update_timer;
2818	}	3490	}
2819		3491
2820	$self	3492	$self
2821	}	3493	}
2822		3494
		3495	sub update_timer {
		3496	my ($self) = @_;
		3497
		3498	return unless $self->{timer};
		3499
		3500	if ($self->{visible}) {
		3501	$self->{timer}->at (
		3502	$self->{anim_start}
		3503	+ $self->{animspeed}
		3504	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3505	);
		3506	$self->{timer}->start;
		3507	} else {
		3508	$self->{timer}->stop;
		3509	}
		3510	}
		3511
		3512	sub update_face {
		3513	my ($self) = @_;
		3514
		3515	return unless $::CONN;
		3516
		3517	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3518	if ($anim && @$anim) {
		3519	delete $self->{wait_face};
		3520	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3521	}
		3522	}
		3523	}
		3524
2823	sub size_request {	3525	sub size_request {
2824	(32, 8)	3526	my ($self) = @_;
		3527
		3528	if ($::CONN) {
		3529	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3530	if (my $tex = $::CONN->{texture}[$faceid]) {
		3531	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3532	} else {
		3533	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3534	$self->realloc;
		3535	});
		3536	}
		3537	}
		3538	}
		3539
		3540	($self->{size_w} || 8, $self->{size_h} || 8)
2825	}	3541	}
2826		3542
2827	sub update {	3543	sub update {
2828	my ($self) = @_;	3544	my ($self) = @_;
2829		3545
2830	return unless $self->{visible};	3546	return unless $self->{visible};
2831		3547
2832	$self->SUPER::update;	3548	$self->SUPER::update;
2833	}	3549	}
2834		3550
		3551	sub invoke_visibility_change {
		3552	my ($self) = @_;
		3553
		3554	$self->update_timer;
		3555
		3556	0
		3557	}
		3558
2835	sub _draw {	3559	sub _draw {
2836	my ($self) = @_;	3560	my ($self) = @_;
2837		3561
2838	return unless $::CONN;	3562	return unless $::CONN;
2839		3563
2840	my $face;	3564	$self->SUPER::_draw;
2841		3565
2842	if ($self->{frame}) {
2843	my $anim = $::CONN->{anim}[$self->{anim}];	3566	my $faceid = $::CONN->{faceid}[$self->{face}]
2844		3567	or return;
2845	$face = $anim->[ $self->{frame} % @$anim ]
2846	if $anim && @$anim;
2847	}
2848		3568
2849	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3569	my $tex = $::CONN->{texture}[$faceid];
2850		3570
2851	if ($tex) {	3571	if ($tex) {
2852	glEnable GL_TEXTURE_2D;	3572	glEnable GL_TEXTURE_2D;
2853	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3573	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2854	glColor 0, 0, 0, 1;	3574	glColor 0, 0, 0, 1;
2855	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3575	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2856	glDisable GL_TEXTURE_2D;	3576	glDisable GL_TEXTURE_2D;
2857	}	3577	}
2858	}	3578	}
2859		3579
2860	sub DESTROY {	3580	sub destroy {
2861	my ($self) = @_;	3581	my ($self) = @_;
2862		3582
2863	$self->{timer}->cancel	3583	(delete $self->{timer})->cancel
2864	if $self->{timer};	3584	if $self->{timer};
2865		3585
2866	$self->SUPER::DESTROY;	3586	$self->SUPER::destroy;
2867	}	3587	}
2868		3588
2869	#############################################################################	3589	#############################################################################
2870		3590
2871	package CFClient::UI::Buttonbar;	3591	package CFPlus::UI::Buttonbar;
2872		3592
2873	our @ISA = CFClient::UI::HBox::;	3593	our @ISA = CFPlus::UI::HBox::;
2874		3594
2875	# TODO: should actualyl wrap buttons and other goodies.	3595	# TODO: should actually wrap buttons and other goodies.
2876		3596
2877	#############################################################################	3597	#############################################################################
2878		3598
2879	package CFClient::UI::Menu;	3599	package CFPlus::UI::Menu;
2880		3600
2881	our @ISA = CFClient::UI::FancyFrame::;	3601	our @ISA = CFPlus::UI::Toplevel::;
2882		3602
2883	use CFClient::OpenGL;	3603	use CFPlus::OpenGL;
2884		3604
2885	sub new {	3605	sub new {
2886	my $class = shift;	3606	my $class = shift;
2887		3607
2888	my $self = $class->SUPER::new (	3608	my $self = $class->SUPER::new (
2889	items => [],	3609	items => [],
2890	z => 100,	3610	z => 100,
2891	@_,	3611	@_,
2892	);	3612	);
2893		3613
2894	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3614	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2895		3615
2896	for my $item (@{ $self->{items} }) {	3616	for my $item (@{ $self->{items} }) {
2897	my ($widget, $cb) = @$item;	3617	my ($widget, $cb, $tooltip) = @$item;
2898		3618
2899	# handle various types of items, only text for now	3619	# handle various types of items, only text for now
2900	if (!ref $widget) {	3620	if (!ref $widget) {
		3621	if ($widget =~ /\t/) {
		3622	my ($left, $right) = split /\t/, $widget, 2;
		3623
2901	$widget = new CFClient::UI::Label	3624	$widget = new CFPlus::UI::HBox
2902	can_hover => 1,	3625	can_hover => 1,
2903	can_events => 1,	3626	can_events => 1,
		3627	tooltip => $tooltip,
		3628	children => [
		3629	(new CFPlus::UI::Label markup => $left, expand => 1),
		3630	(new CFPlus::UI::Label markup => $right, align => +1),
		3631	],
		3632	;
		3633
		3634	} else {
		3635	$widget = new CFPlus::UI::Label
		3636	can_hover => 1,
		3637	can_events => 1,
2904	text => $widget;	3638	markup => $widget,
		3639	tooltip => $tooltip;
		3640	}
2905	}	3641	}
2906		3642
2907	$self->{item}{$widget} = $item;	3643	$self->{item}{$widget} = $item;
2908		3644
2909	$self->{vbox}->add ($widget);	3645	$self->{vbox}->add ($widget);
…		…
2914		3650
2915	# popup given the event (must be a mouse button down event currently)	3651	# popup given the event (must be a mouse button down event currently)
2916	sub popup {	3652	sub popup {
2917	my ($self, $ev) = @_;	3653	my ($self, $ev) = @_;
2918		3654
2919	$self->_emit ("popdown");	3655	$self->emit ("popdown");
2920		3656
2921	# maybe save $GRAB? must be careful about events...	3657	# maybe save $GRAB? must be careful about events...
2922	$GRAB = $self;	3658	$GRAB = $self;
2923	$self->{button} = $ev->{button};	3659	$self->{button} = $ev->{button};
2924		3660
2925	$self->show;	3661	$self->show;
2926	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3662	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2927	}	3663	}
2928		3664
2929	sub mouse_motion {	3665	sub invoke_mouse_motion {
2930	my ($self, $ev, $x, $y) = @_;	3666	my ($self, $ev, $x, $y) = @_;
2931		3667
2932	# TODO: should use vbox->find_widget or so	3668	# TODO: should use vbox->find_widget or so
2933	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3669	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2934	$self->{hover} = $self->{item}{$HOVER};	3670	$self->{hover} = $self->{item}{$HOVER};
2935		3671
2936	0	3672	0
2937	}	3673	}
2938		3674
2939	sub button_up {	3675	sub invoke_button_up {
2940	my ($self, $ev, $x, $y) = @_;	3676	my ($self, $ev, $x, $y) = @_;
2941		3677
2942	if ($ev->{button} == $self->{button}) {	3678	if ($ev->{button} == $self->{button}) {
2943	undef $GRAB;	3679	undef $GRAB;
2944	$self->hide;	3680	$self->hide;
2945		3681
2946	$self->_emit ("popdown");	3682	$self->emit ("popdown");
2947	$self->{hover}[1]->() if $self->{hover};	3683	$self->{hover}[1]->() if $self->{hover};
2948	} else {	3684	} else {
2949	return 0	3685	return 0
2950	}	3686	}
2951		3687
2952	1	3688	1
2953	}	3689	}
2954		3690
2955	#############################################################################	3691	#############################################################################
2956		3692
2957	package CFClient::UI::Multiplexer;	3693	package CFPlus::UI::Multiplexer;
2958		3694
2959	our @ISA = CFClient::UI::Container::;	3695	our @ISA = CFPlus::UI::Container::;
2960		3696
2961	sub new {	3697	sub new {
2962	my $class = shift;	3698	my $class = shift;
2963		3699
2964	my $self = $class->SUPER::new (	3700	my $self = $class->SUPER::new (
…		…
2978		3714
2979	$self->{current} = $self->{children}[0]	3715	$self->{current} = $self->{children}[0]
2980	if @{ $self->{children} };	3716	if @{ $self->{children} };
2981	}	3717	}
2982		3718
		3719	sub get_current_page {
		3720	my ($self) = @_;
		3721
		3722	$self->{current}
		3723	}
		3724
2983	sub set_current_page {	3725	sub set_current_page {
2984	my ($self, $page_or_widget) = @_;	3726	my ($self, $page_or_widget) = @_;
2985		3727
2986	my $widget = ref $page_or_widget	3728	my $widget = ref $page_or_widget
2987	? $page_or_widget	3729	? $page_or_widget
2988	: $self->{children}[$page_or_widget];	3730	: $self->{children}[$page_or_widget];
2989		3731
2990	$self->{current} = $widget;	3732	$self->{current} = $widget;
2991	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3733	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992		3734
2993	$self->_emit (page_changed => $self->{current});	3735	$self->emit (page_changed => $self->{current});
2994		3736
2995	$self->realloc;	3737	$self->realloc;
2996	}	3738	}
2997		3739
2998	sub visible_children {	3740	sub visible_children {
…		…
3003	my ($self) = @_;	3745	my ($self) = @_;
3004		3746
3005	$self->{current}->size_request	3747	$self->{current}->size_request
3006	}	3748	}
3007		3749
3008	sub size_allocate {	3750	sub invoke_size_allocate {
3009	my ($self, $w, $h) = @_;	3751	my ($self, $w, $h) = @_;
3010		3752
3011	$self->{current}->configure (0, 0, $w, $h);	3753	$self->{current}->configure (0, 0, $w, $h);
		3754
		3755	1
3012	}	3756	}
3013		3757
3014	sub _draw {	3758	sub _draw {
3015	my ($self) = @_;	3759	my ($self) = @_;
3016		3760
3017	$self->{current}->draw;	3761	$self->{current}->draw;
3018	}	3762	}
3019		3763
3020	#############################################################################	3764	#############################################################################
3021		3765
3022	package CFClient::UI::Notebook;	3766	package CFPlus::UI::Notebook;
3023		3767
3024	our @ISA = CFClient::UI::VBox::;	3768	our @ISA = CFPlus::UI::VBox::;
3025		3769
3026	sub new {	3770	sub new {
3027	my $class = shift;	3771	my $class = shift;
3028		3772
3029	my $self = $class->SUPER::new (	3773	my $self = $class->SUPER::new (
3030	buttonbar => (new CFClient::UI::Buttonbar),	3774	buttonbar => (new CFPlus::UI::Buttonbar),
3031	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3775	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3032	# filter => # will be put between multiplexer and $self	3776	# filter => # will be put between multiplexer and $self
3033	@_,	3777	@_,
3034	);	3778	);
3035		3779
3036	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3780	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3040	}	3784	}
3041		3785
3042	sub add {	3786	sub add {
3043	my ($self, $title, $widget, $tooltip) = @_;	3787	my ($self, $title, $widget, $tooltip) = @_;
3044		3788
3045	Scalar::Util::weaken $self;	3789	CFPlus::weaken $self;
3046		3790
3047	$self->{buttonbar}->add (new CFClient::UI::Button	3791	$self->{buttonbar}->add (new CFPlus::UI::Button
3048	markup => $title,	3792	markup => $title,
3049	tooltip => $tooltip,	3793	tooltip => $tooltip,
3050	on_activate => sub { $self->set_current_page ($widget) },	3794	on_activate => sub { $self->set_current_page ($widget) },
3051	);	3795	);
3052		3796
3053	$self->{multiplexer}->add ($widget);	3797	$self->{multiplexer}->add ($widget);
3054	}	3798	}
3055		3799
		3800	sub get_current_page {
		3801	my ($self) = @_;
		3802
		3803	$self->{multiplexer}->get_current_page
		3804	}
		3805
3056	sub set_current_page {	3806	sub set_current_page {
3057	my ($self, $page) = @_;	3807	my ($self, $page) = @_;
3058		3808
3059	$self->{multiplexer}->set_current_page ($page);	3809	$self->{multiplexer}->set_current_page ($page);
3060	$self->_emit (page_changed => $self->{multiplexer}{current});	3810	$self->emit (page_changed => $self->{multiplexer}{current});
3061	}	3811	}
3062		3812
3063	#############################################################################	3813	#############################################################################
3064		3814
3065	package CFClient::UI::Statusbox;	3815	package CFPlus::UI::Selector;
3066		3816
		3817	use utf8;
		3818
3067	our @ISA = CFClient::UI::VBox::;	3819	our @ISA = CFPlus::UI::Button::;
3068		3820
3069	sub new {	3821	sub new {
3070	my $class = shift;	3822	my $class = shift;
3071		3823
3072	$class->SUPER::new (	3824	my $self = $class->SUPER::new (
		3825	options => [], # [value, title, longdesc], ...
		3826	value => undef,
		3827	@_,
		3828	);
		3829
		3830	$self->_set_value ($self->{value});
		3831
		3832	$self
		3833	}
		3834
		3835	sub invoke_button_down {
		3836	my ($self, $ev) = @_;
		3837
		3838	my @menu_items;
		3839
		3840	for (@{ $self->{options} }) {
		3841	my ($value, $title, $tooltip) = @$_;
		3842
		3843	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3844	}
		3845
		3846	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3847	}
		3848
		3849	sub _set_value {
		3850	my ($self, $value) = @_;
		3851
		3852	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3853	or return;
		3854
		3855	$self->{value} = $item->[0];
		3856	$self->set_markup ("$item->[1] ⇓");
		3857	$self->set_tooltip ($item->[2]);
		3858	}
		3859
		3860	sub set_value {
		3861	my ($self, $value) = @_;
		3862
		3863	return unless $self->{value} ne $value;
		3864
		3865	$self->_set_value ($value);
		3866	$self->emit (changed => $value);
		3867	}
		3868
		3869	#############################################################################
		3870
		3871	package CFPlus::UI::Statusbox;
		3872
		3873	our @ISA = CFPlus::UI::VBox::;
		3874
		3875	sub new {
		3876	my $class = shift;
		3877
		3878	my $self = $class->SUPER::new (
3073	fontsize => 0.8,	3879	fontsize => 0.8,
3074	@_,	3880	@_,
3075	)	3881	);
		3882
		3883	CFPlus::weaken (my $this = $self);
		3884
		3885	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3886
		3887	$self
3076	}	3888	}
3077		3889
3078	sub reorder {	3890	sub reorder {
3079	my ($self) = @_;	3891	my ($self) = @_;
3080	my $NOW = time;	3892	my $NOW = Time::HiRes::time;
		3893
		3894	# freeze display when hovering over any label
		3895	return if $CFPlus::UI::TOOLTIP->{owner}
		3896	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3897	values %{ $self->{item} };
3081		3898
3082	while (my ($k, $v) = each %{ $self->{item} }) {	3899	while (my ($k, $v) = each %{ $self->{item} }) {
3083	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3900	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084	}	3901	}
3085		3902
…		…
3088	my @items = sort {	3905	my @items = sort {
3089	$a->{pri} <=> $b->{pri}	3906	$a->{pri} <=> $b->{pri}
3090	or $b->{id} <=> $a->{id}	3907	or $b->{id} <=> $a->{id}
3091	} values %{ $self->{item} };	3908	} values %{ $self->{item} };
3092		3909
		3910	$self->{timer}->interval (1);
		3911
3093	my $count = 10 + 1;	3912	my $count = 10 + 1;
3094	for my $item (@items) {	3913	for my $item (@items) {
3095	last unless --$count;	3914	last unless --$count;
3096		3915
3097	push @widgets, $item->{label} ||= do {	3916	my $label = $item->{label} ||= do {
3098	# TODO: doesn't handle markup well (read as: at all)	3917	# TODO: doesn't handle markup well (read as: at all)
3099	my $short = $item->{count} > 1	3918	my $short = $item->{count} > 1
3100	? "<b>$item->{count} ×</b> $item->{text}"	3919	? "<b>$item->{count} ×</b> $item->{text}"
3101	: $item->{text};	3920	: $item->{text};
3102		3921
3103	for ($short) {	3922	for ($short) {
3104	s/^\s+//;	3923	s/^\s+//;
3105	s/\s+/ /g;	3924	s/\s+/ /g;
3106	}	3925	}
3107		3926
3108	new CFClient::UI::Label	3927	new CFPlus::UI::Label
3109	markup => $short,	3928	markup => $short,
3110	tooltip => $item->{tooltip},	3929	tooltip => $item->{tooltip},
3111	tooltip_font => $::FONT_PROP,	3930	tooltip_font => $::FONT_PROP,
3112	tooltip_width => 0.67,	3931	tooltip_width => 0.67,
3113	fontsize => $item->{fontsize} || $self->{fontsize},	3932	fontsize => $item->{fontsize} || $self->{fontsize},
3114	max_w => $::WIDTH * 0.44,	3933	max_w => $::WIDTH * 0.44,
3115	fg => $item->{fg},	3934	fg => [@{ $item->{fg} }],
3116	can_events => 1,	3935	can_events => 1,
3117	can_hover => 1	3936	can_hover => 1
3118	};	3937	};
		3938
		3939	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3940	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3941	$label->update;
		3942	$label->set_max_size (undef, $label->{req_h} * $diff)
		3943	if $diff < 1;
		3944	$self->{timer}->interval (1/30);
		3945	} else {
		3946	$label->{fg}[3] = $item->{fg}[3] || 1;
		3947	}
		3948
		3949	push @widgets, $label;
3119	}	3950	}
3120		3951
3121	$self->clear;	3952	$self->clear;
3122	$self->SUPER::add (reverse @widgets);	3953	$self->SUPER::add (reverse @widgets);
3123	}	3954	}
…		…
3128	$text =~ s/^\s+//;	3959	$text =~ s/^\s+//;
3129	$text =~ s/\s+$//;	3960	$text =~ s/\s+$//;
3130		3961
3131	return unless $text;	3962	return unless $text;
3132		3963
3133	my $timeout = time + ((delete $arg{timeout}) || 60);	3964	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134		3965
3135	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3966	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136		3967
3137	if (my $item = $self->{item}{$group}) {	3968	if (my $item = $self->{item}{$group}) {
3138	if ($item->{text} eq $text) {	3969	if ($item->{text} eq $text) {
3139	$item->{count}++;	3970	$item->{count}++;
3140	} else {	3971	} else {
3141	$item->{count} = 1;	3972	$item->{count} = 1;
3142	$item->{text} = $item->{tooltip} = $text;	3973	$item->{text} = $item->{tooltip} = $text;
3143	}	3974	}
3144	$item->{id} = ++$self->{id};	3975	$item->{id} += 0.2;#d#
3145	$item->{timeout} = $timeout;	3976	$item->{timeout} = $timeout;
3146	delete $item->{label};	3977	delete $item->{label};
3147	} else {	3978	} else {
3148	$self->{item}{$group} = {	3979	$self->{item}{$group} = {
3149	id => ++$self->{id},	3980	id => ++$self->{id},
…		…
3155	count => 1,	3986	count => 1,
3156	%arg,	3987	%arg,
3157	};	3988	};
3158	}	3989	}
3159		3990
		3991	$ROOT->on_refresh (reorder => sub {
3160	$self->reorder;	3992	$self->reorder;
		3993	});
3161	}	3994	}
3162		3995
3163	sub reconfigure {	3996	sub reconfigure {
3164	my ($self) = @_;	3997	my ($self) = @_;
3165		3998
…		…
3168		4001
3169	$self->reorder;	4002	$self->reorder;
3170	$self->SUPER::reconfigure;	4003	$self->SUPER::reconfigure;
3171	}	4004	}
3172		4005
		4006	sub destroy {
		4007	my ($self) = @_;
		4008
		4009	$self->{timer}->cancel;
		4010
		4011	$self->SUPER::destroy;
		4012	}
		4013
3173	#############################################################################	4014	#############################################################################
3174		4015
3175	package CFClient::UI::Inventory;
3176
3177	our @ISA = CFClient::UI::ScrolledWindow::;
3178
3179	sub new {
3180	my $class = shift;
3181
3182	my $self = $class->SUPER::new (
3183	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184	@_,
3185	);
3186
3187	$self
3188	}
3189
3190	sub set_items {
3191	my ($self, $items) = @_;
3192
3193	$self->{child}->clear;
3194	return unless $items;
3195
3196	my @items = sort {
3197	($a->{type} <=> $b->{type})
3198	or ($a->{name} cmp $b->{name})
3199	} @$items;
3200
3201	$self->{real_items} = \@items;
3202
3203	my $row = 0;
3204	for my $item (@items) {
3205	CFClient::Item::update_widgets $item;
3206
3207	$self->{child}->add (0, $row, $item->{face_widget});
3208	$self->{child}->add (1, $row, $item->{desc_widget});
3209	$self->{child}->add (2, $row, $item->{weight_widget});
3210
3211	$row++;
3212	}
3213	}
3214
3215	#############################################################################
3216
3217	package CFClient::UI::BindEditor;
3218
3219	our @ISA = CFClient::UI::FancyFrame::;
3220
3221	sub new {
3222	my $class = shift;
3223
3224	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226	$self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230	text => "start recording",
3231	tooltip => "Start/Stops recording of actions."
3232	."All subsequent actions after the recording started will be captured."
3233	."The actions are displayed after the record was stopped."
3234	."To bind the action you have to click on the 'Bind' button",
3235	on_activate => sub {
3236	unless ($self->{recording}) {
3237	$self->start;
3238	} else {
3239	$self->stop;
3240	}
3241	});
3242
3243	$vb->add (new CFClient::UI::Label text => "Actions:");
3244	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3247	$vb->add (my $hb = new CFClient::UI::HBox);
3248	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249	$hb->add (new CFClient::UI::Button
3250	text => "bind",
3251	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252	on_activate => sub {
3253	$self->ask_for_bind;
3254	});
3255
3256	$vb->add (my $hb = new CFClient::UI::HBox);
3257	$hb->add (new CFClient::UI::Button
3258	text => "ok",
3259	expand => 1,
3260	tooltip => "This closes the binding editor and saves the binding",
3261	on_activate => sub {
3262	$self->hide;
3263	$self->commit;
3264	});
3265
3266	$hb->add (new CFClient::UI::Button
3267	text => "cancel",
3268	expand => 1,
3269	tooltip => "This closes the binding editor without saving",
3270	on_activate => sub {
3271	$self->hide;
3272	$self->{binding_cancel}->()
3273	if $self->{binding_cancel};
3274	});
3275
3276	$self->update_binding_widgets;
3277
3278	$self
3279	}
3280
3281	sub commit {
3282	my ($self) = @_;
3283	my ($mod, $sym, $cmds) = $self->get_binding;
3284	if ($sym != 0 && @$cmds > 0) {
3285	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286	."'. Don't forget 'Save Config'!");
3287	$self->{binding_change}->($mod, $sym, $cmds)
3288	if $self->{binding_change};
3289	} else {
3290	$::STATUSBOX->add ("No action bound, no key or action specified!");
3291	$self->{binding_cancel}->()
3292	if $self->{binding_cancel};
3293	}
3294	}
3295
3296	sub start {
3297	my ($self) = @_;
3298
3299	$self->{rec_btn}->set_text ("stop recording");
3300	$self->{recording} = 1;
3301	$self->clear_command_list;
3302	$::CONN->start_record if $::CONN;
3303	}
3304
3305	sub stop {
3306	my ($self) = @_;
3307
3308	$self->{rec_btn}->set_text ("start recording");
3309	$self->{recording} = 0;
3310
3311	my $rec;
3312	$rec = $::CONN->stop_record if $::CONN;
3313	return unless ref $rec eq 'ARRAY';
3314	$self->set_command_list ($rec);
3315	}
3316
3317
3318	sub ask_for_bind_and_commit {
3319	my ($self) = @_;
3320	$self->ask_for_bind (1);
3321	}
3322
3323	sub ask_for_bind {
3324	my ($self, $commit) = @_;
3325
3326	CFClient::Binder::open_binding_dialog (sub {
3327	my ($mod, $sym) = @_;
3328	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329	$self->update_binding_widgets;
3330	$self->commit if $commit;
3331	});
3332	}
3333
3334	# $mod and $sym are the modifiers and key symbol
3335	# $cmds is a array ref of strings (the commands)
3336	# $cb is the callback that is executed on OK
3337	# $ccb is the callback that is executed on CANCEL and
3338	# when the binding was unsuccessful on OK
3339	sub set_binding {
3340	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342	$self->clear_command_list;
3343	$self->{recording} = 0;
3344	$self->{rec_btn}->set_text ("start recording");
3345
3346	$self->{binding} = [$mod, $sym];
3347	$self->{commands} = $cmds;
3348
3349	$self->{binding_change} = $cb;
3350	$self->{binding_cancel} = $ccb;
3351
3352	$self->update_binding_widgets;
3353	}
3354
3355	# this is a shortcut method that asks for a binding
3356	# and then just binds it.
3357	sub do_quick_binding {
3358	my ($self, $cmds) = @_;
3359	$self->set_binding (undef, undef, $cmds, sub {
3360	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361	});
3362	$self->ask_for_bind (1);
3363	}
3364
3365	sub update_binding_widgets {
3366	my ($self) = @_;
3367	my ($mod, $sym, $cmds) = $self->get_binding;
3368	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369	$self->set_command_list ($cmds);
3370	}
3371
3372	sub get_binding {
3373	my ($self) = @_;
3374	return (
3375	$self->{binding}->[0],
3376	$self->{binding}->[1],
3377	[ grep { defined $_ } @{$self->{commands}} ]
3378	);
3379	}
3380
3381	sub clear_command_list {
3382	my ($self) = @_;
3383	$self->{cmdbox}->clear ();
3384	}
3385
3386	sub set_command_list {
3387	my ($self, $cmds) = @_;
3388
3389	$self->{cmdbox}->clear ();
3390	$self->{commands} = $cmds;
3391
3392	my $idx = 0;
3393
3394	for (@$cmds) {
3395	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397	my $i = $idx;
3398	$hb->add (new CFClient::UI::Label text => $_);
3399	$hb->add (new CFClient::UI::Button
3400	text => "delete",
3401	tooltip => "Deletes the action from the record",
3402	on_activate => sub {
3403	$self->{cmdbox}->remove ($hb);
3404	$cmds->[$i] = undef;
3405	});
3406
3407
3408	$idx++
3409	}
3410	}
3411
3412	#############################################################################
3413
3414	package CFClient::UI::SpellList;
3415
3416	our @ISA = CFClient::UI::Table::;
3417
3418	sub new {
3419	my $class = shift;
3420
3421	my $self = $class->SUPER::new (
3422	binding => [],
3423	commands => [],
3424	@_,
3425	)
3426	}
3427
3428	# XXX: Do sorting? Argl...
3429	sub add_spell {
3430	my ($self, $spell) = @_;
3431	$self->{spells}->{$spell->{name}} = $spell;
3432
3433	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434	face => $spell->{face},
3435	can_hover => 1,
3436	can_events => 1,
3437	tooltip => $spell->{message});
3438
3439	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440	text => $spell->{name},
3441	can_hover => 1,
3442	can_events => 1,
3443	tooltip => $spell->{message},
3444	expand => 1);
3445
3446	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449	expand => 1);
3450
3451	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452	text => "bind to key",
3453	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454	}
3455
3456	sub rebuild_spell_list {
3457	my ($self) = @_;
3458	$self->{tbl_idx} = 0;
3459	$self->add_spell ($_) for values %{$self->{spells}};
3460	}
3461
3462	sub remove_spell {
3463	my ($self, $spell) = @_;
3464	delete $self->{spells}->{$spell->{name}};
3465	$self->rebuild_spell_list;
3466	}
3467
3468	#############################################################################
3469
3470	package CFClient::UI::Root;	4016	package CFPlus::UI::Root;
3471		4017
3472	our @ISA = CFClient::UI::Container::;	4018	our @ISA = CFPlus::UI::Container::;
3473		4019
		4020	use List::Util qw(min max);
		4021
3474	use CFClient::OpenGL;	4022	use CFPlus::OpenGL;
3475		4023
3476	sub new {	4024	sub new {
3477	my $class = shift;	4025	my $class = shift;
3478		4026
3479	my $self = $class->SUPER::new (	4027	my $self = $class->SUPER::new (
3480	visible => 1,	4028	visible => 1,
3481	@_,	4029	@_,
3482	);	4030	);
3483		4031
3484	Scalar::Util::weaken ($self->{root} = $self);	4032	CFPlus::weaken ($self->{root} = $self);
3485		4033
3486	$self	4034	$self
3487	}	4035	}
3488		4036
3489	sub size_request {	4037	sub size_request {
…		…
3504	$coord = $max - $size if $coord > $max - $size;	4052	$coord = $max - $size if $coord > $max - $size;
3505		4053
3506	int $coord + 0.5	4054	int $coord + 0.5
3507	}	4055	}
3508		4056
3509	sub size_allocate {	4057	sub invoke_size_allocate {
3510	my ($self, $w, $h) = @_;	4058	my ($self, $w, $h) = @_;
3511		4059
3512	for my $child ($self->children) {	4060	for my $child ($self->children) {
3513	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3514		4062
…		…
3518	$X = _to_pixel $X, $W, $self->{w};	4066	$X = _to_pixel $X, $W, $self->{w};
3519	$Y = _to_pixel $Y, $H, $self->{h};	4067	$Y = _to_pixel $Y, $H, $self->{h};
3520		4068
3521	$child->configure ($X, $Y, $W, $H);	4069	$child->configure ($X, $Y, $W, $H);
3522	}	4070	}
		4071
		4072	1
3523	}	4073	}
3524		4074
3525	sub coord2local {	4075	sub coord2local {
3526	my ($self, $x, $y) = @_;	4076	my ($self, $x, $y) = @_;
3527		4077
…		…
3612		4162
3613	delete $queue{$widget+0};	4163	delete $queue{$widget+0};
3614		4164
3615	my ($w, $h) = $widget->size_request;	4165	my ($w, $h) = $widget->size_request;
3616		4166
3617	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4167	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4168	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4169
		4170	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4171	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619		4172
3620	$w = $widget->{force_w} if exists $widget->{force_w};	4173	$w = $widget->{force_w} if exists $widget->{force_w};
3621	$h = $widget->{force_h} if exists $widget->{force_h};	4174	$h = $widget->{force_h} if exists $widget->{force_h};
3622		4175
3623	if ($widget->{req_w} != $w || $widget->{req_h} != $h	4176	if ($widget->{req_w} != $w || $widget->{req_h} != $h
…		…
3650	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4203	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3651		4204
3652	$w = 0 if $w < 0;	4205	$w = 0 if $w < 0;
3653	$h = 0 if $h < 0;	4206	$h = 0 if $h < 0;
3654		4207
		4208	$w = max $widget->{min_w}, $w;
		4209	$h = max $widget->{min_h}, $h;
		4210
		4211	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4212	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4213
		4214	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4215	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4216
3655	$w = int $w + 0.5;	4217	$w = int $w + 0.5;
3656	$h = int $h + 0.5;	4218	$h = int $h + 0.5;
3657		4219
3658	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4220	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3659	$widget->{old_w} = $widget->{w};	4221	$widget->{old_w} = $widget->{w};
…		…
3669		4231
3670	while ($self->{post_alloc_hook}) {	4232	while ($self->{post_alloc_hook}) {
3671	$_->()	4233	$_->()
3672	for values %{delete $self->{post_alloc_hook}};	4234	for values %{delete $self->{post_alloc_hook}};
3673	}	4235	}
3674
3675		4236
3676	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4237	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3677	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4238	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3678	glClear GL_COLOR_BUFFER_BIT;	4239	glClear GL_COLOR_BUFFER_BIT;
3679		4240
…		…
3682	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4243	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3683	glMatrixMode GL_MODELVIEW;	4244	glMatrixMode GL_MODELVIEW;
3684	glLoadIdentity;	4245	glLoadIdentity;
3685		4246
3686	{	4247	{
3687	package CFClient::UI::Base;	4248	package CFPlus::UI::Base;
3688		4249
3689	($draw_x, $draw_y, $draw_w, $draw_h) =	4250	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3690	(0, 0, $self->{w}, $self->{h});	4251	(0, 0, $self->{w}, $self->{h});
3691	}
3692		4252
3693	$self->_draw;	4253	$self->_draw;
		4254	}
3694	}	4255	}
3695		4256
3696	#############################################################################	4257	#############################################################################
3697		4258
3698	package CFClient::UI;	4259	package CFPlus::UI;
3699		4260
3700	$ROOT = new CFClient::UI::Root;	4261	$ROOT = new CFPlus::UI::Root;
3701	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4262	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3702		4263
3703	1	4264	1
3704		4265

Diff Legend

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