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

Diff Legend

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