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.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.398 by root, Sat Jul 21 14:32:10 2007 UTC

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

Diff Legend

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