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

Diff Legend

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