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.278 by root, Sun Jun 4 23:05:06 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	glEnable GL_BLEND;
861	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
863		935
864	$tex->draw_quad (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
865		937
866	glDisable GL_BLEND;
867	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
868	}	939	}
869		940
870	#############################################################################	941	#############################################################################
871		942
872	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
873		944
		945	use List::Util qw(min max);
		946
874	our @ISA = CFClient::UI::Window::;	947	our @ISA = CFPlus::UI::Window::;
875		948
876	sub new {	949	sub new {
877	my $class = shift;	950	my $class = shift;
878		951
879	$class->SUPER::new (	952	$class->SUPER::new (
…		…
886	sub size_request {	959	sub size_request {
887	my ($self) = @_;	960	my ($self) = @_;
888		961
889	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	962	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
890		963
891	$w = 10 if $self->{scroll_x};	964	$w = 1 if $self->{scroll_x};
892	$h = 10 if $self->{scroll_y};	965	$h = 1 if $self->{scroll_y};
893		966
894	($w, $h)	967	($w, $h)
895	}	968	}
896		969
897	sub size_allocate {	970	sub invoke_size_allocate {
898	my ($self, $w, $h) = @_;	971	my ($self, $w, $h) = @_;
899		972
900	my $child = $self->child;	973	my $child = $self->child;
901		974
902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	975	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	976	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904		977
905	$self->child->configure (0, 0, $w, $h);	978	$self->child->configure (0, 0, $w, $h);
906	$self->update;	979	$self->update;
		980
		981	1
907	}	982	}
908		983
909	sub set_offset {	984	sub set_offset {
910	my ($self, $x, $y) = @_;	985	my ($self, $x, $y) = @_;
911		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}) {
912	$self->{view_x} = int $x;	991	$self->{view_x} = $x;
913	$self->{view_y} = int $y;	992	$self->{view_y} = $y;
914		993
		994	$self->emit (changed => $x, $y);
915	$self->update;	995	$self->update;
		996	}
916	}	997	}
917		998
918	# 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
919	sub coord2local {	1000	sub coord2local {
920	my ($self, $x, $y) = @_;	1001	my ($self, $x, $y) = @_;
…		…
935	my ($self, $x, $y) = @_;	1016	my ($self, $x, $y) = @_;
936		1017
937	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1018	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1019	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
939	) {	1020	) {
940	$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})
941	} else {	1022	} else {
942	$self->CFClient::UI::Base::find_widget ($x, $y)	1023	$self->CFPlus::UI::Base::find_widget ($x, $y)
943	}	1024	}
944	}	1025	}
945		1026
946	sub _render {	1027	sub _render {
947	my ($self) = @_;	1028	my ($self) = @_;
948		1029
949	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};
950	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};
951		1032
952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1033	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953		1034
954	$self->SUPER::_render;	1035	$self->SUPER::_render;
955	}	1036	}
956		1037
957	#############################################################################	1038	#############################################################################
958		1039
959	package CFClient::UI::ScrolledWindow;	1040	package CFPlus::UI::ScrolledWindow;
960		1041
961	our @ISA = CFClient::UI::HBox::;	1042	our @ISA = CFPlus::UI::Table::;
962		1043
963	sub new {	1044	sub new {
964	my ($class, %arg) = @_;	1045	my ($class, %arg) = @_;
965		1046
966	my $child = delete $arg{child};	1047	my $child = delete $arg{child};
967		1048
968	my $self;	1049	my $self;
969		1050
970	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,
971	vertical => 1,	1065	vertical => 1,
972	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
973	on_changed => sub {	1067	on_changed => sub {
974	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975	},	1070	},
976	;	1071	;
977		1072
978	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
979	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
		1076	can_events => 1,
980	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
981	%arg,	1081	%arg,
982	);	1082	);
983		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
984	$self->SUPER::add ($self->{vp}, $self->{slider});	1100	$self->SUPER::add ($self->{vp});
		1101
985	$self->add ($child) if $child;	1102	$self->add ($child) if $child;
986		1103
987	$self	1104	$self
988	}	1105	}
989		1106
…		…
991	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
992		1109
993	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
994	}	1111	}
995		1112
996	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 {
997	my ($self) = @_;	1140	my ($self, $ev) = @_;
998		1141
999	$self->SUPER::update;	1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
1000		1144
1001	# todo: overwrite size_allocate of child	1145	$self->{hslider}->emit (mouse_wheel => $ev)
1002	my $child = $self->{vp}->child;	1146	if $ev->{dx};
1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004	}
1005		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
1006	sub size_allocate {	1194	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1008		1196
		1197	$self->update_slider;
1009	$self->SUPER::size_allocate ($w, $h);	1198	$self->SUPER::invoke_size_allocate ($w, $h)
1010
1011	my $child = $self->{vp}->child;
1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013	}	1199	}
1014
1015	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll
1017		1200
1018	#############################################################################	1201	#############################################################################
1019		1202
1020	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
1021		1204
1022	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
1023		1206
1024	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
1025		1208
1026	sub new {	1209	sub new {
1027	my $class = shift;	1210	my $class = shift;
1028		1211
1029	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
1055	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
1056	}	1239	}
1057		1240
1058	#############################################################################	1241	#############################################################################
1059		1242
1060	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
1061		1244
1062	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
1063		1246
1064	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
1065
1066	my $bg =
1067	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068	mipmap => 1, wrap => 1;
1069
1070	my @border =
1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073		1248
1074	sub new {	1249	sub new {
1075	my ($class, %arg) = @_;	1250	my ($class, %arg) = @_;
1076		1251
1077	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) = @_;
1078		1363
1079	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1365	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1366	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1367	border => 0.6,
1083	can_events => 1,	1368	can_events => 1,
1084	min_w => 16,	1369	min_w => 64,
1085	min_h => 16,	1370	min_h => 32,
1086	%arg,	1371	%arg,
1087	);	1372	);
1088		1373
1089	$self->{title} = new CFClient::UI::Label	1374	$self->{title_widget} = new CFPlus::UI::Label
1090	align => 0,	1375	align => 0,
1091	valign => 1,	1376	valign => 1,
1092	text => $title,	1377	text => $self->{title},
1093	fontsize => $self->{border}	1378	fontsize => $self->{border},
1094	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	}
1095		1389
1096	$self	1390	$self
1097	}	1391	}
1098		1392
1099	sub add {	1393	sub add {
1100	my ($self, @widgets) = @_;	1394	my ($self, @widgets) = @_;
1101		1395
1102	$self->SUPER::add (@widgets);	1396	$self->SUPER::add (@widgets);
		1397	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1399	}
1105		1400
1106	sub border {	1401	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1402	int $_[0]{border} * $::FONTSIZE
1108	}	1403	}
1109		1404
1110	sub size_request {	1405	sub size_request {
1111	my ($self) = @_;	1406	my ($self) = @_;
1112		1407
1113	$self->{title}->size_request	1408	$self->{title_widget}->size_request
1114	if $self->{title};	1409	if $self->{title_widget};
		1410
		1411	$self->{close_button}->size_request
		1412	if $self->{close_button};
1115		1413
1116	my ($w, $h) = $self->SUPER::size_request;	1414	my ($w, $h) = $self->SUPER::size_request;
1117		1415
1118	(	1416	(
1119	$w + $self->border * 2,	1417	$w + $self->border * 2,
1120	$h + $self->border * 2,	1418	$h + $self->border * 2,
1121	)	1419	)
1122	}	1420	}
1123		1421
1124	sub size_allocate {	1422	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1423	my ($self, $w, $h) = @_;
1126		1424
1127	if ($self->{title}) {	1425	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1426	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1427	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1428	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1429	}
1132		1430
1133	my $border = $self->border;	1431	my $border = $self->border;
1134		1432
1135	$h -= List::Util::max 0, $border * 2;	1433	$h -= List::Util::max 0, $border * 2;
1136	$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;
1137		1448
1138	$self->child->configure ($border, $border, $w, $h);	1449	1
1139	}	1450	}
1140		1451
1141	sub button_down {	1452	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1453	my ($self, $ev, $x, $y) = @_;
1143		1454
1144	my ($w, $h) = @$self{qw(w h)};	1455	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1456	my $border = $self->border;
1146		1457
…		…
1177		1488
1178	($x, $y) = ($ev->{x}, $ev->{y});	1489	($x, $y) = ($ev->{x}, $ev->{y});
1179		1490
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1491	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1492	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1493	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1494	};
1184	} else {	1495	} else {
1185	return 0;	1496	return 0;
1186	}	1497	}
1187		1498
1188	1	1499	1
1189	}	1500	}
1190		1501
1191	sub button_up {	1502	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1503	my ($self, $ev, $x, $y) = @_;
1193		1504
1194	!!delete $self->{motion}	1505	! ! delete $self->{motion}
1195	}	1506	}
1196		1507
1197	sub mouse_motion {	1508	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1509	my ($self, $ev, $x, $y) = @_;
1199		1510
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1512
1202	!!$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
1203	}	1522	}
1204		1523
1205	sub _draw {	1524	sub _draw {
1206	my ($self) = @_;	1525	my ($self) = @_;
1207		1526
…		…
1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1215		1534
1216	my $border = $self->border;	1535	my $border = $self->border;
1217		1536
1218	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1219	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1220	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1221	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1222	$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);
1223		1556
1224	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1226		1559
1227	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1233		1566
1234	glDisable GL_TEXTURE_2D;	1567	glDisable GL_TEXTURE_2D;
1235		1568
1236	$child->draw;	1569	$child->draw;
1237		1570
1238	if ($self->{title}) {	1571	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1572	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1573	$self->{title_widget}->_draw;
		1574
		1575	glTranslate 0, - ($border - $self->{h});
1241	}	1576	}
		1577
		1578	$self->{close_button}->draw
		1579	if $self->{close_button};
