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

Diff Legend

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