ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.398 by root, Sat Jul 21 14:32:10 2007 UTC

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

Diff Legend

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