1242	}	1580	}
1243		1581
1244	#############################################################################	1582	#############################################################################
1245		1583
1246	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1247		1585
1248	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Container::;
1249		1587
1250	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1251		1589
1252	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1253		1591
1254	sub new {	1592	sub new {
1255	my $class = shift;	1593	my $class = shift;
1256		1594
1257	$class->SUPER::new (	1595	$class->SUPER::new (
1258	col_expand => [],	1596	col_expand => [],
		1597	row_expand => [],
1259	@_,	1598	@_,
1260	)	1599	)
1261	}	1600	}
1262		1601
1263	sub children {
1264	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265	}
1266
1267	sub add {	1602	sub add {
1268	my ($self, $x, $y, $child) = @_;
1269
1270	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;
1272
1273	$self->realloc;
1274	}
1275
1276	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {
1278	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);
1279		1634
1280	my @children = $self->children;	1635	my @children = $self->children;
1281	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	}
1282		1646	}
1283	for (@children) {
1284	delete $_->{parent};
1285	$_->hide;
1286	}
1287		1647
1288	$self->realloc;	1648	# second pass, rows
1289	}	1649	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1290
1291	sub get_wh {
1292	my ($self) = @_;
1293
1294	my (@w, @h);
1295
1296	for my $y (0 .. $#{$self->{children}}) {
1297	my $row = $self->{children}[$y]
1298	or next;
1299
1300	for my $x (0 .. $#$row) {
1301	my $widget = $row->[$x]
1302	or next;
1303	my ($w, $h) = @$widget{qw(req_w req_h)};	1650	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1304		1651
1305	$w[$x] = max $w[$x], $w;	1652	my $sh = sum @h[$r .. $r + $rs - 1];
1306	$h[$y] = max $h[$y], $h;	1653
		1654	if ($h > $sh) {
		1655	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1307	}	1656	}
1308	}	1657	}
1309		1658
1310	(\@w, \@h)	1659	(\@w, \@h)
1311	}	1660	}
…		…
1319	(sum @$ws),	1668	(sum @$ws),
1320	(sum @$hs),	1669	(sum @$hs),
1321	)	1670	)
1322	}	1671	}
1323		1672
1324	sub size_allocate {	1673	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1674	my ($self, $w, $h) = @_;
1326		1675
1327	my ($ws, $hs) = $self->get_wh;	1676	my ($ws, $hs) = $self->get_wh;
1328		1677
1329	my $req_w = (sum @$ws) || 1;	1678	my $req_w = (sum @$ws) || 1;
1330	my $req_h = (sum @$hs) || 1;	1679	my $req_h = (sum @$hs) || 1;
1331		1680
1332	# TODO: nicer code && do row_expand	1681	# now linearly scale the rows/columns to the allocated size
1333	my @col_expand = @{$self->{col_expand}};	1682	my @col_expand = @{$self->{col_expand}};
1334	@col_expand = (1) x @$ws unless @col_expand;	1683	@col_expand = (1) x @$ws unless @col_expand;
1335	my $col_expand = (sum @col_expand) || 1;	1684	my $col_expand = (sum @col_expand) || 1;
1336		1685
1337	# linearly scale sizes
1338	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1686	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340		1687
1341	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
1342	CFClient::UI::harmonize $hs;	1696	CFPlus::UI::harmonize $hs;
1343		1697
1344	my $y;	1698	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1699	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1345		1700
1346	for my $r (0 .. $#{$self->{children}}) {	1701	for my $widget ($self->children) {
1347	my $row = $self->{children}[$r]	1702	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1348	or next;
1349		1703
1350	my $x = 0;	1704	$widget->configure (
1351	my $row_h = $hs->[$r];	1705	$x[$c], $y[$r],
		1706	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1352		1707	);
1353	for my $c (0 .. $#$row) {	1708	}
1354	my $col_w = $ws->[$c];
1355		1709
1356	if (my $widget = $row->[$c]) {	1710	1
1357	$widget->configure ($x, $y, $col_w, $row_h);	1711	}
1358	}
1359		1712
1360	$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;
1361	}	1751	}
1362
1363	$y += $row_h;
1364	}	1752	}
1365		1753
1366	}	1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
1367		1756
1368	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 {
1369	my ($self, $x, $y) = @_;	1779	my ($self, $W, $H) = @_;
1370		1780
1371	$x -= $self->{x};	1781	for my $child ($self->visible_children) {
1372	$y -= $self->{y};	1782	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1373		1783
1374	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};
1375		1788
1376	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {	1789	$child->configure ($x, $y, $w, $h);
1377	$res = $_->find_widget ($x, $y)	1790	}
1378	and return $res;	1791
1379	}	1792	1
1380
1381	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1382	}
1383
1384	sub _draw {
1385	my ($self) = @_;
1386
1387	for (grep $_, @{$self->{children}}) {
1388	$_->draw for grep $_, @$_;
1389	}
1390	}	1793	}
1391		1794
1392	#############################################################################	1795	#############################################################################
1393		1796
1394	package CFClient::UI::Box;	1797	package CFPlus::UI::Box;
1395		1798
1396	our @ISA = CFClient::UI::Container::;	1799	our @ISA = CFPlus::UI::Container::;
1397		1800
1398	sub size_request {	1801	sub size_request {
1399	my ($self) = @_;	1802	my ($self) = @_;
1400		1803
1401	$self->{vertical}	1804	$self->{vertical}
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1810	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1811	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1812	)
1410	}	1813	}
1411		1814
1412	sub size_allocate {	1815	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1816	my ($self, $w, $h) = @_;
1414		1817
1415	my $space = $self->{vertical} ? $h : $w;	1818	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1819	my @children = $self->visible_children;
1417		1820
1418	my @req;	1821	my @req;
1419		1822
1420	if ($self->{homogeneous}) {	1823	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1824	@req = ($space / (@children || 1)) x @children;
1422	} else {	1825	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1826	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1827	my $req = List::Util::sum @req;
1425		1828
1426	if ($req > $space) {	1829	if ($req > $space) {
1427	# ah well, not enough space	1830	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1831	$_ *= $space / $req for @req;
1429	} else {	1832	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1833	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1834
1432	$space = ($space - $req) / $expand; # remaining space to give away	1835	$space = ($space - $req) / $expand; # remaining space to give away
1433		1836
1434	$req[$_] += $space * $children->[$_]{expand}	1837	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1838	for 0 .. $#children;
1436	}	1839	}
1437	}	1840	}
1438		1841
1439	CFClient::UI::harmonize \@req;	1842	CFPlus::UI::harmonize \@req;
1440		1843
1441	my $pos = 0;	1844	my $pos = 0;
1442	for (0 .. $#$children) {	1845	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1846	my $alloc = $req[$_];
1444	$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));
1445		1848
1446	$pos += $alloc;	1849	$pos += $alloc;
1447	}	1850	}
1448		1851
1449	1	1852	1
1450	}	1853	}
1451		1854
1452	#############################################################################	1855	#############################################################################
1453		1856
1454	package CFClient::UI::HBox;	1857	package CFPlus::UI::HBox;
1455		1858
1456	our @ISA = CFClient::UI::Box::;	1859	our @ISA = CFPlus::UI::Box::;
1457		1860
1458	sub new {	1861	sub new {
1459	my $class = shift;	1862	my $class = shift;
1460		1863
1461	$class->SUPER::new (	1864	$class->SUPER::new (
…		…
1464	)	1867	)
1465	}	1868	}
1466		1869
1467	#############################################################################	1870	#############################################################################
1468		1871
1469	package CFClient::UI::VBox;	1872	package CFPlus::UI::VBox;
1470		1873
1471	our @ISA = CFClient::UI::Box::;	1874	our @ISA = CFPlus::UI::Box::;
1472		1875
1473	sub new {	1876	sub new {
1474	my $class = shift;	1877	my $class = shift;
1475		1878
1476	$class->SUPER::new (	1879	$class->SUPER::new (
…		…
1479	)	1882	)
1480	}	1883	}
1481		1884
1482	#############################################################################	1885	#############################################################################
1483		1886
1484	package CFClient::UI::Label;	1887	package CFPlus::UI::Label;
1485		1888
1486	our @ISA = CFClient::UI::DrawBG::;	1889	our @ISA = CFPlus::UI::DrawBG::;
1487		1890
1488	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1489		1892
1490	sub new {	1893	sub new {
1491	my ($class, %arg) = @_;	1894	my ($class, %arg) = @_;
1492		1895
1493	my $self = $class->SUPER::new (	1896	my $self = $class->SUPER::new (
…		…
1496	#active_bg => none	1899	#active_bg => none
1497	#font => default_font	1900	#font => default_font
1498	#text => initial text	1901	#text => initial text
1499	#markup => initial narkup	1902	#markup => initial narkup
1500	#max_w => maximum pixel width	1903	#max_w => maximum pixel width
		1904	#style => 0, # render flags
1501	ellipsise => 3, # end	1905	ellipsise => 3, # end
1502	layout => (new CFClient::Layout),	1906	layout => (new CFPlus::Layout),
1503	fontsize => 1,	1907	fontsize => 1,
1504	align => -1,	1908	align => -1,
1505	valign => -1,	1909	valign => -1,
1506	padding_x => 2,	1910	padding_x => 2,
1507	padding_y => 2,	1911	padding_y => 2,
1508	can_events => 0,	1912	can_events => 0,
1509	%arg	1913	%arg
1510	);	1914	);
1511		1915
1512	if (exists $self->{template}) {	1916	if (exists $self->{template}) {
1513	my $layout = new CFClient::Layout;	1917	my $layout = new CFPlus::Layout;
1514	$layout->set_text (delete $self->{template});	1918	$layout->set_text (delete $self->{template});
1515	$self->{template} = $layout;	1919	$self->{template} = $layout;
1516	}	1920	}
1517		1921
1518	if (exists $self->{markup}) {	1922	if (exists $self->{markup}) {
…		…
1522	}	1926	}
1523		1927
1524	$self	1928	$self
1525	}	1929	}
1526		1930
1527	sub escape($) {
1528	local $_ = $_[0];
1529
1530	s/&/&amp;/g;
1531	s/>/&gt;/g;
1532	s/</&lt;/g;
1533
1534	$_
1535	}
1536
1537	sub update {	1931	sub update {
1538	my ($self) = @_;	1932	my ($self) = @_;
1539		1933
1540	delete $self->{texture};	1934	delete $self->{texture};
1541	$self->SUPER::update;	1935	$self->SUPER::update;
1542	}	1936	}
1543		1937
		1938	sub realloc {
		1939	my ($self) = @_;
		1940
		1941	delete $self->{ox};
		1942	$self->SUPER::realloc;
		1943	}
		1944
1544	sub set_text {	1945	sub set_text {
1545	my ($self, $text) = @_;	1946	my ($self, $text) = @_;
1546		1947
1547	return if $self->{text} eq "T$text";	1948	return if $self->{text} eq "T$text";
1548	$self->{text} = "T$text";	1949	$self->{text} = "T$text";
1549		1950
1550	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551	$self->{layout}->set_text ($text);	1951	$self->{layout}->set_text ($text);
1552		1952
		1953	delete $self->{size_req};
1553	$self->realloc;	1954	$self->realloc;
1554	$self->update;	1955	$self->update;
1555	}	1956	}
1556		1957
1557	sub set_markup {	1958	sub set_markup {
…		…
1560	return if $self->{text} eq "M$markup";	1961	return if $self->{text} eq "M$markup";
1561	$self->{text} = "M$markup";	1962	$self->{text} = "M$markup";
1562		1963
1563	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1964	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564		1965
1565	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566	$self->{layout}->set_markup ($markup);	1966	$self->{layout}->set_markup ($markup);
1567		1967
		1968	delete $self->{size_req};
1568	$self->realloc;	1969	$self->realloc;
1569	$self->update;	1970	$self->update;
1570	}	1971	}
1571		1972
1572	sub size_request {	1973	sub size_request {
1573	my ($self) = @_;	1974	my ($self) = @_;
1574		1975
		1976	$self->{size_req} ||= do {
1575	$self->{layout}->set_font ($self->{font}) if $self->{font};	1977	$self->{layout}->set_font ($self->{font}) if $self->{font};
1576	$self->{layout}->set_width ($self->{max_w} || -1);	1978	$self->{layout}->set_width ($self->{max_w} || -1);
1577	$self->{layout}->set_ellipsise ($self->{ellipsise});	1979	$self->{layout}->set_ellipsise ($self->{ellipsise});
1578	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1980	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1981	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580		1982
1581	my ($w, $h) = $self->{layout}->size;	1983	my ($w, $h) = $self->{layout}->size;
1582		1984
1583	if (exists $self->{template}) {	1985	if (exists $self->{template}) {
1584	$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);
1585	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1988	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586		1989
1587	my ($w2, $h2) = $self->{template}->size;	1990	my ($w2, $h2) = $self->{template}->size;
1588		1991
1589	$w = List::Util::max $w, $w2;	1992	$w = List::Util::max $w, $w2;
1590	$h = List::Util::max $h, $h2;	1993	$h = List::Util::max $h, $h2;
		1994	}
		1995
		1996	[$w, $h]
1591	}	1997	};
1592		1998
1593	($w, $h)	1999	@{ $self->{size_req} }
1594	}	2000	}
1595		2001
		2002	sub baseline_shift {
		2003	$_[0]{layout}->descent
		2004	}
		2005
1596	sub size_allocate {	2006	sub invoke_size_allocate {
1597	my ($self, $w, $h) = @_;	2007	my ($self, $w, $h) = @_;
1598		2008
1599	delete $self->{ox};	2009	delete $self->{ox};
1600		2010
1601	delete $self->{texture}	2011	delete $self->{texture}
1602	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
1603	}	2015	}
1604		2016
1605	sub set_fontsize {	2017	sub set_fontsize {
1606	my ($self, $fontsize) = @_;	2018	my ($self, $fontsize) = @_;
1607		2019
1608	$self->{fontsize} = $fontsize;	2020	$self->{fontsize} = $fontsize;
		2021	delete $self->{size_req};
1609	delete $self->{texture};	2022	delete $self->{texture};
1610		2023
1611	$self->realloc;	2024	$self->realloc;
1612	}	2025	}
1613		2026
		2027	sub reconfigure {
		2028	my ($self) = @_;
		2029
		2030	delete $self->{size_req};
		2031	delete $self->{texture};
		2032
		2033	$self->SUPER::reconfigure;
		2034	}
		2035
