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

Diff Legend

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