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

Diff Legend

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