1614	sub _draw {	2036	sub _draw {
1615	my ($self) = @_;	2037	my ($self) = @_;
1616		2038
1617	$self->SUPER::_draw; # draw background, if applicable	2039	$self->SUPER::_draw; # draw background, if applicable
1618		2040
1619	my $tex = $self->{texture} ||= do {	2041	my $size = $self->{texture} ||= do {
1620	$self->{layout}->set_foreground (@{$self->{fg}});	2042	$self->{layout}->set_foreground (@{$self->{fg}});
1621	$self->{layout}->set_font ($self->{font}) if $self->{font};	2043	$self->{layout}->set_font ($self->{font}) if $self->{font};
1622	$self->{layout}->set_width ($self->{w});	2044	$self->{layout}->set_width ($self->{w});
1623	$self->{layout}->set_ellipsise ($self->{ellipsise});	2045	$self->{layout}->set_ellipsise ($self->{ellipsise});
1624	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2046	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1625	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2047	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1626		2048
1627	new_from_layout CFClient::Texture $self->{layout}	2049	[$self->{layout}->size]
1628	};	2050	};
1629		2051
1630	unless (exists $self->{ox}) {	2052	unless (exists $self->{ox}) {
1631	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2053	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1632	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2054	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1633	: ($self->{w} - $tex->{w}) * 0.5);	2055	: ($self->{w} - $size->[0]) * 0.5);
1634		2056
1635	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2057	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1636	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2058	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1637	: ($self->{h} - $tex->{h}) * 0.5);	2059	: ($self->{h} - $size->[1]) * 0.5);
1638	};	2060	};
1639		2061
1640	glEnable GL_TEXTURE_2D;	2062	my $w = List::Util::min $self->{w} + 4, $size->[0];
1641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2063	my $h = List::Util::min $self->{h} + 2, $size->[1];
1642		2064
1643	if ($tex->{format} == GL_ALPHA) {	2065	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1644	glColor @{$self->{fg}};
1645	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1646	} else {
1647	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1648	}
1649
1650	glDisable GL_TEXTURE_2D;
1651	}	2066	}
1652		2067
1653	#############################################################################	2068	#############################################################################
1654		2069
1655	package CFClient::UI::EntryBase;	2070	package CFPlus::UI::EntryBase;
1656		2071
1657	our @ISA = CFClient::UI::Label::;	2072	our @ISA = CFPlus::UI::Label::;
1658		2073
1659	use CFClient::OpenGL;	2074	use CFPlus::OpenGL;
1660		2075
1661	sub new {	2076	sub new {
1662	my $class = shift;	2077	my $class = shift;
1663		2078
1664	$class->SUPER::new (	2079	$class->SUPER::new (
…		…
1668	active_fg => [0, 0, 0],	2083	active_fg => [0, 0, 0],
1669	can_hover => 1,	2084	can_hover => 1,
1670	can_focus => 1,	2085	can_focus => 1,
1671	valign => 0,	2086	valign => 0,
1672	can_events => 1,	2087	can_events => 1,
		2088	ellipsise => 0,
1673	#text => ...	2089	#text => ...
		2090	#hidden => "*",
1674	@_	2091	@_
1675	)	2092	)
1676	}	2093	}
1677		2094
1678	sub _set_text {	2095	sub _set_text {
…		…
1685	$self->{last_activity} = $::NOW;	2102	$self->{last_activity} = $::NOW;
1686	$self->{text} = $text;	2103	$self->{text} = $text;
1687		2104
1688	$text =~ s/./*/g if $self->{hidden};	2105	$text =~ s/./*/g if $self->{hidden};
1689	$self->{layout}->set_text ("$text ");	2106	$self->{layout}->set_text ("$text ");
		2107	delete $self->{size_req};
1690		2108
1691	$self->_emit (changed => $self->{text});	2109	$self->emit (changed => $self->{text});
		2110
		2111	$self->realloc;
1692	$self->update;	2112	$self->update;
1693	}	2113	}
1694		2114
1695	sub set_text {	2115	sub set_text {
1696	my ($self, $text) = @_;	2116	my ($self, $text) = @_;
1697		2117
1698	$self->{cursor} = length $text;	2118	$self->{cursor} = length $text;
1699	$self->_set_text ($text);	2119	$self->_set_text ($text);
1700
1701	$self->realloc;
1702	}	2120	}
1703		2121
1704	sub get_text {	2122	sub get_text {
1705	$_[0]{text}	2123	$_[0]{text}
1706	}	2124	}
…		…
1711	my ($w, $h) = $self->SUPER::size_request;	2129	my ($w, $h) = $self->SUPER::size_request;
1712		2130
1713	($w + 1, $h) # add 1 for cursor	2131	($w + 1, $h) # add 1 for cursor
1714	}	2132	}
1715		2133
1716	sub key_down {	2134	sub invoke_key_down {
1717	my ($self, $ev) = @_;	2135	my ($self, $ev) = @_;
1718		2136
1719	my $mod = $ev->{mod};	2137	my $mod = $ev->{mod};
1720	my $sym = $ev->{sym};	2138	my $sym = $ev->{sym};
1721	my $uni = $ev->{unicode};	2139	my $uni = $ev->{unicode};
1722		2140
1723	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;
1724		2144
1725	if ($uni == 8) {	2145	if ($uni == 8) {
1726	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2146	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1727	} elsif ($uni == 127) {	2147	} elsif ($uni == 127) {
1728	substr $text, $self->{cursor}, 1, "";	2148	substr $text, $self->{cursor}, 1, "";
1729	} elsif ($sym == CFClient::SDLK_LEFT) {	2149	} elsif ($sym == CFPlus::SDLK_LEFT) {
1730	--$self->{cursor} if $self->{cursor};	2150	--$self->{cursor} if $self->{cursor};
1731	} elsif ($sym == CFClient::SDLK_RIGHT) {	2151	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1732	++$self->{cursor} if $self->{cursor} < length $self->{text};	2152	++$self->{cursor} if $self->{cursor} < length $self->{text};
1733	} 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 = "";
1734	$self->{cursor} = 0;	2167	$self->{cursor} = 0;
1735	} elsif ($sym == CFClient::SDLK_END) {
1736	$self->{cursor} = length $text;
1737	} elsif ($uni == 27) {	2168	} elsif ($uni == 27) {
1738	$self->_emit ('escape');	2169	$self->emit ('escape');
1739	} elsif ($uni) {	2170	} elsif ($uni == 0x0d) {
		2171	substr $text, $self->{cursor}++, 0, "\012";
		2172	} elsif ($uni >= 0x20) {
1740	substr $text, $self->{cursor}++, 0, chr $uni;	2173	substr $text, $self->{cursor}++, 0, chr $uni;
1741	} else {	2174	} else {
1742	return 0;	2175	return 0;
1743	}	2176	}
1744		2177
1745	$self->_set_text ($text);	2178	$self->_set_text ($text);
1746		2179
1747	$self->realloc;	2180	$self->realloc;
		2181	$self->update;
1748		2182
1749	1	2183	1
1750	}	2184	}
1751		2185
1752	sub focus_in {	2186	sub invoke_focus_in {
1753	my ($self) = @_;	2187	my ($self) = @_;
1754		2188
1755	$self->{last_activity} = $::NOW;	2189	$self->{last_activity} = $::NOW;
1756		2190
1757	$self->SUPER::focus_in;	2191	$self->SUPER::invoke_focus_in
1758	}	2192	}
1759		2193
1760	sub button_down {	2194	sub invoke_button_down {
1761	my ($self, $ev, $x, $y) = @_;	2195	my ($self, $ev, $x, $y) = @_;
1762		2196
1763	$self->SUPER::button_down ($ev, $x, $y);	2197	$self->SUPER::invoke_button_down ($ev, $x, $y);
1764		2198
1765	my $idx = $self->{layout}->xy_to_index ($x, $y);	2199	my $idx = $self->{layout}->xy_to_index ($x, $y);
1766		2200
1767	# byte-index to char-index	2201	# byte-index to char-index
1768	my $text = $self->{text};	2202	my $text = $self->{text};
1769	utf8::encode $text;	2203	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1770	$self->{cursor} = length substr $text, 0, $idx;	2204	$self->{cursor} = length $text;
1771		2205
1772	$self->_set_text ($self->{text});	2206	$self->_set_text ($self->{text});
1773	$self->update;	2207	$self->update;
1774		2208
1775	1	2209	1
1776	}	2210	}
1777		2211
1778	sub mouse_motion {	2212	sub invoke_mouse_motion {
1779	my ($self, $ev, $x, $y) = @_;	2213	my ($self, $ev, $x, $y) = @_;
1780	# 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#
1781		2215
1782	0	2216	1
1783	}	2217	}
1784		2218
1785	sub _draw {	2219	sub _draw {
1786	my ($self) = @_;	2220	my ($self) = @_;
1787		2221
…		…
1814	utf8::encode $text;	2248	utf8::encode $text;
1815		2249
1816	@$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)
1817	}	2251	}
1818		2252
1819	glColor @{$self->{fg}};
1820	glBegin GL_LINES;	2253	glBegin GL_LINES;
1821	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};
1822	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};
1823	glEnd;	2256	glEnd;
1824	}	2257	}
1825	}	2258	}
1826		2259
		2260	#############################################################################
		2261
