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

Diff Legend

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