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.399 by root, Sat Jul 21 16:07:53 2007 UTC

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

Diff Legend

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