1827	package CFClient::UI::Entry;	2262	package CFPlus::UI::Entry;
1828		2263
1829	our @ISA = CFClient::UI::EntryBase::;	2264	our @ISA = CFPlus::UI::EntryBase::;
1830		2265
1831	use CFClient::OpenGL;	2266	use CFPlus::OpenGL;
1832		2267
1833	sub key_down {	2268	sub invoke_key_down {
1834	my ($self, $ev) = @_;	2269	my ($self, $ev) = @_;
1835		2270
1836	my $sym = $ev->{sym};	2271	my $sym = $ev->{sym};
1837		2272
1838	if ($sym == 13) {	2273	if ($ev->{uni} == 0x0d || $sym == 13) {
1839	unshift @{$self->{history}},	2274	unshift @{$self->{history}},
1840	my $txt = $self->get_text;	2275	my $txt = $self->get_text;
		2276
1841	$self->{history_pointer} = -1;	2277	$self->{history_pointer} = -1;
1842	$self->{history_saveback} = '';	2278	$self->{history_saveback} = '';
1843	$self->_emit (activate => $txt);	2279	$self->emit (activate => $txt);
1844	$self->update;	2280	$self->update;
1845		2281
1846	} elsif ($sym == CFClient::SDLK_UP) {	2282	} elsif ($sym == CFPlus::SDLK_UP) {
1847	if ($self->{history_pointer} < 0) {	2283	if ($self->{history_pointer} < 0) {
1848	$self->{history_saveback} = $self->get_text;	2284	$self->{history_saveback} = $self->get_text;
1849	}	2285	}
1850	if (@{$self->{history} || []} > 0) {	2286	if (@{$self->{history} || []} > 0) {
1851	$self->{history_pointer}++;	2287	$self->{history_pointer}++;
…		…
1853	$self->{history_pointer} = @{$self->{history} || []} - 1;	2289	$self->{history_pointer} = @{$self->{history} || []} - 1;
1854	}	2290	}
1855	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2291	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1856	}	2292	}
1857		2293
1858	} elsif ($sym == CFClient::SDLK_DOWN) {	2294	} elsif ($sym == CFPlus::SDLK_DOWN) {
1859	$self->{history_pointer}--;	2295	$self->{history_pointer}--;
1860	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2296	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1861		2297
1862	if ($self->{history_pointer} >= 0) {	2298	if ($self->{history_pointer} >= 0) {
1863	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2299	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1864	} else {	2300	} else {
1865	$self->set_text ($self->{history_saveback});	2301	$self->set_text ($self->{history_saveback});
1866	}	2302	}
1867		2303
1868	} else {	2304	} else {
1869	return $self->SUPER::key_down ($ev)	2305	return $self->SUPER::invoke_key_down ($ev)
1870	}	2306	}
1871		2307
1872	1	2308	1
1873	}	2309	}
1874		2310
1875	#############################################################################	2311	#############################################################################
1876		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
1877	package CFClient::UI::Button;	2352	package CFPlus::UI::Button;
1878		2353
1879	our @ISA = CFClient::UI::Label::;	2354	our @ISA = CFPlus::UI::Label::;
1880		2355
1881	use CFClient::OpenGL;	2356	use CFPlus::OpenGL;
1882		2357
1883	my @tex =	2358	my @tex =
1884	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2359	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1885	qw(b1_button_active.png);	2360	qw(b1_button_inactive.png b1_button_active.png);
1886		2361
1887	sub new {	2362	sub new {
1888	my $class = shift;	2363	my $class = shift;
1889		2364
1890	$class->SUPER::new (	2365	$class->SUPER::new (
1891	padding_x => 4,	2366	padding_x => 4,
1892	padding_y => 4,	2367	padding_y => 4,
1893	fg => [1, 1, 1],	2368	fg => [1.0, 1.0, 1.0],
1894	active_fg => [0, 0, 1],	2369	active_fg => [0.8, 0.8, 0.8],
1895	can_hover => 1,	2370	can_hover => 1,
1896	align => 0,	2371	align => 0,
1897	valign => 0,	2372	valign => 0,
1898	can_events => 1,	2373	can_events => 1,
1899	@_	2374	@_
1900	)	2375	)
1901	}	2376	}
1902		2377
1903	sub activate { }
1904
1905	sub button_up {	2378	sub invoke_button_up {
1906	my ($self, $ev, $x, $y) = @_;	2379	my ($self, $ev, $x, $y) = @_;
1907		2380
1908	$self->emit ("activate")	2381	$self->emit ("activate")
1909	if $x >= 0 && $x < $self->{w}	2382	if $x >= 0 && $x < $self->{w}
1910	&& $y >= 0 && $y < $self->{h};	2383	&& $y >= 0 && $y < $self->{h};
…		…
1913	}	2386	}
1914		2387
1915	sub _draw {	2388	sub _draw {
1916	my ($self) = @_;	2389	my ($self) = @_;
1917		2390
1918	local $self->{fg} = $self->{fg};	2391	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920	if ($GRAB == $self) {
1921	$self->{fg} = $self->{active_fg};
1922	}
1923		2392
1924	glEnable GL_TEXTURE_2D;	2393	glEnable GL_TEXTURE_2D;
1925	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2394	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926	glColor 0, 0, 0, 1;	2395	glColor 0, 0, 0, 1;
1927		2396
		2397	my $tex = $tex[$GRAB == $self];
1928	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2398	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1929		2399
1930	glDisable GL_TEXTURE_2D;	2400	glDisable GL_TEXTURE_2D;
1931		2401
1932	$self->SUPER::_draw;	2402	$self->SUPER::_draw;
1933	}	2403	}
1934		2404
1935	#############################################################################	2405	#############################################################################
1936		2406
1937	package CFClient::UI::CheckBox;	2407	package CFPlus::UI::CheckBox;
1938		2408
1939	our @ISA = CFClient::UI::DrawBG::;	2409	our @ISA = CFPlus::UI::DrawBG::;
1940		2410
1941	my @tex =	2411	my @tex =
1942	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2412	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1943	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2413	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1944		2414
1945	use CFClient::OpenGL;	2415	use CFPlus::OpenGL;
1946		2416
1947	sub new {	2417	sub new {
1948	my $class = shift;	2418	my $class = shift;
1949		2419
1950	$class->SUPER::new (	2420	$class->SUPER::new (
…		…
1964	my ($self) = @_;	2434	my ($self) = @_;
1965		2435
1966	(6) x 2	2436	(6) x 2
1967	}	2437	}
1968		2438
		2439	sub toggle {
		2440	my ($self) = @_;
		2441
		2442	$self->{state} = !$self->{state};
		2443	$self->emit (changed => $self->{state});
		2444	$self->update;
		2445	}
		2446
1969	sub button_down {	2447	sub invoke_button_down {
1970	my ($self, $ev, $x, $y) = @_;	2448	my ($self, $ev, $x, $y) = @_;
1971		2449
1972	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2450	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2451	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974	$self->{state} = !$self->{state};	2452	$self->toggle;
1975	$self->_emit (changed => $self->{state});
1976	} else {	2453	} else {
1977	return 0	2454	return 0
1978	}	2455	}
1979		2456
1980	1	2457	1
…		…
2000	glDisable GL_TEXTURE_2D;	2477	glDisable GL_TEXTURE_2D;
2001	}	2478	}
2002		2479
2003	#############################################################################	2480	#############################################################################
2004		2481
2005	package CFClient::UI::Image;	2482	package CFPlus::UI::Image;
2006		2483
2007	our @ISA = CFClient::UI::Base::;	2484	our @ISA = CFPlus::UI::Base::;
2008		2485
2009	use CFClient::OpenGL;	2486	use CFPlus::OpenGL;
2010	use Carp qw/confess/;
2011		2487
2012	our %loaded_images;	2488	our %texture_cache;
2013		2489
2014	sub new {	2490	sub new {
2015	my $class = shift;	2491	my $class = shift;
2016		2492
2017	my $self = $class->SUPER::new (can_events => 0, @_);	2493	my $self = $class->SUPER::new (
		2494	can_events => 0,
		2495	@_,
		2496	);
2018		2497
2019	$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";
2020		2500
2021	$loaded_images{$self->{image}} ||=	2501	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2022	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;
2023		2503
2024	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2504	CFPlus::weaken $texture_cache{$self->{path}};
2025		2505
2026	Scalar::Util::weaken $loaded_images{$self->{image}};	2506	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028	$self->{aspect} = $tex->{w} / $tex->{h};
2029		2507
2030	$self	2508	$self
2031	}	2509	}
2032		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
2033	sub size_request {	2526	sub size_request {
2034	my ($self) = @_;	2527	my ($self) = @_;
2035		2528
2036	($self->{tex}->{w}, $self->{tex}->{h})	2529	($self->{tex}{w}, $self->{tex}{h})
2037	}	2530	}
2038		2531
2039	sub _draw {	2532	sub _draw {
2040	my ($self) = @_;	2533	my ($self) = @_;
2041		2534
…		…
2051	}	2544	}
2052		2545
2053	glEnable GL_TEXTURE_2D;	2546	glEnable GL_TEXTURE_2D;
2054	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055		2548
2056	$tex->draw_quad_alpha (0, 0, $w, $h);	2549	$tex->draw_quad (0, 0, $w, $h);
2057		2550
2058	glDisable GL_TEXTURE_2D;	2551	glDisable GL_TEXTURE_2D;
2059	}	2552	}
2060		2553
2061	#############################################################################	2554	#############################################################################
2062		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
2063	package CFClient::UI::VGauge;	2592	package CFPlus::UI::VGauge;
2064		2593
2065	our @ISA = CFClient::UI::Base::;	2594	our @ISA = CFPlus::UI::Base::;
2066		2595
2067	use List::Util qw(min max);	2596	use List::Util qw(min max);
2068		2597
2069	use CFClient::OpenGL;	2598	use CFPlus::OpenGL;
2070		2599
2071	my %tex = (	2600	my %tex = (
2072	food => [	2601	food => [
2073	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2602	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2603	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2075	],	2604	],
2076	grace => [	2605	grace => [
2077	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2606	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2078	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/
2079	],	2608	],
2080	hp => [	2609	hp => [
2081	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2610	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2611	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2083	],	2612	],
2084	mana => [	2613	mana => [
2085	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2614	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2086	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/
2087	],	2616	],
2088	);	2617	);
2089		2618
2090	# eg. VGauge->new (gauge => 'food'), default gauge: food	2619	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2150	my $ycut1 = max 0, min 1, $ycut;	2679	my $ycut1 = max 0, min 1, $ycut;
2151	my $ycut2 = max 0, min 1, $ycut - 1;	2680	my $ycut2 = max 0, min 1, $ycut - 1;
2152		2681
2153	my $h1 = $self->{h} * (1 - $ycut1);	2682	my $h1 = $self->{h} * (1 - $ycut1);
2154	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);
2155		2687
2156	glEnable GL_BLEND;	2688	glEnable GL_BLEND;
2157	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2689	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2690	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2159	glEnable GL_TEXTURE_2D;	2691	glEnable GL_TEXTURE_2D;
…		…
2178		2710
2179	if ($t3) {	2711	if ($t3) {
2180	glBindTexture GL_TEXTURE_2D, $t3->{name};	2712	glBindTexture GL_TEXTURE_2D, $t3->{name};
2181	glBegin GL_QUADS;	2713	glBegin GL_QUADS;
2182	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2714	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2183	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2715	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2184	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2716	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2185	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2717	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2186	glEnd;	2718	glEnd;
2187	}	2719	}
2188		2720
2189	glDisable GL_BLEND;	2721	glDisable GL_BLEND;
2190	glDisable GL_TEXTURE_2D;	2722	glDisable GL_TEXTURE_2D;
2191	}	2723	}
2192		2724
2193	#############################################################################	2725	#############################################################################
2194		2726
2195	package CFClient::UI::Gauge;	2727	package CFPlus::UI::Gauge;
2196		2728
2197	our @ISA = CFClient::UI::VBox::;	2729	our @ISA = CFPlus::UI::VBox::;
2198		2730
2199	sub new {	2731	sub new {
2200	my ($class, %arg) = @_;	2732	my ($class, %arg) = @_;
2201		2733
2202	my $self = $class->SUPER::new (	2734	my $self = $class->SUPER::new (
…		…
2204	can_hover => 1,	2736	can_hover => 1,
2205	can_events => 1,	2737	can_events => 1,
2206	%arg,	2738	%arg,
2207	);	2739	);
2208		2740
2209	$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");
2210	$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);
2211	$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");
2212		2744
2213	$self	2745	$self
2214	}	2746	}
2215		2747
2216	sub set_fontsize {	2748	sub set_fontsize {
…		…
2237	$self->{value}->set_text ($val);	2769	$self->{value}->set_text ($val);
2238	}	2770	}
2239		2771
2240	#############################################################################	2772	#############################################################################
2241		2773
2242	package CFClient::UI::Slider;	2774	package CFPlus::UI::Slider;
2243		2775
2244	use strict;	2776	use strict;
2245		2777
2246	use CFClient::OpenGL;	2778	use CFPlus::OpenGL;
2247		2779
2248	our @ISA = CFClient::UI::DrawBG::;	2780	our @ISA = CFPlus::UI::DrawBG::;
2249		2781
2250	my @tex =	2782	my @tex =
2251	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2783	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2252	qw(s1_slider.png s1_slider_bg.png);	2784	qw(s1_slider.png s1_slider_bg.png);
2253		2785
2254	sub new {	2786	sub new {
2255	my $class = shift;	2787	my $class = shift;
2256		2788
…		…
2277	$self->update;	2809	$self->update;
2278		2810
2279	$self	2811	$self
2280	}	2812	}
2281		2813
2282	sub changed { }
2283
2284	sub set_range {	2814	sub set_range {
2285	my ($self, $range) = @_;	2815	my ($self, $range) = @_;
2286		2816
2287	($range, $self->{range}) = ($self->{range}, $range);	2817	($range, $self->{range}) = ($self->{range}, $range);
2288		2818
2289	$self->update
2290	if "@$range" ne "@{$self->{range}}";	2819	if ("@$range" ne "@{$self->{range}}") {
		2820	$self->update;
		2821	$self->set_value ($self->{range}[0]);
		2822	}
2291	}	2823	}
2292		2824
2293	sub set_value {	2825	sub set_value {
2294	my ($self, $value) = @_;	2826	my ($self, $value) = @_;
2295		2827
…		…
2306	if $unit;	2838	if $unit;
2307		2839
2308	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2840	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309		2841
2310	if ($value != $old_value) {	2842	if ($value != $old_value) {
2311	$self->_emit (changed => $value);	2843	$self->emit (changed => $value);
2312	$self->update;	2844	$self->update;
2313	}	2845	}
2314	}	2846	}
2315		2847
2316	sub size_request {	2848	sub size_request {
2317	my ($self) = @_;	2849	my ($self) = @_;
2318		2850
2319	($self->{req_w}, $self->{req_h})	2851	($self->{req_w}, $self->{req_h})
2320	}	2852	}
2321		2853
2322	sub button_down {	2854	sub invoke_button_down {
2323	my ($self, $ev, $x, $y) = @_;	2855	my ($self, $ev, $x, $y) = @_;
2324		2856
2325	$self->SUPER::button_down ($ev, $x, $y);	2857	$self->SUPER::invoke_button_down ($ev, $x, $y);
2326		2858
2327	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2859	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328		2860
2329	$self->mouse_motion ($ev, $x, $y)	2861	$self->invoke_mouse_motion ($ev, $x, $y)
2330	}	2862	}
2331		2863
2332	sub mouse_motion {	2864	sub invoke_mouse_motion {
2333	my ($self, $ev, $x, $y) = @_;	2865	my ($self, $ev, $x, $y) = @_;
2334		2866
2335	if ($GRAB == $self) {	2867	if ($GRAB == $self) {
2336	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2868	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337		2869
…		…
2343	} else {	2875	} else {
2344	return 0;	2876	return 0;
2345	}	2877	}
2346		2878
2347	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
2348	}	2892	}
2349		2893
2350	sub update {	2894	sub update {
2351	my ($self) = @_;	2895	my ($self) = @_;
2352		2896
…		…
2401	glDisable GL_TEXTURE_2D;	2945	glDisable GL_TEXTURE_2D;
2402	}	2946	}
2403		2947
2404	#############################################################################	2948	#############################################################################
2405		2949
2406	package CFClient::UI::ValSlider;	2950	package CFPlus::UI::ValSlider;
2407		2951
2408	our @ISA = CFClient::UI::HBox::;	2952	our @ISA = CFPlus::UI::HBox::;
2409		2953
2410	sub new {	2954	sub new {
2411	my ($class, %arg) = @_;	2955	my ($class, %arg) = @_;
2412		2956
2413	my $range = delete $arg{range};	2957	my $range = delete $arg{range};
2414		2958
2415	my $self = $class->SUPER::new (	2959	my $self = $class->SUPER::new (
2416	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2960	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2417	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2961	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2418	to_value => sub { shift },	2962	to_value => sub { shift },
2419	from_value => sub { shift },	2963	from_value => sub { shift },
2420	%arg,	2964	%arg,
2421	);	2965	);
2422		2966
…		…
2442	sub set_range { shift->{slider}->set_range (@_) }	2986	sub set_range { shift->{slider}->set_range (@_) }
2443	sub set_value { shift->{slider}->set_value (@_) }	2987	sub set_value { shift->{slider}->set_value (@_) }
2444		2988
2445	#############################################################################	2989	#############################################################################
2446		2990
2447	package CFClient::UI::TextView;	2991	package CFPlus::UI::TextScroller;
2448		2992
2449	our @ISA = CFClient::UI::HBox::;	2993	our @ISA = CFPlus::UI::HBox::;
2450		2994
2451	use CFClient::OpenGL;	2995	use CFPlus::OpenGL;
2452		2996
2453	sub new {	2997	sub new {
2454	my $class = shift;	2998	my $class = shift;
2455		2999
2456	my $self = $class->SUPER::new (	3000	my $self = $class->SUPER::new (
2457	fontsize => 1,	3001	fontsize => 1,
2458	can_events => 0,	3002	can_events => 1,
		3003	indent => 0,
2459	#font => default_font	3004	#font => default_font
2460	@_,	3005	@_,
2461		3006
2462	layout => (new CFClient::Layout 1),	3007	layout => (new CFPlus::Layout),
2463	par => [],	3008	par => [],
		3009	max_par => 0,
2464	height => 0,	3010	height => 0,
2465	children => [	3011	children => [
2466	(new CFClient::UI::Empty expand => 1),	3012	(new CFPlus::UI::Empty expand => 1),
2467	(new CFClient::UI::Slider vertical => 1),	3013	(new CFPlus::UI::Slider vertical => 1),
2468	],	3014	],
2469	);	3015	);
2470		3016
2471	$self->{children}[1]->connect (changed => sub { $self->update });	3017	$self->{children}[1]->connect (changed => sub { $self->update });
2472		3018
…		…
2478		3024
2479	$self->{fontsize} = $fontsize;	3025	$self->{fontsize} = $fontsize;
2480	$self->reflow;	3026	$self->reflow;
2481	}	3027	}
2482		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
2483	sub size_allocate {	3038	sub invoke_size_allocate {
2484	my ($self, $w, $h) = @_;	3039	my ($self, $w, $h) = @_;
2485		3040
2486	$self->SUPER::size_allocate ($w, $h);	3041	my ($empty, $slider, @other) = @{ $self->{children} };
		3042	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487		3043
2488	$self->{layout}->set_font ($self->{font}) if $self->{font};	3044	$self->{layout}->set_font ($self->{font}) if $self->{font};
2489	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3045	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490	$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});
2491		3048
2492	$self->reflow;	3049	$self->reflow;
2493	}
2494		3050
2495	sub text_size {	3051	local $self->{children} = [$empty, $slider];
		3052	$self->SUPER::invoke_size_allocate ($w, $h)
		3053	}
		3054
		3055	sub invoke_mouse_wheel {
2496	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) = @_;
2497		3067
2498	my $layout = $self->{layout};	3068	my $layout = $self->{layout};
2499		3069
		3070	$layout->set_font ($self->{font}) if $self->{font};
		3071	$layout->set_foreground (@{$para->{fg}});
2500	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3072	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501	$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});
2502	$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}}
2503		3081	);
		3082
