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

Diff Legend

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