2504	$layout->size	3083	$layout
2505	}	3084	}
2506		3085
2507	sub reflow {	3086	sub reflow {
2508	my ($self) = @_;	3087	my ($self) = @_;
2509		3088
…		…
2516		3095
2517	# todo: base offset on lines or so, not on pixels	3096	# todo: base offset on lines or so, not on pixels
2518	$self->{children}[1]->set_value ($offset);	3097	$self->{children}[1]->set_value ($offset);
2519	}	3098	}
2520		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
2521	sub clear {	3115	sub clear {
2522	my ($self) = @_;	3116	my ($self) = @_;
		3117
		3118	my (undef, undef, @other) = @{ $self->{children} };
		3119	$self->remove ($_) for @other;
2523		3120
2524	$self->{par} = [];	3121	$self->{par} = [];
2525	$self->{height} = 0;	3122	$self->{height} = 0;
2526	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3123	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527	}	3124	}
2528		3125
2529	sub add_paragraph {	3126	sub add_paragraph {
2530	my ($self, $color, $text, $indent) = @_;	3127	my $self = shift;
2531		3128
2532	for my $line (split /\n/, $text) {	3129	for my $para (@_) {
2533	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
2534	$self->{height} += $h;	3181	$self->{height} = $height;
2535	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3182	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2536	}
2537		3183
2538	$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	}
2539	}	3190	}
2540		3191
2541	sub update {	3192	sub update {
2542	my ($self) = @_;	3193	my ($self) = @_;
2543		3194
…		…
2545		3196
2546	return unless $self->{h} > 0;	3197	return unless $self->{h} > 0;
2547		3198
2548	delete $self->{texture};	3199	delete $self->{texture};
2549		3200
2550	$ROOT->on_post_alloc ($self, sub {	3201	$ROOT->on_post_alloc ($self => sub {
		3202	$self->force_uptodate;
		3203
2551	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3204	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552		3205
2553	if (delete $self->{need_reflow}) {
2554	my $height = 0;
2555
2556	my $layout = $self->{layout};
2557
2558	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2560	for (@{$self->{par}}) {
2561	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2562	$layout->set_width ($W - $_->[3]);
2563	$layout->set_markup ($_->[4]);
2564	my ($w, $h) = $layout->size;
2565	$_->[0] = $w + $_->[3];
2566	$_->[1] = $h;
2567	}
2568
2569	$height += $_->[1];
2570	}
2571
2572	$self->{height} = $height;
2573
2574	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2575
2576	delete $self->{texture};
2577	}
2578
2579	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3206	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2580	glClearColor 0.5, 0.5, 0.5, 0;	3207	glClearColor 0, 0, 0, 0;
2581	glClear GL_COLOR_BUFFER_BIT;	3208	glClear GL_COLOR_BUFFER_BIT;
2582		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;
2583	my $top = int $self->{children}[1]{range}[0];	3218	my $top = int $self->{children}[1]{range}[0];
2584		3219
2585	my $y0 = $top;	3220	my $y0 = $top;
2586	my $y1 = $top + $H;	3221	my $y1 = $top + $H;
2587		3222
2588	my $y = 0;
2589
2590	my $layout = $self->{layout};
2591
2592	$layout->set_font ($self->{font}) if $self->{font};
2593
2594	glEnable GL_BLEND;
2595	#TODO# not correct in windows where rgba is forced off
2596	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2597
2598	for my $par (@{$self->{par}}) {	3223	for my $para (@{$self->{par}}) {
2599	my $h = $par->[1];	3224	my $h = $para->{h};
		3225	my $y = $para->{y};
2600		3226
2601	if ($y0 < $y + $h && $y < $y1) {	3227	if ($y0 < $y + $h && $y < $y1) {
2602	$layout->set_foreground (@{ $par->[2] });	3228	my $layout = $self->get_layout ($para);
2603	$layout->set_width ($W - $par->[3]);
2604	$layout->set_markup ($par->[4]);
2605		3229
2606	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3230	$layout->render ($para->{indent}, $y - $y0);
2607		3231
2608	glRasterPos $par->[3], $y - $y0;	3232	if (my @w = @{ $para->{widget} }) {
2609	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	}
2610	}	3244	}
2611		3245
2612	$y += $h;	3246	$paridx++;
		3247	$top_paragraph ||= $paridx if $y >= $top;
2613	}	3248	}
2614		3249
2615	glDisable GL_BLEND;	3250	$self->{top_paragraph} = $top_paragraph;
2616	};	3251	};
2617	});	3252	});
2618	}	3253	}
2619		3254
		3255	sub reconfigure {
		3256	my ($self) = @_;
		3257
		3258	$self->SUPER::reconfigure;
		3259
		3260	$_->{w} = 1e10 for @{ $self->{par} };
		3261	$self->reflow;
		3262	}
		3263
2620	sub _draw {	3264	sub _draw {
2621	my ($self) = @_;	3265	my ($self) = @_;
2622		3266
2623	glEnable GL_TEXTURE_2D;	3267	glEnable GL_TEXTURE_2D;
2624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3268	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625	glColor 1, 1, 1, 1;	3269	glColor 0, 0, 0, 1;
2626	$self->{texture}->draw_quad_alpha (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});
2627	glDisable GL_TEXTURE_2D;	3271	glDisable GL_TEXTURE_2D;
2628		3272
2629	$self->{children}[1]->draw;	3273	$self->{children}[1]->draw;
2630
2631	}	3274	}
2632		3275
2633	#############################################################################	3276	#############################################################################
2634		3277
2635	package CFClient::UI::Animator;	3278	package CFPlus::UI::Animator;
2636		3279
2637	use CFClient::OpenGL;	3280	use CFPlus::OpenGL;
2638		3281
2639	our @ISA = CFClient::UI::Bin::;	3282	our @ISA = CFPlus::UI::Bin::;
2640		3283
2641	sub moveto {	3284	sub moveto {
2642	my ($self, $x, $y) = @_;	3285	my ($self, $x, $y) = @_;
2643		3286
2644	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3287	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2672	glPopMatrix;	3315	glPopMatrix;
2673	}	3316	}
2674		3317
2675	#############################################################################	3318	#############################################################################
2676		3319
2677	package CFClient::UI::Flopper;	3320	package CFPlus::UI::Flopper;
2678		3321
2679	our @ISA = CFClient::UI::Button::;	3322	our @ISA = CFPlus::UI::Button::;
2680		3323
2681	sub new {	3324	sub new {
2682	my $class = shift;	3325	my $class = shift;
2683		3326
2684	my $self = $class->SUPER::new (	3327	my $self = $class->SUPER::new (
…		…
2696	$self->{other}->toggle_visibility;	3339	$self->{other}->toggle_visibility;
2697	}	3340	}
2698		3341
2699	#############################################################################	3342	#############################################################################
2700		3343
2701	package CFClient::UI::Tooltip;	3344	package CFPlus::UI::Tooltip;
2702		3345
2703	our @ISA = CFClient::UI::Bin::;	3346	our @ISA = CFPlus::UI::Bin::;
2704		3347
2705	use CFClient::OpenGL;	3348	use CFPlus::OpenGL;
2706		3349
2707	sub new {	3350	sub new {
2708	my $class = shift;	3351	my $class = shift;
2709		3352
2710	$class->SUPER::new (	3353	$class->SUPER::new (
…		…
2713	)	3356	)
2714	}	3357	}
2715		3358
2716	sub set_tooltip_from {	3359	sub set_tooltip_from {
2717	my ($self, $widget) = @_;	3360	my ($self, $widget) = @_;
		3361
		3362	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3363	if $widget->{tooltip} =~ /^#(.*)$/;
2718		3364
2719	my $tooltip = $widget->{tooltip};	3365	my $tooltip = $widget->{tooltip};
2720		3366
2721	if ($ENV{CFPLUS_DEBUG} & 2) {	3367	if ($ENV{CFPLUS_DEBUG} & 2) {
2722	$tooltip .= "\n\n" . (ref $widget) . "\n"	3368	$tooltip .= "\n\n" . (ref $widget) . "\n"
2723	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3369	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724	. "req $widget->{req_w} $widget->{req_h}\n"	3370	. "req $widget->{req_w} $widget->{req_h}\n"
2725	. "visible $widget->{visible}";	3371	. "visible $widget->{visible}";
2726	}	3372	}
2727		3373
		3374	$tooltip =~ s/^\n+//;
		3375	$tooltip =~ s/\n+$//;
		3376
2728	$self->add (new CFClient::UI::Label	3377	$self->add (new CFPlus::UI::Label
2729	markup => $tooltip,	3378	markup => $tooltip,
2730	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3379	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731	fontsize => 0.8,	3380	fontsize => 0.8,
2732	fg => [0, 0, 0, 1],	3381	style => 1, # FLAG_INVERSE
2733	ellipsise => 0,	3382	ellipsise => 0,
2734	font => ($widget->{tooltip_font} || $::FONT_PROP),	3383	font => ($widget->{tooltip_font} || $::FONT_PROP),
2735	);	3384	);
2736	}	3385	}
2737		3386
…		…
2741	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3390	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742		3391
2743	($w + 4, $h + 4)	3392	($w + 4, $h + 4)
2744	}	3393	}
2745		3394
2746	sub size_allocate {	3395	sub invoke_size_allocate {
2747	my ($self, $w, $h) = @_;	3396	my ($self, $w, $h) = @_;
2748		3397
2749	$self->SUPER::size_allocate ($w - 4, $h - 4);	3398	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750	}	3399	}
2751		3400
2752	sub visibility_change {	3401	sub invoke_visibility_change {
2753	my ($self, $visible) = @_;	3402	my ($self, $visible) = @_;
2754		3403
2755	return unless $visible;	3404	return unless $visible;
2756		3405
2757	$self->{root}->on_post_alloc ("move_$self" => sub {	3406	$self->{root}->on_post_alloc ("move_$self" => sub {
2758	my $widget = $self->{owner}	3407	my $widget = $self->{owner}
2759	or return;	3408	or return;
2760		3409
		3410	if ($widget->{visible}) {
2761	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3411	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762		3412
2763	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3413	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764	if $x + $self->{w} > $::WIDTH;	3414	if $x + $self->{w} > $self->{root}{w};
2765		3415
2766	$self->move_abs ($x, $y);	3416	$self->move_abs ($x, $y);
		3417	} else {
		3418	$self->hide;
		3419	}
2767	});	3420	});
2768	}	3421	}
2769		3422
2770	sub _draw {	3423	sub _draw {
2771	my ($self) = @_;	3424	my ($self) = @_;
…		…
2795	$self->SUPER::_draw;	3448	$self->SUPER::_draw;
2796	}	3449	}
2797		3450
2798	#############################################################################	3451	#############################################################################
2799		3452
2800	package CFClient::UI::Face;	3453	package CFPlus::UI::Face;
2801		3454
2802	our @ISA = CFClient::UI::Base::;	3455	our @ISA = CFPlus::UI::DrawBG::;
2803		3456
2804	use CFClient::OpenGL;	3457	use CFPlus::OpenGL;
2805		3458
2806	sub new {	3459	sub new {
2807	my $class = shift;	3460	my $class = shift;
2808		3461
2809	my $self = $class->SUPER::new (	3462	my $self = $class->SUPER::new (
		3463	size_w => 32,
		3464	size_h => 8,
2810	aspect => 1,	3465	aspect => 1,
2811	can_events => 0,	3466	can_events => 0,
2812	@_,	3467	@_,
2813	);	3468	);
2814		3469
2815	if ($self->{anim} && $self->{animspeed}) {	3470	if ($self->{anim} && $self->{animspeed}) {
2816	Scalar::Util::weaken (my $widget = $self);	3471	CFPlus::weaken (my $widget = $self);
2817		3472
		3473	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3474	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2818	$self->{timer} = Event->timer (	3475	$self->{timer} = Event->timer (
2819	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2820	hard => 1,	3476	parked => 1,
2821	interval => $self->{animspeed},
2822	cb => sub {	3477	cb => sub {
		3478	return unless $::CONN && $widget;
		3479
2823	++$widget->{frame};	3480	++$widget->{frame};
		3481	$widget->update_face;
2824	$widget->update;	3482	$widget->update;
		3483
		3484	$widget->update_timer;
2825	},	3485	},
2826	);	3486	);
		3487
		3488	$self->update_face;
		3489	$self->update_timer;
2827	}	3490	}
2828		3491
2829	$self	3492	$self
2830	}	3493	}
2831		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
2832	sub size_request {	3525	sub size_request {
2833	(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)
2834	}	3541	}
2835		3542
2836	sub update {	3543	sub update {
2837	my ($self) = @_;	3544	my ($self) = @_;
2838		3545
2839	return unless $self->{visible};	3546	return unless $self->{visible};
2840		3547
2841	$self->SUPER::update;	3548	$self->SUPER::update;
2842	}	3549	}
2843		3550
		3551	sub invoke_visibility_change {
		3552	my ($self) = @_;
		3553
		3554	$self->update_timer;
		3555
		3556	0
		3557	}
		3558
2844	sub _draw {	3559	sub _draw {
2845	my ($self) = @_;	3560	my ($self) = @_;
2846		3561
2847	return unless $::CONN;	3562	return unless $::CONN;
2848		3563
2849	my $face;	3564	$self->SUPER::_draw;
2850		3565
2851	if ($self->{frame}) {
2852	my $anim = $::CONN->{anim}[$self->{anim}];	3566	my $faceid = $::CONN->{faceid}[$self->{face}]
2853		3567	or return;
2854	$face = $anim->[ $self->{frame} % @$anim ]
2855	if $anim && @$anim;
2856	}
2857		3568
2858	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3569	my $tex = $::CONN->{texture}[$faceid];
2859		3570
2860	if ($tex) {	3571	if ($tex) {
2861	glEnable GL_TEXTURE_2D;	3572	glEnable GL_TEXTURE_2D;
2862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3573	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863	glColor 1, 1, 1, 1;	3574	glColor 0, 0, 0, 1;
2864	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3575	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865	glDisable GL_TEXTURE_2D;	3576	glDisable GL_TEXTURE_2D;
2866	}	3577	}
2867	}	3578	}
2868		3579
2869	sub DESTROY {	3580	sub destroy {
2870	my ($self) = @_;	3581	my ($self) = @_;
2871		3582
2872	$self->{timer}->cancel	3583	(delete $self->{timer})->cancel
2873	if $self->{timer};	3584	if $self->{timer};
2874		3585
2875	$self->SUPER::DESTROY;	3586	$self->SUPER::destroy;
2876	}	3587	}
2877		3588
2878	#############################################################################	3589	#############################################################################
2879		3590
2880	package CFClient::UI::Buttonbar;	3591	package CFPlus::UI::Buttonbar;
2881		3592
2882	our @ISA = CFClient::UI::HBox::;	3593	our @ISA = CFPlus::UI::HBox::;
2883		3594
2884	# TODO: should actualyl wrap buttons and other goodies.	3595	# TODO: should actually wrap buttons and other goodies.
2885		3596
2886	#############################################################################	3597	#############################################################################
2887		3598
2888	package CFClient::UI::Menu;	3599	package CFPlus::UI::Menu;
2889		3600
2890	our @ISA = CFClient::UI::FancyFrame::;	3601	our @ISA = CFPlus::UI::Toplevel::;
2891		3602
2892	use CFClient::OpenGL;	3603	use CFPlus::OpenGL;
2893		3604
2894	sub new {	3605	sub new {
2895	my $class = shift;	3606	my $class = shift;
2896		3607
2897	my $self = $class->SUPER::new (	3608	my $self = $class->SUPER::new (
2898	items => [],	3609	items => [],
2899	z => 100,	3610	z => 100,
2900	@_,	3611	@_,
2901	);	3612	);
2902		3613
2903	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3614	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2904		3615
2905	for my $item (@{ $self->{items} }) {	3616	for my $item (@{ $self->{items} }) {
2906	my ($widget, $cb) = @$item;	3617	my ($widget, $cb, $tooltip) = @$item;
2907		3618
2908	# handle various types of items, only text for now	3619	# handle various types of items, only text for now
2909	if (!ref $widget) {	3620	if (!ref $widget) {
		3621	if ($widget =~ /\t/) {
		3622	my ($left, $right) = split /\t/, $widget, 2;
		3623
2910	$widget = new CFClient::UI::Label	3624	$widget = new CFPlus::UI::HBox
2911	can_hover => 1,	3625	can_hover => 1,
2912	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,
2913	text => $widget;	3638	markup => $widget,
		3639	tooltip => $tooltip;
		3640	}
2914	}	3641	}
2915		3642
2916	$self->{item}{$widget} = $item;	3643	$self->{item}{$widget} = $item;
2917		3644
2918	$self->{vbox}->add ($widget);	3645	$self->{vbox}->add ($widget);
…		…
2923		3650
2924	# 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)
2925	sub popup {	3652	sub popup {
2926	my ($self, $ev) = @_;	3653	my ($self, $ev) = @_;
2927		3654
2928	$self->_emit ("popdown");	3655	$self->emit ("popdown");
2929		3656
2930	# maybe save $GRAB? must be careful about events...	3657	# maybe save $GRAB? must be careful about events...
2931	$GRAB = $self;	3658	$GRAB = $self;
2932	$self->{button} = $ev->{button};	3659	$self->{button} = $ev->{button};
2933		3660
2934	$self->show;	3661	$self->show;
2935	$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);
2936	}	3663	}
2937		3664
2938	sub mouse_motion {	3665	sub invoke_mouse_motion {
2939	my ($self, $ev, $x, $y) = @_;	3666	my ($self, $ev, $x, $y) = @_;
2940		3667
2941	# TODO: should use vbox->find_widget or so	3668	# TODO: should use vbox->find_widget or so
2942	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3669	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943	$self->{hover} = $self->{item}{$HOVER};	3670	$self->{hover} = $self->{item}{$HOVER};
2944		3671
2945	0	3672	0
2946	}	3673	}
2947		3674
2948	sub button_up {	3675	sub invoke_button_up {
2949	my ($self, $ev, $x, $y) = @_;	3676	my ($self, $ev, $x, $y) = @_;
2950		3677
2951	if ($ev->{button} == $self->{button}) {	3678	if ($ev->{button} == $self->{button}) {
2952	undef $GRAB;	3679	undef $GRAB;
2953	$self->hide;	3680	$self->hide;
2954		3681
2955	$self->_emit ("popdown");	3682	$self->emit ("popdown");
2956	$self->{hover}[1]->() if $self->{hover};	3683	$self->{hover}[1]->() if $self->{hover};
2957	} else {	3684	} else {
2958	return 0	3685	return 0
2959	}	3686	}
2960		3687
2961	1	3688	1
2962	}	3689	}
2963		3690
2964	#############################################################################	3691	#############################################################################
2965		3692
2966	package CFClient::UI::Multiplexer;	3693	package CFPlus::UI::Multiplexer;
2967		3694
2968	our @ISA = CFClient::UI::Container::;	3695	our @ISA = CFPlus::UI::Container::;
2969		3696
2970	sub new {	3697	sub new {
2971	my $class = shift;	3698	my $class = shift;
2972		3699
2973	my $self = $class->SUPER::new (	3700	my $self = $class->SUPER::new (
…		…
2987		3714
2988	$self->{current} = $self->{children}[0]	3715	$self->{current} = $self->{children}[0]
2989	if @{ $self->{children} };	3716	if @{ $self->{children} };
2990	}	3717	}
2991		3718
		3719	sub get_current_page {
		3720	my ($self) = @_;
		3721
		3722	$self->{current}
		3723	}
		3724
2992	sub set_current_page {	3725	sub set_current_page {
2993	my ($self, $page_or_widget) = @_;	3726	my ($self, $page_or_widget) = @_;
2994		3727
2995	my $widget = ref $page_or_widget	3728	my $widget = ref $page_or_widget
2996	? $page_or_widget	3729	? $page_or_widget
2997	: $self->{children}[$page_or_widget];	3730	: $self->{children}[$page_or_widget];
2998		3731
2999	$self->{current} = $widget;	3732	$self->{current} = $widget;
3000	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3733	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001		3734
3002	$self->_emit (page_changed => $self->{current});	3735	$self->emit (page_changed => $self->{current});
3003		3736
3004	$self->realloc;	3737	$self->realloc;
3005	}	3738	}
3006		3739
3007	sub visible_children {	3740	sub visible_children {
…		…
3012	my ($self) = @_;	3745	my ($self) = @_;
3013		3746
3014	$self->{current}->size_request	3747	$self->{current}->size_request
3015	}	3748	}
3016		3749
3017	sub size_allocate {	3750	sub invoke_size_allocate {
3018	my ($self, $w, $h) = @_;	3751	my ($self, $w, $h) = @_;
3019		3752
3020	$self->{current}->configure (0, 0, $w, $h);	3753	$self->{current}->configure (0, 0, $w, $h);
		3754
		3755	1
3021	}	3756	}
3022		3757
3023	sub _draw {	3758	sub _draw {
3024	my ($self) = @_;	3759	my ($self) = @_;
3025		3760
3026	$self->{current}->draw;	3761	$self->{current}->draw;
3027	}	3762	}
3028		3763
3029	#############################################################################	3764	#############################################################################
3030		3765
3031	package CFClient::UI::Notebook;	3766	package CFPlus::UI::Notebook;
3032		3767
3033	our @ISA = CFClient::UI::VBox::;	3768	our @ISA = CFPlus::UI::VBox::;
3034		3769
3035	sub new {	3770	sub new {
3036	my $class = shift;	3771	my $class = shift;
3037		3772
3038	my $self = $class->SUPER::new (	3773	my $self = $class->SUPER::new (
3039	buttonbar => (new CFClient::UI::Buttonbar),	3774	buttonbar => (new CFPlus::UI::Buttonbar),
3040	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3775	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3041	# filter => # will be put between multiplexer and $self	3776	# filter => # will be put between multiplexer and $self
3042	@_,	3777	@_,
3043	);	3778	);
3044		3779
3045	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3780	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3049	}	3784	}
3050		3785
3051	sub add {	3786	sub add {
3052	my ($self, $title, $widget, $tooltip) = @_;	3787	my ($self, $title, $widget, $tooltip) = @_;
3053		3788
3054	Scalar::Util::weaken $self;	3789	CFPlus::weaken $self;
3055		3790
3056	$self->{buttonbar}->add (new CFClient::UI::Button	3791	$self->{buttonbar}->add (new CFPlus::UI::Button
3057	markup => $title,	3792	markup => $title,
3058	tooltip => $tooltip,	3793	tooltip => $tooltip,
3059	on_activate => sub { $self->set_current_page ($widget) },	3794	on_activate => sub { $self->set_current_page ($widget) },
3060	);	3795	);
3061		3796
3062	$self->{multiplexer}->add ($widget);	3797	$self->{multiplexer}->add ($widget);
3063	}	3798	}
3064		3799
		3800	sub get_current_page {
		3801	my ($self) = @_;
		3802
		3803	$self->{multiplexer}->get_current_page
		3804	}
		3805
3065	sub set_current_page {	3806	sub set_current_page {
3066	my ($self, $page) = @_;	3807	my ($self, $page) = @_;
3067		3808
3068	$self->{multiplexer}->set_current_page ($page);	3809	$self->{multiplexer}->set_current_page ($page);
3069	$self->_emit (page_changed => $self->{multiplexer}{current});	3810	$self->emit (page_changed => $self->{multiplexer}{current});
3070	}	3811	}
3071		3812
3072	#############################################################################	3813	#############################################################################
3073		3814
3074	package CFClient::UI::Statusbox;	3815	package CFPlus::UI::Selector;
3075		3816
		3817	use utf8;
		3818
3076	our @ISA = CFClient::UI::VBox::;	3819	our @ISA = CFPlus::UI::Button::;
3077		3820
3078	sub new {	3821	sub new {
3079	my $class = shift;	3822	my $class = shift;
3080		3823
3081	$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 (
3082	fontsize => 0.8,	3879	fontsize => 0.8,
3083	@_,	3880	@_,
3084	)	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
3085	}	3888	}
3086		3889
3087	sub reorder {	3890	sub reorder {
3088	my ($self) = @_;	3891	my ($self) = @_;
3089	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} };
3090		3898
3091	while (my ($k, $v) = each %{ $self->{item} }) {	3899	while (my ($k, $v) = each %{ $self->{item} }) {
3092	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3900	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093	}	3901	}
3094		3902
…		…
3097	my @items = sort {	3905	my @items = sort {
3098	$a->{pri} <=> $b->{pri}	3906	$a->{pri} <=> $b->{pri}
3099	or $b->{id} <=> $a->{id}	3907	or $b->{id} <=> $a->{id}
3100	} values %{ $self->{item} };	3908	} values %{ $self->{item} };
3101		3909
		3910	$self->{timer}->interval (1);
		3911
3102	my $count = 10 + 1;	3912	my $count = 10 + 1;
3103	for my $item (@items) {	3913	for my $item (@items) {
3104	last unless --$count;	3914	last unless --$count;
3105		3915
3106	push @widgets, $item->{label} ||= do {	3916	my $label = $item->{label} ||= do {
3107	# TODO: doesn't handle markup well (read as: at all)	3917	# TODO: doesn't handle markup well (read as: at all)
3108	my $short = $item->{count} > 1	3918	my $short = $item->{count} > 1
3109	? "<b>$item->{count} ×</b> $item->{text}"	3919	? "<b>$item->{count} ×</b> $item->{text}"
3110	: $item->{text};	3920	: $item->{text};
3111		3921
3112	for ($short) {	3922	for ($short) {
3113	s/^\s+//;	3923	s/^\s+//;
3114	s/\s+/ /g;	3924	s/\s+/ /g;
3115	}	3925	}
3116		3926
3117	new CFClient::UI::Label	3927	new CFPlus::UI::Label
3118	markup => $short,	3928	markup => $short,
3119	tooltip => $item->{tooltip},	3929	tooltip => $item->{tooltip},
3120	tooltip_font => $::FONT_PROP,	3930	tooltip_font => $::FONT_PROP,
3121	tooltip_width => 0.67,	3931	tooltip_width => 0.67,
3122	fontsize => $item->{fontsize} || $self->{fontsize},	3932	fontsize => $item->{fontsize} || $self->{fontsize},
3123	max_w => $::WIDTH * 0.44,	3933	max_w => $::WIDTH * 0.44,
3124	fg => $item->{fg},	3934	fg => [@{ $item->{fg} }],
3125	can_events => 1,	3935	can_events => 1,
3126	can_hover => 1	3936	can_hover => 1
3127	};	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;
3128	}	3950	}
3129		3951
3130	$self->clear;	3952	$self->clear;
3131	$self->SUPER::add (reverse @widgets);	3953	$self->SUPER::add (reverse @widgets);
3132	}	3954	}
…		…
3137	$text =~ s/^\s+//;	3959	$text =~ s/^\s+//;
3138	$text =~ s/\s+$//;	3960	$text =~ s/\s+$//;
3139		3961
3140	return unless $text;	3962	return unless $text;
3141		3963
3142	my $timeout = time + ((delete $arg{timeout}) || 60);	3964	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143		3965
3144	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3966	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145		3967
3146	if (my $item = $self->{item}{$group}) {	3968	if (my $item = $self->{item}{$group}) {
3147	if ($item->{text} eq $text) {	3969	if ($item->{text} eq $text) {
3148	$item->{count}++;	3970	$item->{count}++;
3149	} else {	3971	} else {
3150	$item->{count} = 1;	3972	$item->{count} = 1;
3151	$item->{text} = $item->{tooltip} = $text;	3973	$item->{text} = $item->{tooltip} = $text;
3152	}	3974	}
3153	$item->{id} = ++$self->{id};	3975	$item->{id} += 0.2;#d#
3154	$item->{timeout} = $timeout;	3976	$item->{timeout} = $timeout;
3155	delete $item->{label};	3977	delete $item->{label};
3156	} else {	3978	} else {
3157	$self->{item}{$group} = {	3979	$self->{item}{$group} = {
3158	id => ++$self->{id},	3980	id => ++$self->{id},
…		…
3164	count => 1,	3986	count => 1,
3165	%arg,	3987	%arg,
3166	};	3988	};
3167	}	3989	}
3168		3990
		3991	$ROOT->on_refresh (reorder => sub {
3169	$self->reorder;	3992	$self->reorder;
		3993	});
3170	}	3994	}
3171		3995
3172	sub reconfigure {	3996	sub reconfigure {
3173	my ($self) = @_;	3997	my ($self) = @_;
3174		3998
…		…
3177		4001
3178	$self->reorder;	4002	$self->reorder;
3179	$self->SUPER::reconfigure;	4003	$self->SUPER::reconfigure;
3180	}	4004	}
3181		4005
		4006	sub destroy {
		4007	my ($self) = @_;
		4008
		4009	$self->{timer}->cancel;
		4010
		4011	$self->SUPER::destroy;
		4012	}
		4013
3182	#############################################################################	4014	#############################################################################
3183		4015
3184	package CFClient::UI::Inventory;
3185
3186	our @ISA = CFClient::UI::ScrolledWindow::;
3187
3188	sub new {
3189	my $class = shift;
3190
3191	my $self = $class->SUPER::new (
3192	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3193	@_,
3194	);
3195
3196	$self
3197	}
3198
3199	sub set_items {
3200	my ($self, $items) = @_;
3201
3202	$self->{child}->clear;
3203	return unless $items;
3204
3205	my @items = sort {
3206	($a->{type} <=> $b->{type})
3207	or ($a->{name} cmp $b->{name})
3208	} @$items;
3209
3210	$self->{real_items} = \@items;
3211
3212	my $row = 0;
3213	for my $item (@items) {
3214	CFClient::Item::update_widgets $item;
3215
3216	$self->{child}->add (0, $row, $item->{face_widget});
3217	$self->{child}->add (1, $row, $item->{desc_widget});
3218	$self->{child}->add (2, $row, $item->{weight_widget});
3219
3220	$row++;
3221	}
3222	}
3223
3224	#############################################################################
3225
3226	package CFClient::UI::BindEditor;
3227
3228	our @ISA = CFClient::UI::FancyFrame::;
3229
3230	sub new {
3231	my $class = shift;
3232
3233	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235	$self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239	text => "start recording",
3240	tooltip => "Start/Stops recording of actions."
3241	."All subsequent actions after the recording started will be captured."
3242	."The actions are displayed after the record was stopped."
3243	."To bind the action you have to click on the 'Bind' button",
3244	on_activate => sub {
3245	unless ($self->{recording}) {
3246	$self->start;
3247	} else {
3248	$self->stop;
3249	}
3250	});
3251
3252	$vb->add (new CFClient::UI::Label text => "Actions:");
3253	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3256	$vb->add (my $hb = new CFClient::UI::HBox);
3257	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258	$hb->add (new CFClient::UI::Button
3259	text => "bind",
3260	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261	on_activate => sub {
3262	$self->ask_for_bind;
3263	});
3264
3265	$vb->add (my $hb = new CFClient::UI::HBox);
3266	$hb->add (new CFClient::UI::Button
3267	text => "ok",
3268	expand => 1,
3269	tooltip => "This closes the binding editor and saves the binding",
3270	on_activate => sub {
3271	$self->hide;
3272	$self->commit;
3273	});
3274
3275	$hb->add (new CFClient::UI::Button
3276	text => "cancel",
3277	expand => 1,
3278	tooltip => "This closes the binding editor without saving",
3279	on_activate => sub {
3280	$self->hide;
3281	$self->{binding_cancel}->()
3282	if $self->{binding_cancel};
3283	});
3284
3285	$self->update_binding_widgets;
3286
3287	$self
3288	}
3289
3290	sub commit {
3291	my ($self) = @_;
3292	my ($mod, $sym, $cmds) = $self->get_binding;
3293	if ($sym != 0 && @$cmds > 0) {
3294	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295	."'. Don't forget 'Save Config'!");
3296	$self->{binding_change}->($mod, $sym, $cmds)
3297	if $self->{binding_change};
3298	} else {
3299	$::STATUSBOX->add ("No action bound, no key or action specified!");
3300	$self->{binding_cancel}->()
3301	if $self->{binding_cancel};
3302	}
3303	}
3304
3305	sub start {
3306	my ($self) = @_;
3307
3308	$self->{rec_btn}->set_text ("stop recording");
3309	$self->{recording} = 1;
3310	$self->clear_command_list;
3311	$::CONN->start_record if $::CONN;
3312	}
3313
3314	sub stop {
3315	my ($self) = @_;
3316
3317	$self->{rec_btn}->set_text ("start recording");
3318	$self->{recording} = 0;
3319
3320	my $rec;
3321	$rec = $::CONN->stop_record if $::CONN;
3322	return unless ref $rec eq 'ARRAY';
3323	$self->set_command_list ($rec);
3324	}
3325
3326
3327	sub ask_for_bind_and_commit {
3328	my ($self) = @_;
3329	$self->ask_for_bind (1);
3330	}
3331
3332	sub ask_for_bind {
3333	my ($self, $commit) = @_;
3334
3335	CFClient::Binder::open_binding_dialog (sub {
3336	my ($mod, $sym) = @_;
3337	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338	$self->update_binding_widgets;
3339	$self->commit if $commit;
3340	});
3341	}
3342
3343	# $mod and $sym are the modifiers and key symbol
3344	# $cmds is a array ref of strings (the commands)
3345	# $cb is the callback that is executed on OK
3346	# $ccb is the callback that is executed on CANCEL and
3347	# when the binding was unsuccessful on OK
3348	sub set_binding {
3349	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351	$self->clear_command_list;
3352	$self->{recording} = 0;
3353	$self->{rec_btn}->set_text ("start recording");
3354
3355	$self->{binding} = [$mod, $sym];
3356	$self->{commands} = $cmds;
3357
3358	$self->{binding_change} = $cb;
3359	$self->{binding_cancel} = $ccb;
3360
3361	$self->update_binding_widgets;
3362	}
3363
3364	# this is a shortcut method that asks for a binding
3365	# and then just binds it.
3366	sub do_quick_binding {
3367	my ($self, $cmds) = @_;
3368	$self->set_binding (undef, undef, $cmds, sub {
3369	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370	});
3371	$self->ask_for_bind (1);
3372	}
3373
3374	sub update_binding_widgets {
3375	my ($self) = @_;
3376	my ($mod, $sym, $cmds) = $self->get_binding;
3377	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378	$self->set_command_list ($cmds);
3379	}
3380
3381	sub get_binding {
3382	my ($self) = @_;
3383	return (
3384	$self->{binding}->[0],
3385	$self->{binding}->[1],
3386	[ grep { defined $_ } @{$self->{commands}} ]
3387	);
3388	}
3389
3390	sub clear_command_list {
3391	my ($self) = @_;
3392	$self->{cmdbox}->clear ();
3393	}
3394
3395	sub set_command_list {
3396	my ($self, $cmds) = @_;
3397
3398	$self->{cmdbox}->clear ();
3399	$self->{commands} = $cmds;
3400
3401	my $idx = 0;
3402
3403	for (@$cmds) {
3404	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406	my $i = $idx;
3407	$hb->add (new CFClient::UI::Label text => $_);
3408	$hb->add (new CFClient::UI::Button
3409	text => "delete",
3410	tooltip => "Deletes the action from the record",
3411	on_activate => sub {
3412	$self->{cmdbox}->remove ($hb);
3413	$cmds->[$i] = undef;
3414	});
3415
3416
3417	$idx++
3418	}
3419	}
3420
3421	#############################################################################
3422
3423	package CFClient::UI::SpellList;
3424
3425	our @ISA = CFClient::UI::Table::;
3426
3427	sub new {
3428	my $class = shift;
3429
3430	my $self = $class->SUPER::new (
3431	binding => [],
3432	commands => [],
3433	@_,
3434	)
3435	}
3436
3437	# XXX: Do sorting? Argl...
3438	sub add_spell {
3439	my ($self, $spell) = @_;
3440	$self->{spells}->{$spell->{name}} = $spell;
3441
3442	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3443	face => $spell->{face},
3444	can_hover => 1,
3445	can_events => 1,
3446	tooltip => $spell->{message});
3447
3448	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449	text => $spell->{name},
3450	can_hover => 1,
3451	can_events => 1,
3452	tooltip => $spell->{message},
3453	expand => 1);
3454
3455	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458	expand => 1);
3459
3460	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461	text => "bind to key",
3462	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463	}
3464
3465	sub rebuild_spell_list {
3466	my ($self) = @_;
3467	$self->{tbl_idx} = 0;
3468	$self->add_spell ($_) for values %{$self->{spells}};
3469	}
3470
3471	sub remove_spell {
3472	my ($self, $spell) = @_;
3473	delete $self->{spells}->{$spell->{name}};
3474	$self->rebuild_spell_list;
3475	}
3476
3477	#############################################################################
3478
3479	package CFClient::UI::Root;	4016	package CFPlus::UI::Root;
3480		4017
3481	our @ISA = CFClient::UI::Container::;	4018	our @ISA = CFPlus::UI::Container::;
3482		4019
		4020	use List::Util qw(min max);
		4021
3483	use CFClient::OpenGL;	4022	use CFPlus::OpenGL;
3484		4023
3485	sub new {	4024	sub new {
3486	my $class = shift;	4025	my $class = shift;
3487		4026
3488	my $self = $class->SUPER::new (	4027	my $self = $class->SUPER::new (
3489	visible => 1,	4028	visible => 1,
3490	@_,	4029	@_,
3491	);	4030	);
3492		4031
3493	Scalar::Util::weaken ($self->{root} = $self);	4032	CFPlus::weaken ($self->{root} = $self);
3494		4033
3495	$self	4034	$self
3496	}	4035	}
3497		4036
3498	sub size_request {	4037	sub size_request {
…		…
3513	$coord = $max - $size if $coord > $max - $size;	4052	$coord = $max - $size if $coord > $max - $size;
3514		4053
3515	int $coord + 0.5	4054	int $coord + 0.5
3516	}	4055	}
3517		4056
3518	sub size_allocate {	4057	sub invoke_size_allocate {
3519	my ($self, $w, $h) = @_;	4058	my ($self, $w, $h) = @_;
3520		4059
3521	for my $child ($self->children) {	4060	for my $child ($self->children) {
3522	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)};
3523		4062
…		…
3527	$X = _to_pixel $X, $W, $self->{w};	4066	$X = _to_pixel $X, $W, $self->{w};
3528	$Y = _to_pixel $Y, $H, $self->{h};	4067	$Y = _to_pixel $Y, $H, $self->{h};
3529		4068
3530	$child->configure ($X, $Y, $W, $H);	4069	$child->configure ($X, $Y, $W, $H);
3531	}	4070	}
		4071
		4072	1
3532	}	4073	}
3533		4074
3534	sub coord2local {	4075	sub coord2local {
3535	my ($self, $x, $y) = @_;	4076	my ($self, $x, $y) = @_;
3536		4077
…		…
3621		4162
3622	delete $queue{$widget+0};	4163	delete $queue{$widget+0};
3623		4164
3624	my ($w, $h) = $widget->size_request;	4165	my ($w, $h) = $widget->size_request;
3625		4166
3626	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4167	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627	$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};
3628		4172
3629	$w = $widget->{force_w} if exists $widget->{force_w};	4173	$w = $widget->{force_w} if exists $widget->{force_w};
3630	$h = $widget->{force_h} if exists $widget->{force_h};	4174	$h = $widget->{force_h} if exists $widget->{force_h};
3631		4175
3632	if ($widget->{req_w} != $w || $widget->{req_h} != $h	4176	if ($widget->{req_w} != $w || $widget->{req_h} != $h
…		…
3659	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4203	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3660		4204
3661	$w = 0 if $w < 0;	4205	$w = 0 if $w < 0;
3662	$h = 0 if $h < 0;	4206	$h = 0 if $h < 0;
3663		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
3664	$w = int $w + 0.5;	4217	$w = int $w + 0.5;
3665	$h = int $h + 0.5;	4218	$h = int $h + 0.5;
3666		4219
3667	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}) {
3668	$widget->{old_w} = $widget->{w};	4221	$widget->{old_w} = $widget->{w};
…		…
3678		4231
3679	while ($self->{post_alloc_hook}) {	4232	while ($self->{post_alloc_hook}) {
3680	$_->()	4233	$_->()
3681	for values %{delete $self->{post_alloc_hook}};	4234	for values %{delete $self->{post_alloc_hook}};
3682	}	4235	}
3683
3684		4236
3685	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4237	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3686	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4238	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3687	glClear GL_COLOR_BUFFER_BIT;	4239	glClear GL_COLOR_BUFFER_BIT;
3688		4240
…		…
3691	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4243	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3692	glMatrixMode GL_MODELVIEW;	4244	glMatrixMode GL_MODELVIEW;
3693	glLoadIdentity;	4245	glLoadIdentity;
3694		4246
3695	{	4247	{
3696	package CFClient::UI::Base;	4248	package CFPlus::UI::Base;
3697		4249
3698	($draw_x, $draw_y, $draw_w, $draw_h) =	4250	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3699	(0, 0, $self->{w}, $self->{h});	4251	(0, 0, $self->{w}, $self->{h});
3700	}
3701		4252
3702	$self->_draw;	4253	$self->_draw;
		4254	}
3703	}	4255	}
3704		4256
3705	#############################################################################	4257	#############################################################################
3706		4258
3707	package CFClient::UI;	4259	package CFPlus::UI;
3708		4260
3709	$ROOT = new CFClient::UI::Root;	4261	$ROOT = new CFPlus::UI::Root;
3710	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4262	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3711		4263
3712	1	4264	1
3713		4265

Diff Legend

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