ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.147 by root, Sat Apr 22 03:50:25 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
16our $TOOLTIP;
13our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
14 70
15# class methods for events 71# class methods for events
16sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 73 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS;
18} 75}
19 76
20sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 78 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS;
22} 80}
23 81
24sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
25 my ($ev) = @_; 83 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 86 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 87 my $widget = $ROOT->find_widget ($x, $y);
30 88
31 $GRAB = $widget; 89 $GRAB = $widget;
32 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
91
92 check_tooltip;
33 } 93 }
34 94
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 96
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
98 if $GRAB;
38} 99}
39 100
40sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
41 my ($ev) = @_; 102 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
43 104
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 106
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 108
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
110 if $GRAB;
49 111
50 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 114 $grab->update if $grab;
53 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
116
117 check_tooltip;
54 } 118 }
55} 119}
56 120
57sub feed_sdl_motion_event { 121sub feed_sdl_motion_event {
58 my ($ev) = @_; 122 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 127 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 128 my $hover = $HOVER; $HOVER = $widget;
65 129
66 $hover->update if $hover && $hover->{can_hover}; 130 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 132
133 check_tooltip;
134 }
135
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER;
71} 138}
72 139
73# convert position array to integers 140# convert position array to integers
74sub harmonize { 141sub harmonize {
75 my ($vals) = @_; 142 my ($vals) = @_;
… …
81 $rem += $_ - $i; 148 $rem += $_ - $i;
82 $_ = $i; 149 $_ = $i;
83 } 150 }
84} 151}
85 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
86############################################################################# 194#############################################################################
87 195
88package CFClient::UI::Base; 196package CFClient::UI::Base;
89 197
90use strict; 198use strict;
… …
93 201
94sub new { 202sub new {
95 my $class = shift; 203 my $class = shift;
96 204
97 my $self = bless { 205 my $self = bless {
98 x => 0, 206 x => "center",
99 y => 0, 207 y => "center",
100 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
211 can_events => 1,
101 @_ 212 @_
102 }, $class; 213 }, $class;
103 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
104 for (keys %$self) { 217 for (keys %$self) {
105 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
106 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
107 } 220 }
108 } 221 }
109 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
110 $self 235 $self
111} 236}
112 237
238sub destroy {
239 my ($self) = @_;
240
241 $self->hide;
242 %$self = ();
243}
244
113sub show { 245sub show {
114 my ($self) = @_; 246 my ($self) = @_;
115 247
116 return if $self->{parent}; 248 return if $self->{parent};
117 249
118 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
119} 251}
120 252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
277
278 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self;
280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
121sub hide { 306sub hide {
122 my ($self) = @_; 307 my ($self) = @_;
123 308
124 return unless $self->{parent}; 309 $self->set_invisible;
125 310
126 $self->{parent}->remove ($self); 311 $self->{parent}->remove ($self)
312 if $self->{parent};
127} 313}
128 314
129sub move { 315sub move_abs {
130 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
131 317
132 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
133 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
134 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
135 321
136 $self->update; 322 $self->update;
137} 323}
138 324
139sub needs_redraw { 325sub set_size {
140 0 326 my ($self, $w, $h) = @_;
327
328 $self->{force_w} = $w;
329 $self->{force_h} = $h;
330
331 $self->realloc;
141} 332}
142 333
143sub size_request { 334sub size_request {
144 require Carp; 335 require Carp;
145 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
147 338
148sub configure { 339sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
150 341
151 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
152 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
154 347
155 # use alignment to adjust x, y 348 # use alignment to adjust x, y
156 349
157 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
158 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
159
160 ($w, $h) = ($w2, $h2);
161 } 352 }
162 353
163 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
164 $self->{x} = $x; 355 $self->{x} = $x;
165 $self->{y} = $y; 356 $self->{y} = $y;
166 $self->update; 357 $self->update;
167 } 358 }
168 359
169 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
362
170 $self->{w} = $w; 363 $self->{alloc_w} = $w;
171 $self->{h} = $h; 364 $self->{alloc_h} = $h;
172 365
173 $self->size_allocate ($w, $h); 366 $self->{root}{size_alloc}{$self+0} = $self;
174 $self->update;
175 } 367 }
176} 368}
177 369
178sub size_allocate { 370sub size_allocate {
179 # nothing to be done 371 # nothing to be done
180} 372}
181 373
182# return top left coordinates 374sub children {
183sub _topleft { 375}
376
377sub set_max_size {
184 my ($self, $x, $y) = @_; 378 my ($self, $w, $h) = @_;
185 379
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h;
382}
383
384sub set_tooltip {
385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
187} 398}
188 399
189# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
190sub coord2local { 401sub coord2local {
191 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
192 403
193 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
194 ($x - $X, $y - $Y)
195} 405}
196 406
197# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
198sub coord2global { 408sub coord2global {
199 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
200 410
201 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
202 ($x + $X, $y + $Y)
203} 412}
204 413
205sub focus_in { 414sub focus_in {
206 my ($self) = @_; 415 my ($self) = @_;
207 416
208 return if $FOCUS == $self; 417 return if $FOCUS == $self;
209 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
210 419
211 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
212 421
213 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
214 423
215 $focus->update if $focus; 424 $focus->update if $focus;
216 $FOCUS->update; 425 $FOCUS->update;
217} 426}
218 427
… …
221 430
222 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
223 432
224 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
225 434
226 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
227 436
228 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
229} 441}
230 442
231sub mouse_motion { } 443sub mouse_motion { }
232sub button_up { } 444sub button_up { }
233sub key_down { } 445sub key_down { }
234sub key_up { } 446sub key_up { }
235 447
236sub button_down { 448sub button_down {
237 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
238 450
239 $self->focus_in; 451 $self->focus_in;
… …
242sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
243sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
244sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
245sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
246sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
247 529
248sub draw { 530sub draw {
249 my ($self) = @_; 531 my ($self) = @_;
250 532
251 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 549 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
269 glEnd; 551 glEnd;
270 glDisable GL_BLEND; 552 glDisable GL_BLEND;
271 } 553 }
554
555 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix;
557 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
559 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1;
564 glEnd;
565 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 }
272} 568}
273 569
274sub _draw { 570sub _draw {
275 my ($self) = @_; 571 my ($self) = @_;
276 572
277 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
278} 574}
279 575
280sub find_widget {
281 my ($self, $x, $y) = @_;
282
283 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286
287 ()
288}
289
290sub set_parent {
291 my ($self, $parent) = @_;
292
293 Scalar::Util::weaken ($self->{parent} = $parent);
294}
295
296sub check_size {
297 my ($self) = @_;
298
299 my ($w, $h) = $self->size_request;
300
301 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w;
303 $self->{req_h} = $h;
304
305 $self->{parent}->check_size
306 if $self->{parent};
307 }
308}
309
310sub update {
311 my ($self) = @_;
312
313 $self->{parent}->update
314 if $self->{parent};
315}
316
317sub connect {
318 my ($self, $signal, $cb) = @_;
319
320 push @{ $self->{signal_cb}{$signal} }, $cb;
321}
322
323sub emit {
324 my ($self, $signal, @args) = @_;
325
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
327 $cb->($self, @args);
328 }
329}
330
331sub DESTROY { 576sub DESTROY {
332 my ($self) = @_; 577 my ($self) = @_;
333 578
579 delete $WIDGET{$self+0};
334 #$self->deactivate; 580 #$self->deactivate;
335} 581}
336 582
337############################################################################# 583#############################################################################
338 584
… …
347 my $class = shift; 593 my $class = shift;
348 594
349 # range [value, low, high, page] 595 # range [value, low, high, page]
350 596
351 $class->SUPER::new ( 597 $class->SUPER::new (
352 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
353 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
354 @_ 600 @_
355 ) 601 )
356} 602}
357 603
358sub _draw { 604sub _draw {
359 my ($self) = @_; 605 my ($self) = @_;
360 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
361 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
362 613
363 glEnable GL_BLEND; 614 glEnable GL_BLEND;
364 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
365 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
366 617
367 glBegin GL_QUADS; 618 glBegin GL_QUADS;
368 glVertex 0 , 0; 619 glVertex 0 , 0;
369 glVertex 0 , $h; 620 glVertex 0 , $h;
370 glVertex $w, $h; 621 glVertex $w, $h;
371 glVertex $w, 0; 622 glVertex $w, 0;
372 glEnd; 623 glEnd;
373 624
374 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
375} 627}
376 628
377############################################################################# 629#############################################################################
378 630
379package CFClient::UI::Empty; 631package CFClient::UI::Empty;
380
381our @ISA = CFClient::UI::Base::;
382
383sub size_request {
384 (0, 0)
385}
386
387sub draw { }
388
389#############################################################################
390
391package CFClient::UI::Container;
392 632
393our @ISA = CFClient::UI::Base::; 633our @ISA = CFClient::UI::Base::;
394 634
395sub new { 635sub new {
396 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
637 $class->SUPER::new (can_events => 0, %arg);
638}
639
640sub size_request {
641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
644}
645
646sub draw { }
647
648#############################################################################
649
650package CFClient::UI::Container;
651
652our @ISA = CFClient::UI::Base::;
653
654sub new {
655 my ($class, %arg) = @_;
397 656
398 my $children = delete $arg{children} || []; 657 my $children = delete $arg{children} || [];
399 658
400 my $self = $class->SUPER::new (children => [], %arg); 659 my $self = $class->SUPER::new (
660 children => [],
661 can_events => 0,
662 %arg,
663 );
401 $self->add ($_) for @$children; 664 $self->add ($_) for @$children;
402 665
403 $self 666 $self
404} 667}
405 668
406sub add { 669sub add {
407 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
408 671
409 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
410 674
411 use sort 'stable'; 675 use sort 'stable';
412 676
413 $self->{children} = [ 677 $self->{children} = [
414 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
415 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
416 ]; 680 ];
417 681
418 $child->check_size; 682 $self->realloc;
683}
684
685sub children {
686 @{ $_[0]{children} }
419} 687}
420 688
421sub remove { 689sub remove {
422 my ($self, $child) = @_; 690 my ($self, $child) = @_;
423 691
424 delete $child->{parent}; 692 delete $child->{parent};
693 $child->hide;
425 694
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 696
428 $self->check_size; 697 $self->realloc;
698}
699
700sub clear {
701 my ($self) = @_;
702
703 my $children = delete $self->{children};
704 $self->{children} = [];
705
706 for (@$children) {
707 delete $_->{parent};
708 $_->hide;
709 }
710
711 $self->realloc;
429} 712}
430 713
431sub find_widget { 714sub find_widget {
432 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
433 716
… …
508} 791}
509 792
510sub update { 793sub update {
511 my ($self) = @_; 794 my ($self) = @_;
512 795
513 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 797 $self->SUPER::update;
516}
517
518sub render_chld {
519 my ($self) = @_;
520
521 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
522 glClearColor 0, 0, 0, 1;
523 glClear GL_COLOR_BUFFER_BIT;
524 $self->child->draw;
525 };
526} 798}
527 799
528sub size_allocate { 800sub size_allocate {
529 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
530 802
531 $self->child->configure (0, 0, $w, $h); 803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
532 806
807sub _render {
808 $_[0]{children}[0]->draw;
809}
810
811sub render_child {
812 my ($self) = @_;
813
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT;
817
533 $self->render_chld; 818 $self->_render;
819 };
534} 820}
535 821
536sub _draw { 822sub _draw {
537 my ($self) = @_; 823 my ($self) = @_;
538 824
539 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
540 826
541 my $tex = $self->{texture} 827 my $tex = $self->{texture}
542 or return; 828 or return;
543 829
544 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1;
548 833
549 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
550 835
551 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
553} 837}
554 838
555############################################################################# 839#############################################################################
556 840
557package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
558 842
559our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
560
561sub new { die }
562
563sub size_request {
564 my ($self) = @_;
565
566 @$self{qw(child_w child_h)} = $self->child->size_request;
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568
569 @$self{qw(child_w child_h)}
570}
571
572sub _draw {
573 my ($self) = @_;
574
575 $self->{children}[1]->draw;
576}
577
578
579#############################################################################
580
581package CFClient::UI::Frame;
582
583our @ISA = CFClient::UI::Bin::;
584
585use CFClient::OpenGL;
586
587sub size_request {
588 my ($self) = @_;
589 my $chld = $self->child
590 or return (0, 0);
591
592 $chld->move (2, 2);
593
594 map { $_ + 4 } $chld->size_request;
595}
596
597sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_;
599
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601}
602
603sub _draw {
604 my ($self) = @_;
605
606 my $chld = $self->child;
607
608 my ($w, $h) = $chld->size_request;
609
610 glBegin GL_QUADS;
611 glColor 0, 0, 0;
612 glVertex 0 , 0;
613 glVertex 0 , $h + 4;
614 glVertex $w + 4 , $h + 4;
615 glVertex $w + 4 , 0;
616 glEnd;
617
618 $chld->draw;
619}
620
621#############################################################################
622
623package CFClient::UI::FancyFrame;
624
625our @ISA = CFClient::UI::Bin::;
626
627use CFClient::OpenGL;
628
629my @tex =
630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
631 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
632 844
633sub new { 845sub new {
634 my $class = shift; 846 my $class = shift;
635 847
636 # TODO: user_x, user_y, overwrite moveto? 848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
855sub size_request {
856 my ($self) = @_;
857
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859
860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
864}
865
866sub size_allocate {
867 my ($self, $w, $h) = @_;
868
869 my $child = $self->child;
870
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873
874 $self->child->configure (0, 0, $w, $h);
875 $self->update;
876}
877
878sub set_offset {
879 my ($self, $x, $y) = @_;
880
881 $self->{view_x} = int $x;
882 $self->{view_y} = int $y;
883
884 $self->update;
885}
886
887# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local {
889 my ($self, $x, $y) = @_;
890
891 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
892}
893
894sub coord2global {
895 my ($self, $x, $y) = @_;
896
897 $x = List::Util::min $self->{w}, $x - $self->{view_x};
898 $y = List::Util::min $self->{h}, $y - $self->{view_y};
899
900 $self->SUPER::coord2global ($x, $y)
901}
902
903sub find_widget {
904 my ($self, $x, $y) = @_;
905
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y)
912 }
913}
914
915sub _render {
916 my ($self) = @_;
917
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919
920 $self->SUPER::_render;
921}
922
923#############################################################################
924
925package CFClient::UI::ScrolledWindow;
926
927our @ISA = CFClient::UI::HBox::;
928
929sub new {
930 my $class = shift;
931
932 my $self;
933
934 my $slider = new CFClient::UI::Slider
935 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]);
939 },
940 ;
941
942 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider,
945 @_,
946 );
947
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider});
951
952 $self
953}
954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976
977#############################################################################
978
979package CFClient::UI::Frame;
980
981our @ISA = CFClient::UI::Bin::;
982
983use CFClient::OpenGL;
984
985sub new {
986 my $class = shift;
987
988 $class->SUPER::new (
989 bg => undef,
990 @_,
991 )
992}
993
994sub _draw {
995 my ($self) = @_;
996
997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
999
1000 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} };
1003
1004 glBegin GL_QUADS;
1005 glVertex 0 , 0;
1006 glVertex 0 , $h;
1007 glVertex $w, $h;
1008 glVertex $w, 0;
1009 glEnd;
1010
1011 glDisable GL_BLEND;
1012 }
1013
1014 $self->SUPER::_draw;
1015}
1016
1017#############################################################################
1018
1019package CFClient::UI::FancyFrame;
1020
1021our @ISA = CFClient::UI::Bin::;
1022
1023use CFClient::OpenGL;
1024
1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032
1033sub new {
1034 my $class = shift;
637 1035
638 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
641 border => 0.8, 1039 border => 0.6,
1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
642 @_ 1043 @_
643 ); 1044 );
644 1045
645 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 1047 align => 0,
647 valign => 1, 1048 valign => 1,
648 text => $self->{title}, 1049 text => $self->{title},
649 fontsize => 1; 1050 fontsize => $self->{border};
650 1051
651 $self 1052 $self
652} 1053}
653 1054
654sub border { 1055sub border {
655 int $_[0]{border} * $::FONTSIZE 1056 int $_[0]{border} * $::FONTSIZE
656} 1057}
657 1058
658sub size_request { 1059sub size_request {
659 my ($self) = @_; 1060 my ($self) = @_;
660
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662 1061
663 my ($w, $h) = $self->SUPER::size_request; 1062 my ($w, $h) = $self->SUPER::size_request;
664 1063
665 ( 1064 (
666 $w + $self->border * 2, 1065 $w + $self->border * 2,
… …
672 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
673 1072
674 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
675 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
676 1075
677 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
678 if $self->{title}; 1077 if $self->{title};
679 1078
680 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
681} 1080}
682 1081
683sub button_down { 1082sub button_down {
684 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
685 1084
1085 my ($w, $h) = @$self{qw(w h)};
686 my $border = $self->border; 1086 my $border = $self->border;
687 1087
688 if ($x < $self->{w} && $x >= $self->{w} - $border 1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
689 && $y < $self->{h} && $y >= $self->{h} - $border) { 1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
690 1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
691 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
692 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
693 1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
1098
694 $self->{motion} = sub { 1099 $self->{motion} = sub {
695 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
696 1101
697 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
698 1104
699 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
700 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
701 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
702 }; 1110 };
703 1111
704 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
705 && $y >= 0 && $y < $border) {
706
707 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
708 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
709 1115
710 $self->{motion} = sub { 1116 $self->{motion} = sub {
711 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
712 1118
713 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
714 1120
715 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
716 $self->update;
717 }; 1122 };
718 } 1123 }
719} 1124}
720 1125
721sub button_up { 1126sub button_up {
… …
734 my ($self) = @_; 1139 my ($self) = @_;
735 1140
736 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
737 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
738 1143
739 glEnable GL_BLEND;
740 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
743 1146
744 my $border = $self->border; 1147 my $border = $self->border;
745 1148
746 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
747 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
748 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
750 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
751 1154
752 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
753 1157
754 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
755 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
756 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
757 1161 $bg->{t} = $ch / $bg->{h};
758 glColor @{ $self->{bg} };
759
760 $bg->{s} = $rep_x;
761 $bg->{t} = $rep_y;
762 $bg->{wrap_mode} = 1;
763 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
764 1164
765 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
766 glDisable GL_BLEND;
767 1166
768 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1168
769 $self->child->draw; 1169 $self->child->draw;
770} 1170}
771 1171
772############################################################################# 1172#############################################################################
773 1173
… …
782sub new { 1182sub new {
783 my $class = shift; 1183 my $class = shift;
784 1184
785 $class->SUPER::new ( 1185 $class->SUPER::new (
786 col_expand => [], 1186 col_expand => [],
787 @_ 1187 @_,
788 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
789} 1193}
790 1194
791sub add { 1195sub add {
792 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
793 1197
794 $child->set_parent ($self); 1198 $child->set_parent ($self);
795 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
796 1200
797 $child->check_size; 1201 $self->realloc;
798} 1202}
799 1203
800# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
801sub clear { 1205sub clear {
802 my ($self) = @_; 1206 my ($self) = @_;
803 1207
1208 my @children = $self->children;
804 delete $self->{children}; 1209 delete $self->{children};
805 $self->update; 1210
1211 for (@children) {
1212 delete $_->{parent};
1213 $_->hide;
1214 }
1215
1216 $self->realloc;
806} 1217}
807 1218
808sub get_wh { 1219sub get_wh {
809 my ($self) = @_; 1220 my ($self) = @_;
810 1221
… …
815 or next; 1226 or next;
816 1227
817 for my $x (0 .. $#$row) { 1228 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 1229 my $widget = $row->[$x]
819 or next; 1230 or next;
820 my ($w, $h) = $widget->size_request; 1231 my ($w, $h) = @$widget{qw(req_w req_h)};
821 1232
822 $w[$x] = max $w[$x], $w; 1233 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 1234 $h[$y] = max $h[$y], $h;
824 } 1235 }
825 } 1236 }
… …
841sub size_allocate { 1252sub size_allocate {
842 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
843 1254
844 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
845 1256
846 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
847 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
848 1259
849 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
850 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
851 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
852 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
906 } 1317 }
907} 1318}
908 1319
909############################################################################# 1320#############################################################################
910 1321
911package CFClient::UI::HBox; 1322package CFClient::UI::Box;
912
913# TODO: wrap into common Box base class
914 1323
915our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
916 1325
917sub size_request { 1326sub size_request {
918 my ($self) = @_; 1327 my ($self) = @_;
919 1328
920 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
921 1330 ? (
922 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
923 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
924 (List::Util::max map $_->[1], @alloc), 1333 )
925 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
926} 1338}
927 1339
928sub size_allocate { 1340sub size_allocate {
929 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
930 1342
931 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
932
933 my $children = $self->{children}; 1344 my $children = $self->{children};
934 1345
935 my @h = map +($_->size_request)[0], @$children; 1346 my @req;
936 1347
937 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
938 1349 @req = ($space / (@$children || 1)) x @$children;
939 if ($req_h > $h) {
940 # ah well, not enough space
941 $_ *= $h / $req_h for @h;
942 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
943 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
944 $exp ||= 1;
945 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
946 for (0 .. $#$children) { 1363 for 0 .. $#$children;
947 my $child = $children->[$_];
948
949 my $alloc_h = $h[$_];
950 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
951 $h[$_] = $alloc_h;
952 } 1364 }
953 } 1365 }
954 1366
955 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
956 1368
957 my $y = 0; 1369 my $pos = 0;
958 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
959 my $child = $children->[$_];
960 my $h = $h[$_]; 1371 my $alloc = $req[$_];
961 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
962 1373
963 $y += $h; 1374 $pos += $alloc;
964 } 1375 }
965 1376
966 1 1377 1
967} 1378}
968 1379
969############################################################################# 1380#############################################################################
970 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
971package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
972 1398
973# TODO: wrap into common Box base class
974
975our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
976 1400
977sub size_request { 1401sub new {
978 my ($self) = @_; 1402 my $class = shift;
979 1403
980 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
981 1405 vertical => 1,
982 ( 1406 @_,
983 (List::Util::max map $_->[0], @alloc),
984 (List::Util::sum map $_->[1], @alloc),
985 ) 1407 )
986} 1408}
987 1409
988sub size_allocate {
989 my ($self, $w, $h) = @_;
990
991 my $children = $self->{children};
992
993 my @h = map +($_->size_request)[1], @$children;
994
995 my $req_h = List::Util::sum @h;
996
997 if ($req_h > $h) {
998 # ah well, not enough space
999 $_ *= $h / $req_h for @h;
1000 } else {
1001 my $exp = List::Util::sum map $_->{expand}, @$children;
1002 $exp ||= 1;
1003
1004 for (0 .. $#$children) {
1005 my $child = $children->[$_];
1006
1007 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1008 }
1009 }
1010
1011 CFClient::UI::harmonize \@h;
1012
1013 my $y = 0;
1014 for (0 .. $#$children) {
1015 my $child = $children->[$_];
1016 my $h = $h[$_];
1017 $child->configure (0, $y, $w, $h);
1018
1019 $y += $h;
1020 }
1021
1022 1
1023}
1024
1025############################################################################# 1410#############################################################################
1026 1411
1027package CFClient::UI::Label; 1412package CFClient::UI::Label;
1028 1413
1029our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1030 1415
1031use CFClient::OpenGL; 1416use CFClient::OpenGL;
1032 1417
1033sub new { 1418sub new {
1034 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1035 1420
1036 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1425 #font => default_font
1426 #text => initial text
1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1430 layout => (new CFClient::Layout),
1038 fontsize => 1, 1431 fontsize => 1,
1039 text => "",
1040 align => -1, 1432 align => -1,
1041 valign => -1, 1433 valign => -1,
1042 padding => 2, 1434 padding_x => 2,
1043 layout => new CFClient::Layout, 1435 padding_y => 2,
1436 can_events => 0,
1044 %arg 1437 %arg
1045 ); 1438 );
1046 1439
1047 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1049 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1050 $self->{template} = $layout; 1443 $self->{template} = $layout;
1051 } 1444 }
1052 1445
1053 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1447 $self->set_markup (delete $self->{markup});
1448 } else {
1449 $self->set_text (delete $self->{text});
1450 }
1055 1451
1056 $self 1452 $self
1057} 1453}
1058 1454
1059sub escape_text { 1455sub escape($) {
1060 local $_ = $_[1]; 1456 local $_ = $_[0];
1061 1457
1062 s/&/&amp;/g; 1458 s/&/&amp;/g;
1063 s/>/&gt;/g; 1459 s/>/&gt;/g;
1064 s/</&lt;/g; 1460 s/</&lt;/g;
1065 1461
1066 $_[1] 1462 $_
1463}
1464
1465sub update {
1466 my ($self) = @_;
1467
1468 delete $self->{texture};
1469 $self->SUPER::update;
1067} 1470}
1068 1471
1069sub set_text { 1472sub set_text {
1070 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1071 1474
1475 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text";
1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1072 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1073 1480
1074 delete $self->{texture}; 1481 $self->realloc;
1075 $self->update; 1482 $self->update;
1076} 1483}
1077 1484
1078sub set_markup { 1485sub set_markup {
1079 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1080 1487
1488 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup";
1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1081 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1082 1495
1083 delete $self->{texture}; 1496 $self->realloc;
1084 $self->update; 1497 $self->update;
1085} 1498}
1086 1499
1087sub size_request { 1500sub size_request {
1088 my ($self) = @_; 1501 my ($self) = @_;
1089 1502
1090 $self->{layout}->set_width; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1508
1093 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1094 1510
1095 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1514
1098 my ($w2, $h2) = $self->{template}->size; 1515 my ($w2, $h2) = $self->{template}->size;
1099 1516
1100 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1101 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1102 } 1519 }
1103 1520
1104 ( 1521 ($w, $h)
1105 $w + $self->{padding} * 2,
1106 $h + $self->{padding} * 2,
1107 )
1108} 1522}
1109 1523
1110sub size_allocate { 1524sub size_allocate {
1111 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1112 1526
1113 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1114} 1529}
1115 1530
1116sub set_fontsize { 1531sub set_fontsize {
1117 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1118 1533
1119 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1120 $self->check_size; 1535 delete $self->{texture};
1536
1537 $self->realloc;
1121} 1538}
1122 1539
1123sub _draw { 1540sub _draw {
1124 my ($self) = @_; 1541 my ($self) = @_;
1125 1542
1543 $self->SUPER::_draw; # draw background, if applicable
1544
1126 my $tex = $self->{texture} ||= do { 1545 my $tex = $self->{texture} ||= do {
1546 $self->{layout}->set_foreground (@{$self->{fg}});
1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1127 $self->{layout}->set_width ($self->{w}); 1548 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1128 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552
1129 new_from_layout CFClient::Texture $self->{layout} 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1554
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5);
1558
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1130 }; 1564 };
1131 1565
1132 glEnable GL_BLEND;
1133 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1134 glEnable GL_TEXTURE_2D; 1566 glEnable GL_TEXTURE_2D;
1135 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1136 1568
1569 if ($tex->{format} == GL_ALPHA) {
1137 glColor @{$self->{fg}}; 1570 glColor @{$self->{fg}};
1138
1139 $self->{ox} = int (
1140 $self->{align} < 0 ? $self->{padding}
1141 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1142 : ($self->{w} - $tex->{w}) * 0.5
1143 );
1144
1145 $self->{oy} = int (
1146 $self->{valign} < 0 ? $self->{padding}
1147 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1148 : ($self->{h} - $tex->{h}) * 0.5
1149 );
1150
1151 $tex->draw_quad ($self->{ox}, $self->{oy}); 1571 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1572 } else {
1573 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1574 }
1152 1575
1153 glDisable GL_TEXTURE_2D; 1576 glDisable GL_TEXTURE_2D;
1154 glDisable GL_BLEND;
1155} 1577}
1156 1578
1157############################################################################# 1579#############################################################################
1158 1580
1159package CFClient::UI::EntryBase; 1581package CFClient::UI::EntryBase;
… …
1164 1586
1165sub new { 1587sub new {
1166 my $class = shift; 1588 my $class = shift;
1167 1589
1168 $class->SUPER::new ( 1590 $class->SUPER::new (
1169 fg => [1, 1, 1], 1591 fg => [1, 1, 1],
1170 bg => [0, 0, 0, 0.2], 1592 bg => [0, 0, 0, 0.2],
1171 active_bg => [1, 1, 1, 0.5], 1593 active_bg => [1, 1, 1, 0.5],
1172 active_fg => [0, 0, 0], 1594 active_fg => [0, 0, 0],
1173 can_hover => 1, 1595 can_hover => 1,
1174 can_focus => 1, 1596 can_focus => 1,
1175 valign => 0, 1597 valign => 0,
1598 can_events => 1,
1599 #text => ...
1176 @_ 1600 @_
1177 ) 1601 )
1178} 1602}
1179 1603
1180sub _set_text { 1604sub _set_text {
… …
1190 $self->{text} = $text; 1614 $self->{text} = $text;
1191 1615
1192 $text =~ s/./*/g if $self->{hidden}; 1616 $text =~ s/./*/g if $self->{hidden};
1193 $self->{layout}->set_text ("$text "); 1617 $self->{layout}->set_text ("$text ");
1194 1618
1195 $self->emit (changed => $self->{text}); 1619 $self->_emit (changed => $self->{text});
1620}
1621
1622sub set_text {
1623 my ($self, $text) = @_;
1624
1625 $self->{cursor} = length $text;
1626 $self->_set_text ($text);
1627
1628 $self->realloc;
1196} 1629}
1197 1630
1198sub get_text { 1631sub get_text {
1199 $_[0]{text} 1632 $_[0]{text}
1200} 1633}
… …
1203 my ($self) = @_; 1636 my ($self) = @_;
1204 1637
1205 my ($w, $h) = $self->SUPER::size_request; 1638 my ($w, $h) = $self->SUPER::size_request;
1206 1639
1207 ($w + 1, $h) # add 1 for cursor 1640 ($w + 1, $h) # add 1 for cursor
1208}
1209
1210sub size_allocate {
1211 my ($self, $w, $h) = @_;
1212
1213 $self->_set_text ($self->{text});
1214}
1215
1216sub set_text {
1217 my ($self, $text) = @_;
1218
1219 $self->{cursor} = length $text;
1220 $self->_set_text ($text);
1221 $self->update;
1222} 1641}
1223 1642
1224sub key_down { 1643sub key_down {
1225 my ($self, $ev) = @_; 1644 my ($self, $ev) = @_;
1226 1645
… …
1228 my $sym = $ev->{sym}; 1647 my $sym = $ev->{sym};
1229 my $uni = $ev->{unicode}; 1648 my $uni = $ev->{unicode};
1230 1649
1231 my $text = $self->get_text; 1650 my $text = $self->get_text;
1232 1651
1233 if ($sym == 8) { 1652 if ($uni == 8) {
1234 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1653 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1235 } elsif ($sym == 127) { 1654 } elsif ($uni == 127) {
1236 substr $text, $self->{cursor}, 1, ""; 1655 substr $text, $self->{cursor}, 1, "";
1237 } elsif ($sym == CFClient::SDLK_LEFT) { 1656 } elsif ($sym == CFClient::SDLK_LEFT) {
1238 --$self->{cursor} if $self->{cursor}; 1657 --$self->{cursor} if $self->{cursor};
1239 } elsif ($sym == CFClient::SDLK_RIGHT) { 1658 } elsif ($sym == CFClient::SDLK_RIGHT) {
1240 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1659 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1241 } elsif ($sym == CFClient::SDLK_HOME) { 1660 } elsif ($sym == CFClient::SDLK_HOME) {
1242 $self->{cursor} = 0; 1661 $self->{cursor} = 0;
1243 } elsif ($sym == CFClient::SDLK_END) { 1662 } elsif ($sym == CFClient::SDLK_END) {
1244 $self->{cursor} = length $text; 1663 $self->{cursor} = length $text;
1245 } elsif ($sym == 27) { 1664 } elsif ($uni == 27) {
1246 $self->emit ('escape'); 1665 $self->_emit ('escape');
1247 } elsif ($uni) { 1666 } elsif ($uni) {
1248 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1249 } 1668 }
1250 1669
1251 $self->_set_text ($text); 1670 $self->_set_text ($text);
1252 $self->update; 1671
1672 $self->realloc;
1253} 1673}
1254 1674
1255sub focus_in { 1675sub focus_in {
1256 my ($self) = @_; 1676 my ($self) = @_;
1257 1677
… …
1333 my ($self, $ev) = @_; 1753 my ($self, $ev) = @_;
1334 1754
1335 my $sym = $ev->{sym}; 1755 my $sym = $ev->{sym};
1336 1756
1337 if ($sym == 13) { 1757 if ($sym == 13) {
1758 unshift @{$self->{history}},
1759 my $txt = $self->get_text;
1760 $self->{history_pointer} = -1;
1761 $self->{history_saveback} = '';
1338 $self->emit (activate => $self->get_text); 1762 $self->_emit (activate => $txt);
1339 $self->update; 1763 $self->update;
1764
1765 } elsif ($sym == CFClient::SDLK_UP) {
1766 if ($self->{history_pointer} < 0) {
1767 $self->{history_saveback} = $self->get_text;
1768 }
1769 if (@{$self->{history} || []} > 0) {
1770 $self->{history_pointer}++;
1771 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1772 $self->{history_pointer} = @{$self->{history} || []} - 1;
1773 }
1774 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1775 }
1776
1777 } elsif ($sym == CFClient::SDLK_DOWN) {
1778 $self->{history_pointer}--;
1779 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1780
1781 if ($self->{history_pointer} >= 0) {
1782 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1783 } else {
1784 $self->set_text ($self->{history_saveback});
1785 }
1340 1786
1341 } else { 1787 } else {
1342 $self->SUPER::key_down ($ev); 1788 $self->SUPER::key_down ($ev);
1343 } 1789 }
1344 1790
… …
1358 1804
1359sub new { 1805sub new {
1360 my $class = shift; 1806 my $class = shift;
1361 1807
1362 $class->SUPER::new ( 1808 $class->SUPER::new (
1363 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1364 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1365 bg => [1, 1, 1, 0.2],
1366 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1367 can_hover => 1, 1813 can_hover => 1,
1368 align => 0, 1814 align => 0,
1369 valign => 0, 1815 valign => 0,
1816 can_events => 1,
1370 @_ 1817 @_
1371 ) 1818 )
1372} 1819}
1373 1820
1821sub activate { }
1822
1374sub button_up { 1823sub button_up {
1375 my ($self, $ev, $x, $y) = @_; 1824 my ($self, $ev, $x, $y) = @_;
1376 1825
1826 $self->emit ("activate")
1377 if ($x >= 0 && $x < $self->{w} 1827 if $x >= 0 && $x < $self->{w}
1378 && $y >= 0 && $y < $self->{h}) { 1828 && $y >= 0 && $y < $self->{h};
1379 $self->emit ("activate");
1380 }
1381} 1829}
1382 1830
1383sub _draw { 1831sub _draw {
1384 my ($self) = @_; 1832 my ($self) = @_;
1385 1833
… …
1387 1835
1388 if ($GRAB == $self) { 1836 if ($GRAB == $self) {
1389 $self->{fg} = $self->{active_fg}; 1837 $self->{fg} = $self->{active_fg};
1390 } 1838 }
1391 1839
1392 glEnable GL_BLEND;
1393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1394 glEnable GL_TEXTURE_2D; 1840 glEnable GL_TEXTURE_2D;
1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1396 glColor 0, 0, 0, 1; 1842 glColor 0, 0, 0, 1;
1397 1843
1398 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1844 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1399 1845
1400 glDisable GL_TEXTURE_2D; 1846 glDisable GL_TEXTURE_2D;
1401 glDisable GL_BLEND;
1402 1847
1403 $self->SUPER::_draw; 1848 $self->SUPER::_draw;
1404} 1849}
1405 1850
1406############################################################################# 1851#############################################################################
… …
1417 1862
1418sub new { 1863sub new {
1419 my $class = shift; 1864 my $class = shift;
1420 1865
1421 $class->SUPER::new ( 1866 $class->SUPER::new (
1422 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1423 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1424 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1871 bg => [0, 0, 0, 0.2],
1872 active_bg => [1, 1, 1, 0.5],
1425 state => 0, 1873 state => 0,
1426 can_hover => 1, 1874 can_hover => 1,
1427 @_ 1875 @_
1428 ) 1876 )
1429} 1877}
1430 1878
1431sub size_request { 1879sub size_request {
1432 my ($self) = @_; 1880 my ($self) = @_;
1433 1881
1434 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1435} 1883}
1436 1884
1437sub button_down { 1885sub button_down {
1438 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1439 1887
1440 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1441 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1442 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1443 $self->emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1444 } 1892 }
1445} 1893}
1446 1894
1447sub _draw { 1895sub _draw {
1448 my ($self) = @_; 1896 my ($self) = @_;
1449 1897
1450 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1451 1899
1452 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1453 1901
1454 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1902 my ($w, $h) = @$self{qw(w h)};
1903
1904 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1455 1905
1456 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1457 1907
1458 glEnable GL_BLEND; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909
1459 glEnable GL_TEXTURE_2D; 1910 glEnable GL_TEXTURE_2D;
1460 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1461
1462 my $tex = $self->{state} ? $tex[1] : $tex[0];
1463
1464 $tex->draw_quad (0, 0, $s, $s); 1911 $tex->draw_quad_alpha (0, 0, $s, $s);
1465
1466 glDisable GL_TEXTURE_2D; 1912 glDisable GL_TEXTURE_2D;
1467 glDisable GL_BLEND;
1468} 1913}
1469 1914
1470############################################################################# 1915#############################################################################
1471 1916
1472package CFClient::UI::Image; 1917package CFClient::UI::Image;
… …
1479our %loaded_images; 1924our %loaded_images;
1480 1925
1481sub new { 1926sub new {
1482 my $class = shift; 1927 my $class = shift;
1483 1928
1484 my $self = $class->SUPER::new (@_); 1929 my $self = $class->SUPER::new (can_events => 0, @_);
1485 1930
1486 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1931 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1487 1932
1488 $loaded_images{$self->{image}} ||= 1933 $loaded_images{$self->{image}} ||=
1489 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1934 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
… …
1515 glTranslate 0, -$self->{w}, 0; 1960 glTranslate 0, -$self->{w}, 0;
1516 1961
1517 ($w, $h) = ($h, $w); 1962 ($w, $h) = ($h, $w);
1518 } 1963 }
1519 1964
1520 glEnable GL_BLEND;
1521 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1522 glEnable GL_TEXTURE_2D; 1965 glEnable GL_TEXTURE_2D;
1523 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1524 1967
1525 $tex->draw_quad (0, 0, $w, $h); 1968 $tex->draw_quad_alpha (0, 0, $w, $h);
1526 1969
1527 glDisable GL_BLEND;
1528 glDisable GL_TEXTURE_2D; 1970 glDisable GL_TEXTURE_2D;
1529} 1971}
1530 1972
1531############################################################################# 1973#############################################################################
1532 1974
1533package CFClient::UI::VGauge; 1975package CFClient::UI::VGauge;
1534 1976
1535our @ISA = CFClient::UI::Base::; 1977our @ISA = CFClient::UI::Base::;
1978
1979use List::Util qw(min max);
1536 1980
1537use CFClient::OpenGL; 1981use CFClient::OpenGL;
1538 1982
1539my %tex = ( 1983my %tex = (
1540 food => [ 1984 food => [
1541 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1985 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1542 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1986 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1543 ], 1987 ],
1544 grace => [ 1988 grace => [
1545 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1989 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1546 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1990 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1547 ], 1991 ],
1548 hp => [ 1992 hp => [
1549 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1550 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1994 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1551 ], 1995 ],
1552 mana => [ 1996 mana => [
1553 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1997 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1554 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1998 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1555 ], 1999 ],
1556); 2000);
1557 2001
1558# eg. VGauge->new (gauge => 'food'), default gauge: food 2002# eg. VGauge->new (gauge => 'food'), default gauge: food
1559sub new { 2003sub new {
… …
1578} 2022}
1579 2023
1580sub set_max { 2024sub set_max {
1581 my ($self, $max) = @_; 2025 my ($self, $max) = @_;
1582 2026
2027 return if $self->{max_val} == $max;
2028
1583 $self->{max_val} = $max; 2029 $self->{max_val} = $max;
2030 $self->update;
1584} 2031}
1585 2032
1586sub set_value { 2033sub set_value {
1587 my ($self, $val, $max) = @_; 2034 my ($self, $val, $max) = @_;
1588 2035
1589 $self->set_max ($max) 2036 $self->set_max ($max)
1590 if defined $max; 2037 if defined $max;
1591 2038
1592 $max = $self->{max_val}; 2039 return if $self->{val} == $val;
2040
1593 $self->{val} = $val; 2041 $self->{val} = $val;
1594
1595 $self->update; 2042 $self->update;
1596} 2043}
1597 2044
1598sub _draw { 2045sub _draw {
1599 my ($self) = @_; 2046 my ($self) = @_;
1600 2047
1601 my $tex = $tex{$self->{type}}; 2048 my $tex = $tex{$self->{type}};
2049 my ($t1, $t2, $t3) = @$tex;
1602 2050
1603 my ($w, $h) = ($self->{w}, $self->{h}); 2051 my ($w, $h) = ($self->{w}, $self->{h});
1604 2052
1605 if ($self->{vertical}) { 2053 if ($self->{vertical}) {
1606 glRotate 90, 0, 0, 1; 2054 glRotate 90, 0, 0, 1;
… …
1608 2056
1609 ($w, $h) = ($h, $w); 2057 ($w, $h) = ($h, $w);
1610 } 2058 }
1611 2059
1612 my $ycut = $self->{val} / ($self->{max_val} || 1); 2060 my $ycut = $self->{val} / ($self->{max_val} || 1);
1613 $ycut = 1 if $self->{val} > $self->{max_val};
1614 2061
1615 my $t1 = $tex->[0]; 2062 my $ycut1 = max 0, min 1, $ycut;
1616 my $t2 = $tex->[1]; 2063 my $ycut2 = max 0, min 1, $ycut - 1;
2064
2065 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2);
1617 2067
1618 glEnable GL_BLEND; 2068 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1620 glEnable GL_TEXTURE_2D; 2070 glEnable GL_TEXTURE_2D;
1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1622 2072
1623 my $h1 = $self->{h} - $ycut * $self->{h};
1624 my $h2 = $ycut * $self->{h};
1625
1626 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2073 glBindTexture GL_TEXTURE_2D, $t1->{name};
1627 glBegin GL_QUADS; 2074 glBegin GL_QUADS;
1628 glTexCoord 0 , 0; glVertex 0 , 0; 2075 glTexCoord 0 , 0; glVertex 0 , 0;
1629 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2076 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1630 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2077 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1631 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2078 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1632 glEnd; 2079 glEnd;
1633 2080
2081 my $ycut1 = List::Util::min 1, $ycut;
1634 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2082 glBindTexture GL_TEXTURE_2D, $t2->{name};
1635 glBegin GL_QUADS; 2083 glBegin GL_QUADS;
1636 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2084 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1637 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2085 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1638 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2086 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1639 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2087 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1640 glEnd; 2088 glEnd;
2089
2090 if ($t3) {
2091 glBindTexture GL_TEXTURE_2D, $t3->{name};
2092 glBegin GL_QUADS;
2093 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2094 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2095 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2096 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2097 glEnd;
2098 }
1641 2099
1642 glDisable GL_BLEND; 2100 glDisable GL_BLEND;
1643 glDisable GL_TEXTURE_2D; 2101 glDisable GL_TEXTURE_2D;
1644} 2102}
1645 2103
… …
1648package CFClient::UI::Gauge; 2106package CFClient::UI::Gauge;
1649 2107
1650our @ISA = CFClient::UI::VBox::; 2108our @ISA = CFClient::UI::VBox::;
1651 2109
1652sub new { 2110sub new {
1653 my ($class, %arg) = shift; 2111 my ($class, %arg) = @_;
1654 2112
1655 my $self = $class->SUPER::new ( 2113 my $self = $class->SUPER::new (
1656 @_, 2114 tooltip => $arg{type},
2115 can_hover => 1,
2116 can_events => 1,
2117 %arg,
1657 ); 2118 );
1658 2119
1659 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2120 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1660 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2121 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1661 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2122 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1662 2123
1663 $self 2124 $self
1664} 2125}
1665 2126
1666sub set_fontsize { 2127sub set_fontsize {
… …
1668 2129
1669 $self->{value}->set_fontsize ($fsize); 2130 $self->{value}->set_fontsize ($fsize);
1670 $self->{max} ->set_fontsize ($fsize); 2131 $self->{max} ->set_fontsize ($fsize);
1671} 2132}
1672 2133
2134sub set_max {
2135 my ($self, $max) = @_;
2136
2137 $self->{gauge}->set_max ($max);
2138 $self->{max}->set_text ($max);
2139}
2140
1673sub set_value { 2141sub set_value {
1674 my ($self, $val, $max) = @_; 2142 my ($self, $val, $max) = @_;
1675 2143
1676 $self->set_max ($max) 2144 $self->set_max ($max)
1677 if defined $max; 2145 if defined $max;
1678 2146
1679 $self->{gauge}->set_value ($val, $max); 2147 $self->{gauge}->set_value ($val, $max);
1680 $self->{value}->set_text ($val); 2148 $self->{value}->set_text ($val);
1681}
1682
1683sub set_max {
1684 my ($self, $max) = @_;
1685
1686 $self->{gauge}->set_max ($max);
1687 $self->{max}->set_text ($max);
1688} 2149}
1689 2150
1690############################################################################# 2151#############################################################################
1691 2152
1692package CFClient::UI::Slider; 2153package CFClient::UI::Slider;
… …
1702 qw(s1_slider.png s1_slider_bg.png); 2163 qw(s1_slider.png s1_slider_bg.png);
1703 2164
1704sub new { 2165sub new {
1705 my $class = shift; 2166 my $class = shift;
1706 2167
1707 # range [value, low, high, page] 2168 # range [value, low, high, page, unit]
1708 2169
1709 # TODO: 0-width page 2170 # TODO: 0-width page
1710 # TODO: req_w/h are wrong with vertical 2171 # TODO: req_w/h are wrong with vertical
1711 # TODO: calculations are off 2172 # TODO: calculations are off
1712 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
1713 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
1714 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5],
1715 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
1716 req_w => 20, 2179 min_w => $::WIDTH / 80,
1717 req_h => 20, 2180 min_h => $::WIDTH / 80,
1718 vertical => 0, 2181 vertical => 0,
1719 can_hover => 1, 2182 can_hover => 1,
1720 inner_pad => 5, 2183 inner_pad => 0.02,
1721 @_ 2184 @_
1722 ); 2185 );
1723 2186
2187 $self->set_value ($self->{range}[0]);
2188 $self->update;
2189
1724 $self 2190 $self
1725} 2191}
1726 2192
2193sub changed { }
2194
2195sub set_range {
2196 my ($self, $range) = @_;
2197
2198 ($range, $self->{range}) = ($self->{range}, $range);
2199
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}";
2202}
2203
2204sub set_value {
2205 my ($self, $value) = @_;
2206
2207 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2208
2209 $hi = $lo + 1 if $hi <= $lo;
2210
2211 $page = $hi - $lo if $page > $hi - $lo;
2212
2213 $value = $lo if $value < $lo;
2214 $value = $hi - $page if $value > $hi - $page;
2215
2216 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2217 if $unit;
2218
2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2220
2221 if ($value != $old_value) {
2222 $self->_emit (changed => $value);
2223 $self->update;
2224 }
2225}
2226
1727sub size_request { 2227sub size_request {
1728 my ($self) = @_; 2228 my ($self) = @_;
1729 2229
1730 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
1731 my $h = $self->{req_h};
1732
1733 $self->{vertical} ? ($h, $w) : ($w, $h)
1734} 2231}
1735 2232
1736sub button_down { 2233sub button_down {
1737 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
1738 2235
1739 $self->SUPER::button_down ($ev, $x, $y); 2236 $self->SUPER::button_down ($ev, $x, $y);
2237
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239
1740 $self->mouse_motion ($ev, $x, $y); 2240 $self->mouse_motion ($ev, $x, $y);
1741} 2241}
1742 2242
1743sub mouse_motion { 2243sub mouse_motion {
1744 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
1745 2245
1746 if ($GRAB == $self) { 2246 if ($GRAB == $self) {
2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2248
2249 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2254 }
2255}
2256
2257sub update {
2258 my ($self) = @_;
2259
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2261 $self->set_value ($self->{range}[0]);
2262
1747 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2263 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100;
1748 2265
1749 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2266 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1750 2267
1751 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2268 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1752 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2269 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1753 2270
1754 $x -= $inner_pad_px; # substract the padding 2271 $value = ($value - $lo) / $range;
1755 $x = $x * ($hi - $lo) / $inner_w + $lo; 2272 $value = $value * $self->{scale} + $self->{offset};
1756 $x = $lo if $x < $lo;
1757 $x = $hi - $page if $x > $hi - $page;
1758 $self->{range}[0] = $x;
1759 2273
1760 $self->emit (changed => $x); 2274 $self->{knob_x} = $value - $knob_w * 0.5;
1761 $self->update; 2275 $self->{knob_w} = $knob_w;
1762 } 2276 });
1763}
1764 2277
1765# the inner_* stuff is for generating a padding for the slider handle, 2278 $self->SUPER::update;
1766# so that the handle doesn't leave the texture. This calculation isn't 100%
1767# correct propably, but it does the job for now
1768sub _calc_inner_pad_px {
1769 my ($self, $w) = @_;
1770 ($w / 100) * $self->{inner_pad} # % to pixels
1771} 2279}
1772 2280
1773sub _draw { 2281sub _draw {
1774 my ($self) = @_; 2282 my ($self) = @_;
1775 2283
1776 $self->SUPER::_draw (); 2284 $self->SUPER::_draw ();
1777 2285
1778 my ($w, $h) = @$self{qw(w h)}; 2286 glScale $self->{w}, $self->{h};
1779 2287
1780 if ($self->{vertical}) { 2288 if ($self->{vertical}) {
1781 # draw a vertical slider like a rotated horizontal slider 2289 # draw a vertical slider like a rotated horizontal slider
1782 2290
2291 glTranslate 1, 0, 0;
1783 glRotate 90, 0, 0, 1; 2292 glRotate 90, 0, 0, 1;
1784 glTranslate 0, -$self->{w}, 0;
1785
1786 ($w, $h) = ($h, $w);
1787 } 2293 }
1788 2294
1789 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2295 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1790 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2296 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1791 2297
1792 my ($value, $lo, $hi, $page) = @{$self->{range}};
1793
1794 $hi = $value + 1 if $lo == $hi;
1795
1796 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1797 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1798
1799 $page = int $page * $inner_w / ($hi - $lo);
1800 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1801
1802 $w -= $page;
1803 $page &= ~1;
1804 glTranslate $page * 0.5, 0, 0;
1805 $page ||= 2;
1806
1807 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1808 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1809
1810 glEnable GL_BLEND;
1811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1812 glEnable GL_TEXTURE_2D; 2298 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1814 2300
1815 # draw background 2301 # draw background
1816 $tex[1]->draw_quad (0, 0, $w, $h); 2302 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1817 2303
1818 # draw handle 2304 # draw handle
1819 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2305 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1820 2306
1821 glDisable GL_BLEND;
1822 glDisable GL_TEXTURE_2D; 2307 glDisable GL_TEXTURE_2D;
1823} 2308}
2309
2310#############################################################################
2311
2312package CFClient::UI::ValSlider;
2313
2314our @ISA = CFClient::UI::HBox::;
2315
2316sub new {
2317 my ($class, %arg) = @_;
2318
2319 my $range = delete $arg{range};
2320
2321 my $self = $class->SUPER::new (
2322 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2323 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2324 to_value => sub { shift },
2325 from_value => sub { shift },
2326 %arg,
2327 );
2328
2329 $self->{slider}->connect (changed => sub {
2330 my ($self, $value) = @_;
2331 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2332 $self->{parent}->emit (changed => $value);
2333 });
2334
2335# $self->{entry}->connect (changed => sub {
2336# my ($self, $value) = @_;
2337# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2338# $self->{parent}->emit (changed => $value);
2339# });
2340
2341 $self->add ($self->{slider}, $self->{entry});
2342
2343 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2344
2345 $self
2346}
2347
2348sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) }
1824 2350
1825############################################################################# 2351#############################################################################
1826 2352
1827package CFClient::UI::TextView; 2353package CFClient::UI::TextView;
1828 2354
… …
1832 2358
1833sub new { 2359sub new {
1834 my $class = shift; 2360 my $class = shift;
1835 2361
1836 my $self = $class->SUPER::new ( 2362 my $self = $class->SUPER::new (
1837 fontsize => 1, 2363 fontsize => 1,
2364 can_events => 0,
2365 #font => default_font
1838 @_, 2366 @_,
1839 2367
1840 layout => (new CFClient::Layout), 2368 layout => (new CFClient::Layout 1),
1841 par => [], 2369 par => [],
1842 height => 0, 2370 height => 0,
1843 children => [ 2371 children => [
1844 (new CFClient::UI::Empty expand => 1), 2372 (new CFClient::UI::Empty expand => 1),
1845 (new CFClient::UI::Slider vertical => 1), 2373 (new CFClient::UI::Slider vertical => 1),
1846 ], 2374 ],
1847 ); 2375 );
1848 2376
1849 $self->{children}[1]->connect (changed => sub { 2377 $self->{children}[1]->connect (changed => sub { $self->update });
1850 $self->update;
1851 });
1852 2378
1853 $self 2379 $self
1854} 2380}
1855 2381
1856sub set_fontsize { 2382sub set_fontsize {
… …
1858 2384
1859 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
1860 $self->reflow; 2386 $self->reflow;
1861} 2387}
1862 2388
2389sub size_allocate {
2390 my ($self, $w, $h) = @_;
2391
2392 $self->SUPER::size_allocate ($w, $h);
2393
2394 $self->{layout}->set_font ($self->{font}) if $self->{font};
2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $self->{layout}->set_width ($self->{children}[0]{w});
2397
2398 $self->reflow;
2399}
2400
1863sub text_height { 2401sub text_size {
1864 my ($self, $text) = @_; 2402 my ($self, $text, $indent) = @_;
1865 2403
1866 my $layout = $self->{layout}; 2404 my $layout = $self->{layout};
1867 2405
1868 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1869 $layout->set_width ($self->{w}); 2407 $layout->set_width ($self->{children}[0]{w} - $indent);
1870 $layout->set_text ($text); 2408 $layout->set_markup ($text);
1871 2409
1872 ($layout->size)[1] 2410 $layout->size
1873} 2411}
1874 2412
1875sub reflow { 2413sub reflow {
1876 my ($self) = @_; 2414 my ($self) = @_;
1877 2415
1878 $self->{need_reflow}++; 2416 $self->{need_reflow}++;
1879 $self->update; 2417 $self->update;
1880} 2418}
1881 2419
1882sub size_allocate { 2420sub set_offset {
2421 my ($self, $offset) = @_;
2422
2423 # todo: base offset on lines or so, not on pixels
2424 $self->{children}[1]->set_value ($offset);
2425}
2426
2427sub clear {
1883 my ($self, $w, $h) = @_; 2428 my ($self) = @_;
1884 2429
1885 $self->SUPER::size_allocate ($w, $h); 2430 $self->{par} = [];
1886 2431 $self->{height} = 0;
1887 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1888 $self->{layout}->set_width ($self->{children}[0]{w});
1889
1890 $self->reflow;
1891} 2433}
1892 2434
1893sub add_paragraph { 2435sub add_paragraph {
1894 my ($self, $color, $text) = @_; 2436 my ($self, $color, $text, $indent) = @_;
1895 2437
1896 #TODO: intelligently "reformat" paragraph 2438 for my $line (split /\n/, $text) {
1897 2439 my ($w, $h) = $self->text_size ($line);
1898 my $height = $self->text_height ($text);
1899
1900 $self->{height} += $height; 2440 $self->{height} += $h;
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2442 }
1901 2443
1902 push @{$self->{par}}, [$height, $color, $text];
1903
1904 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1905 $self->{children}[1]->update;
1906} 2445}
1907 2446
1908sub update { 2447sub update {
1909 my ($self) = @_; 2448 my ($self) = @_;
1910 2449
… …
1912 2451
1913 return unless $self->{h} > 0; 2452 return unless $self->{h} > 0;
1914 2453
1915 delete $self->{texture}; 2454 delete $self->{texture};
1916 2455
1917 $ROOT->on_refresh ($self, sub { 2456 $ROOT->on_post_alloc ($self, sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458
1918 if (delete $self->{need_reflow}) { 2459 if (delete $self->{need_reflow}) {
1919 my $height = 0; 2460 my $height = 0;
1920 2461
1921 $height += $_->[0] = $self->text_height ($_->[2]) 2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
1922 for @{$self->{par}}; 2466 for (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2468 $layout->set_width ($W - $_->[3]);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3];
2472 $_->[1] = $h;
2473 }
2474
2475 $height += $_->[1];
2476 }
1923 2477
1924 $self->{height} = $height; 2478 $self->{height} = $height;
1925 2479
1926 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1927 2481
1928 delete $self->{texture}; 2482 delete $self->{texture};
1929 } 2483 }
1930 2484
1931 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1932 glClearColor 0, 0, 0, 1; 2486 glClearColor 0.5, 0.5, 0.5, 0;
1933 glClear GL_COLOR_BUFFER_BIT; 2487 glClear GL_COLOR_BUFFER_BIT;
1934 2488
2489 my $top = int $self->{children}[1]{range}[0];
2490
2491 my $y0 = $top;
2492 my $y1 = $top + $H;
2493
2494 my $y = 0;
2495
2496 my $layout = $self->{layout};
2497
2498 $layout->set_font ($self->{font}) if $self->{font};
2499
1935 glEnable GL_BLEND; 2500 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off
1936 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1937 glEnable GL_TEXTURE_2D;
1938 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939
1940 my $top = int $self->{children}[1]{range}[0];
1941
1942 my $y0 = $top;
1943 my $y1 = $top + $self->{h};
1944
1945 my $y = 0;
1946
1947 my $layout = $self->{layout};
1948 2503
1949 for my $par (@{$self->{par}}) { 2504 for my $par (@{$self->{par}}) {
1950 my $h = $par->[0]; 2505 my $h = $par->[1];
1951 2506
1952 if ($y0 < $y + $h && $y < $y1) { 2507 if ($y0 < $y + $h && $y < $y1) {
2508 $layout->set_foreground (@{ $par->[2] });
2509 $layout->set_width ($W - $par->[3]);
1953 $layout->set_text ($par->[2]); 2510 $layout->set_markup ($par->[4]);
1954 2511
1955 glColor @{ $par->[1] }; 2512 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1956 my ($W, $H) = $layout->size; 2513
1957 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2514 glRasterPos $par->[3], $y - $y0;
2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
1958 } 2516 }
1959 2517
1960 $y += $h; 2518 $y += $h;
1961 } 2519 }
1962 2520
1963 glDisable GL_TEXTURE_2D;
1964 glDisable GL_BLEND; 2521 glDisable GL_BLEND;
1965 }; 2522 };
1966 }); 2523 });
1967} 2524}
1968 2525
1969sub _draw { 2526sub _draw {
1970 my ($self) = @_; 2527 my ($self) = @_;
1971 2528
1972 if ($self->{texture}) {
1973 glEnable GL_TEXTURE_2D; 2529 glEnable GL_TEXTURE_2D;
1974 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531 glColor 1, 1, 1, 1;
1975 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1976 glDisable GL_TEXTURE_2D; 2533 glDisable GL_TEXTURE_2D;
1977 }
1978 2534
1979 $self->{children}[1]->draw; 2535 $self->{children}[1]->draw;
1980 2536
1981} 2537}
1982 2538
… …
2030 2586
2031sub new { 2587sub new {
2032 my $class = shift; 2588 my $class = shift;
2033 2589
2034 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
2035 state => 0, 2591 state => 0,
2036 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
2037 @_ 2593 @_
2038 ); 2594 );
2039 2595
2040 if ($self->{state}) {
2041 $self->{state} = 0;
2042 $self->toggle_flopper;
2043 }
2044
2045 $self 2596 $self
2046} 2597}
2047 2598
2048sub toggle_flopper { 2599sub toggle_flopper {
2049 my ($self) = @_; 2600 my ($self) = @_;
2050 2601
2051 # TODO: use animation 2602 $self->{other}->toggle_visibility;
2052 if ($self->{state} = !$self->{state}) { 2603}
2053 $CFClient::UI::ROOT->add ($self->{other}); 2604
2054 $self->{other}->move ($self->coord2global (0, $self->{h})); 2605#############################################################################
2606
2607package CFClient::UI::Tooltip;
2608
2609our @ISA = CFClient::UI::Bin::;
2610
2611use CFClient::OpenGL;
2612
2613sub new {
2614 my $class = shift;
2615
2616 $class->SUPER::new (
2617 @_,
2618 can_events => 0,
2619 )
2620}
2621
2622sub set_tooltip_from {
2623 my ($self, $widget) = @_;
2624
2625 my $tooltip = $widget->{tooltip};
2626
2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2634 $self->add (new CFClient::UI::Label
2635 markup => $tooltip,
2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2637 fontsize => 0.8,
2638 fg => [0, 0, 0, 1],
2639 ellipsise => 0,
2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
2641 );
2642}
2643
2644sub size_request {
2645 my ($self) = @_;
2646
2647 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2648
2649 ($w + 4, $h + 4)
2650}
2651
2652sub size_allocate {
2653 my ($self, $w, $h) = @_;
2654
2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2656}
2657
2658sub visibility_change {
2659 my ($self, $visible) = @_;
2660
2661 return unless $visible;
2662
2663 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner}
2665 or return;
2666
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH;
2671
2672 $self->move_abs ($x, $y);
2673 });
2674}
2675
2676sub _draw {
2677 my ($self) = @_;
2678
2679 glTranslate 0.375, 0.375;
2680
2681 my ($w, $h) = @$self{qw(w h)};
2682
2683 glColor 1, 0.8, 0.4;
2684 glBegin GL_QUADS;
2685 glVertex 0 , 0;
2686 glVertex 0 , $h;
2687 glVertex $w, $h;
2688 glVertex $w, 0;
2689 glEnd;
2690
2691 glColor 0, 0, 0;
2692 glBegin GL_LINE_LOOP;
2693 glVertex 0 , 0;
2694 glVertex 0 , $h;
2695 glVertex $w, $h;
2696 glVertex $w, 0;
2697 glEnd;
2698
2699 glTranslate 2 - 0.375, 2 - 0.375;
2700
2701 $self->SUPER::_draw;
2702}
2703
2704#############################################################################
2705
2706package CFClient::UI::Face;
2707
2708our @ISA = CFClient::UI::Base::;
2709
2710use CFClient::OpenGL;
2711
2712sub new {
2713 my $class = shift;
2714
2715 my $self = $class->SUPER::new (
2716 aspect => 1,
2717 can_events => 0,
2718 @_,
2719 );
2720
2721 if ($self->{anim} && $self->{animspeed}) {
2722 Scalar::Util::weaken (my $widget = $self);
2723
2724 $self->{timer} = Event->timer (
2725 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2726 hard => 1,
2727 interval => $self->{animspeed},
2728 cb => sub {
2729 ++$widget->{frame};
2730 $widget->update;
2731 },
2732 );
2733 }
2734
2735 $self
2736}
2737
2738sub size_request {
2739 (32, 8)
2740}
2741
2742sub update {
2743 my ($self) = @_;
2744
2745 return unless $self->{visible};
2746
2747 $self->SUPER::update;
2748}
2749
2750sub _draw {
2751 my ($self) = @_;
2752
2753 return unless $::CONN;
2754
2755 my $face;
2756
2757 if ($self->{frame}) {
2758 my $anim = $::CONN->{anim}[$self->{anim}];
2759
2760 $face = $anim->[ $self->{frame} % @$anim ]
2761 if $anim && @$anim;
2762 }
2763
2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2765
2766 if ($tex) {
2767 glEnable GL_TEXTURE_2D;
2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769 glColor 1, 1, 1, 1;
2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771 glDisable GL_TEXTURE_2D;
2772 }
2773}
2774
2775sub DESTROY {
2776 my ($self) = @_;
2777
2778 $self->{timer}->cancel
2779 if $self->{timer};
2780
2781 $self->SUPER::DESTROY;
2782}
2783
2784#############################################################################
2785
2786package CFClient::UI::Menu;
2787
2788our @ISA = CFClient::UI::FancyFrame::;
2789
2790use CFClient::OpenGL;
2791
2792sub new {
2793 my $class = shift;
2794
2795 my $self = $class->SUPER::new (
2796 items => [],
2797 z => 100,
2798 @_,
2799 );
2800
2801 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2802
2803 for my $item (@{ $self->{items} }) {
2804 my ($widget, $cb) = @$item;
2805
2806 # handle various types of items, only text for now
2807 if (!ref $widget) {
2808 $widget = new CFClient::UI::Label
2809 can_hover => 1,
2810 can_events => 1,
2811 text => $widget;
2812 }
2813
2814 $self->{item}{$widget} = $item;
2815
2816 $self->{vbox}->add ($widget);
2817 }
2818
2819 $self
2820}
2821
2822# popup given the event (must be a mouse button down event currently)
2823sub popup {
2824 my ($self, $ev) = @_;
2825
2826 $self->_emit ("popdown");
2827
2828 # maybe save $GRAB? must be careful about events...
2829 $GRAB = $self;
2830 $self->{button} = $ev->{button};
2831
2832 $self->show;
2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2834}
2835
2836sub mouse_motion {
2837 my ($self, $ev, $x, $y) = @_;
2838
2839 # TODO: should use vbox->find_widget or so
2840 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841 $self->{hover} = $self->{item}{$HOVER};
2842}
2843
2844sub button_up {
2845 my ($self, $ev, $x, $y) = @_;
2846
2847 if ($ev->{button} == $self->{button}) {
2848 undef $GRAB;
2849 $self->hide;
2850
2055 $self->emit ("open"); 2851 $self->_emit ("popdown");
2852 $self->{hover}[1]->() if $self->{hover};
2853 }
2854}
2855
2856#############################################################################
2857
2858package CFClient::UI::Statusbox;
2859
2860our @ISA = CFClient::UI::VBox::;
2861
2862sub new {
2863 my $class = shift;
2864
2865 $class->SUPER::new (
2866 fontsize => 0.8,
2867 @_,
2868 )
2869}
2870
2871sub reorder {
2872 my ($self) = @_;
2873 my $NOW = time;
2874
2875 while (my ($k, $v) = each %{ $self->{item} }) {
2876 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877 }
2878
2879 my @widgets;
2880
2881 my @items = sort {
2882 $a->{pri} <=> $b->{pri}
2883 or $b->{id} <=> $a->{id}
2884 } values %{ $self->{item} };
2885
2886 my $count = 10 + 1;
2887 for my $item (@items) {
2888 last unless --$count;
2889
2890 push @widgets, $item->{label} ||= do {
2891 # TODO: doesn't handle markup well (read as: at all)
2892 my $short = $item->{count} > 1
2893 ? "<b>$item->{count} ×</b> $item->{text}"
2894 : $item->{text};
2895
2896 for ($short) {
2897 s/^\s+//;
2898 s/\s+/ /g;
2899 }
2900
2901 new CFClient::UI::Label
2902 markup => $short,
2903 tooltip => $item->{tooltip},
2904 tooltip_font => $::FONT_PROP,
2905 tooltip_width => 0.67,
2906 fontsize => $item->{fontsize} || $self->{fontsize},
2907 max_w => $::WIDTH * 0.44,
2908 fg => $item->{fg},
2909 can_events => 1,
2910 can_hover => 1
2911 };
2912 }
2913
2914 $self->clear;
2915 $self->SUPER::add (reverse @widgets);
2916}
2917
2918sub add {
2919 my ($self, $text, %arg) = @_;
2920
2921 $text =~ s/^\s+//;
2922 $text =~ s/\s+$//;
2923
2924 return unless $text;
2925
2926 my $timeout = time + ((delete $arg{timeout}) || 60);
2927
2928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929
2930 if (my $item = $self->{item}{$group}) {
2931 if ($item->{text} eq $text) {
2932 $item->{count}++;
2933 } else {
2934 $item->{count} = 1;
2935 $item->{text} = $item->{tooltip} = $text;
2936 }
2937 $item->{id} = ++$self->{id};
2938 $item->{timeout} = $timeout;
2939 delete $item->{label};
2056 } else { 2940 } else {
2057 $CFClient::UI::ROOT->remove ($self->{other}); 2941 $self->{item}{$group} = {
2058 $self->emit ("close"); 2942 id => ++$self->{id},
2943 text => $text,
2944 timeout => $timeout,
2945 tooltip => $text,
2946 fg => [0.8, 0.8, 0.8, 0.8],
2947 pri => 0,
2948 count => 1,
2949 %arg,
2950 };
2059 } 2951 }
2060 2952
2061 $self->emit (changed => $self->{state}); 2953 $self->reorder;
2954}
2955
2956sub reconfigure {
2957 my ($self) = @_;
2958
2959 delete $_->{label}
2960 for values %{ $self->{item} || {} };
2961
2962 $self->reorder;
2963 $self->SUPER::reconfigure;
2062} 2964}
2063 2965
2064############################################################################# 2966#############################################################################
2065 2967
2968package CFClient::UI::Inventory;
2969
2970our @ISA = CFClient::UI::ScrolledWindow::;
2971
2972sub new {
2973 my $class = shift;
2974
2975 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_,
2978 );
2979
2980 $self
2981}
2982
2983sub set_items {
2984 my ($self, $items) = @_;
2985
2986 $self->{scrolled}->clear;
2987 return unless $items;
2988
2989 my @items = sort {
2990 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name})
2992 } @$items;
2993
2994 $self->{real_items} = \@items;
2995
2996 my $row = 0;
2997 for my $item (@items) {
2998 CFClient::Item::update_widgets $item;
2999
3000 $self->{scrolled}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3003
3004 $row++;
3005 }
3006}
3007
3008#############################################################################
3009
3010package CFClient::UI::BindEditor;
3011
3012our @ISA = CFClient::UI::FancyFrame::;
3013
3014sub new {
3015 my $class = shift;
3016
3017 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3018
3019 $self->add (my $vb = new CFClient::UI::VBox);
3020
3021
3022 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3023 text => "start recording",
3024 tooltip => "Start/Stops recording of actions."
3025 ."All subsequent actions after the recording started will be captured."
3026 ."The actions are displayed after the record was stopped."
3027 ."To bind the action you have to click on the 'Bind' button",
3028 on_activate => sub {
3029 unless ($self->{recording}) {
3030 $self->start;
3031 } else {
3032 $self->stop;
3033 }
3034 });
3035
3036 $vb->add (new CFClient::UI::Label text => "Actions:");
3037 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3038
3039 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3040 $vb->add (my $hb = new CFClient::UI::HBox);
3041 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3042 $hb->add (new CFClient::UI::Button
3043 text => "bind",
3044 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3045 on_activate => sub {
3046 $self->ask_for_bind;
3047 });
3048
3049 $vb->add (my $hb = new CFClient::UI::HBox);
3050 $hb->add (new CFClient::UI::Button
3051 text => "ok",
3052 expand => 1,
3053 tooltip => "This closes the binding editor and saves the binding",
3054 on_activate => sub {
3055 $self->hide;
3056 $self->commit;
3057 });
3058
3059 $hb->add (new CFClient::UI::Button
3060 text => "cancel",
3061 expand => 1,
3062 tooltip => "This closes the binding editor without saving",
3063 on_activate => sub {
3064 $self->hide;
3065 $self->{binding_cancel}->()
3066 if $self->{binding_cancel};
3067 });
3068
3069 $self->update_binding_widgets;
3070
3071 $self
3072}
3073
3074sub commit {
3075 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3079 ."'. Don't forget 'Save Config'!");
3080 $self->{binding_change}->($mod, $sym, $cmds)
3081 if $self->{binding_change};
3082 } else {
3083 $::STATUSBOX->add ("No action bound, no key or action specified!");
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 }
3087}
3088
3089sub start {
3090 my ($self) = @_;
3091
3092 $self->{rec_btn}->set_text ("stop recording");
3093 $self->{recording} = 1;
3094 $self->clear_command_list;
3095 $::CONN->start_record if $::CONN;
3096}
3097
3098sub stop {
3099 my ($self) = @_;
3100
3101 $self->{rec_btn}->set_text ("start recording");
3102 $self->{recording} = 0;
3103
3104 my $rec;
3105 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec);
3108}
3109
3110# if $commit is true, the binding will be set after the user entered a key combo
3111sub ask_for_bind {
3112 my ($self, $commit) = @_;
3113
3114 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets;
3118 $self->commit if $commit;
3119 });
3120}
3121
3122# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands)
3124# $cb is the callback that is executed on OK
3125# $ccb is the callback that is executed on CANCEL and
3126# when the binding was unsuccessful on OK
3127sub set_binding {
3128 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3129
3130 $self->clear_command_list;
3131 $self->{recording} = 0;
3132 $self->{rec_btn}->set_text ("start recording");
3133
3134 $self->{binding} = [$mod, $sym];
3135 $self->{commands} = $cmds;
3136
3137 $self->{binding_change} = $cb;
3138 $self->{binding_cancel} = $ccb;
3139
3140 $self->update_binding_widgets;
3141}
3142
3143# this is a shortcut method that asks for a binding
3144# and then just binds it.
3145sub do_quick_binding {
3146 my ($self, $cmds) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub {
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1);
3151}
3152
3153sub update_binding_widgets {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3157 $self->set_command_list ($cmds);
3158}
3159
3160sub get_binding {
3161 my ($self) = @_;
3162 return (
3163 $self->{binding}->[0],
3164 $self->{binding}->[1],
3165 [ grep { defined $_ } @{$self->{commands}} ]
3166 );
3167}
3168
3169sub clear_command_list {
3170 my ($self) = @_;
3171 $self->{cmdbox}->clear ();
3172}
3173
3174sub set_command_list {
3175 my ($self, $cmds) = @_;
3176
3177 $self->{cmdbox}->clear ();
3178 $self->{commands} = $cmds;
3179
3180 my $idx = 0;
3181
3182 for (@$cmds) {
3183 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3184
3185 my $i = $idx;
3186 $hb->add (new CFClient::UI::Label text => $_);
3187 $hb->add (new CFClient::UI::Button
3188 text => "delete",
3189 tooltip => "Deletes the action from the record",
3190 on_activate => sub {
3191 $self->{cmdbox}->remove ($hb);
3192 $cmds->[$i] = undef;
3193 });
3194
3195
3196 $idx++
3197 }
3198}
3199
3200#############################################################################
3201
3202package CFClient::UI::SpellList;
3203
3204our @ISA = CFClient::UI::FancyFrame::;
3205
3206sub new {
3207 my $class = shift;
3208
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3210
3211 $self->add (new CFClient::UI::ScrolledWindow
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3213
3214 $self;
3215}
3216
3217# XXX: Do sorting? Argl...
3218sub add_spell {
3219 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell;
3221
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249}
3250
3251sub remove_spell {
3252 my ($self, $spell) = @_;
3253 delete $self->{spells}->{$spell->{name}};
3254 $self->rebuild_spell_list;
3255}
3256
3257#############################################################################
3258
2066package CFClient::UI::Root; 3259package CFClient::UI::Root;
2067 3260
2068our @ISA = CFClient::UI::Container::; 3261our @ISA = CFClient::UI::Container::;
2069 3262
2070use CFClient::OpenGL; 3263use CFClient::OpenGL;
2071 3264
2072sub check_size { 3265sub new {
2073 my ($self) = @_; 3266 my $class = shift;
2074 3267
2075 $self->configure (0, 0, $::WITH, $::HEIGHT); 3268 my $self = $class->SUPER::new (
3269 visible => 1,
3270 @_,
3271 );
3272
3273 Scalar::Util::weaken ($self->{root} = $self);
3274
3275 $self
2076} 3276}
2077 3277
2078sub size_request { 3278sub size_request {
2079 ($::WIDTH, $::HEIGHT) 3279 my ($self) = @_;
2080}
2081 3280
2082sub configure { 3281 ($self->{w}, $self->{h})
3282}
3283
3284sub _to_pixel {
3285 my ($coord, $size, $max) = @_;
3286
3287 $coord =
3288 $coord eq "center" ? ($max - $size) * 0.5
3289 : $coord eq "max" ? $max
3290 : $coord;
3291
3292 $coord = 0 if $coord < 0;
3293 $coord = $max - $size if $coord > $max - $size;
3294
3295 int $coord + 0.5
3296}
3297
3298sub size_allocate {
2083 my ($self, $x, $y, $w, $h) = @_; 3299 my ($self, $w, $h) = @_;
2084 3300
2085 $self->SUPER::configure ($x, $y, $w, $h); 3301 for my $child ($self->children) {
3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2086 3303
2087 $_->configure ($_->{x}, $_->{y}, $_->size_request) 3304 $X = $child->{force_x} if exists $child->{force_x};
2088 for @{$self->{children}}; 3305 $Y = $child->{force_y} if exists $child->{force_y};
2089}
2090 3306
2091sub _topleft { 3307 $X = _to_pixel $X, $W, $self->{w};
3308 $Y = _to_pixel $Y, $H, $self->{h};
3309
3310 $child->configure ($X, $Y, $W, $H);
3311 }
3312}
3313
3314sub coord2local {
2092 my ($self, $x, $y) = @_; 3315 my ($self, $x, $y) = @_;
2093 3316
2094 ($x, $y) 3317 ($x, $y)
2095} 3318}
2096 3319
3320sub coord2global {
3321 my ($self, $x, $y) = @_;
3322
3323 ($x, $y)
3324}
3325
2097sub update { 3326sub update {
2098 my ($self) = @_; 3327 my ($self) = @_;
2099 3328
2100 $self->check_size; 3329 $::WANT_REFRESH++;
2101 ::refresh ();
2102} 3330}
2103 3331
2104sub add { 3332sub add {
2105 my ($self, $child) = @_; 3333 my ($self, @children) = @_;
2106 3334
2107 # integerize window positions 3335 $_->{is_toplevel} = 1
2108 $child->{x} = int $child->{x}; 3336 for @children;
2109 $child->{y} = int $child->{y};
2110 3337
2111 $self->SUPER::add ($child); 3338 $self->SUPER::add (@children);
3339}
3340
3341sub remove {
3342 my ($self, @children) = @_;
3343
3344 $self->SUPER::remove (@children);
3345
3346 delete $self->{is_toplevel}
3347 for @children;
3348
3349 while (@children) {
3350 my $w = pop @children;
3351 push @children, $w->children;
3352 $w->set_invisible;
3353 }
2112} 3354}
2113 3355
2114sub on_refresh { 3356sub on_refresh {
2115 my ($self, $id, $cb) = @_; 3357 my ($self, $id, $cb) = @_;
2116 3358
2117 $self->{refresh_hook}{$id} = $cb; 3359 $self->{refresh_hook}{$id} = $cb;
2118} 3360}
2119 3361
3362sub on_post_alloc {
3363 my ($self, $id, $cb) = @_;
3364
3365 $self->{post_alloc_hook}{$id} = $cb;
3366}
3367
2120sub draw { 3368sub draw {
2121 my ($self) = @_; 3369 my ($self) = @_;
2122 3370
2123 while (my $rcb = delete $self->{refresh_hook}) { 3371 while ($self->{refresh_hook}) {
2124 $_->() for values %$rcb; 3372 $_->()
3373 for values %{delete $self->{refresh_hook}};
2125 } 3374 }
3375
3376 if ($self->{realloc}) {
3377 my @queue;
3378
3379 while () {
3380 if ($self->{realloc}) {
3381 #TODO use array-of-depth approach
3382
3383 use sort 'stable';
3384
3385 @queue = sort { $a->{visible} <=> $b->{visible} }
3386 @queue, values %{delete $self->{realloc}};
3387 }
3388
3389 my $widget = pop @queue || last;
3390
3391 $widget->{visible} or last; # do not resize invisible widgets
3392
3393 my ($w, $h) = $widget->size_request;
3394
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3397
3398 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h};
3400
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3402 || delete $widget->{force_realloc}) {
3403 $widget->{req_w} = $w;
3404 $widget->{req_h} = $h;
3405
3406 $self->{size_alloc}{$widget+0} = $widget;
3407
3408 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent;
3410 #unshift @queue, $parent;
3411 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent;
3413 }
3414 }
3415
3416 delete $self->{realloc}{$widget+0};
3417 }
3418 }
3419
3420 while (my $size_alloc = delete $self->{size_alloc}) {
3421 my @queue = sort { $b->{visible} <=> $a->{visible} }
3422 values %$size_alloc;
3423
3424 while () {
3425 my $widget = pop @queue || last;
3426
3427 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3428
3429 $w = 0 if $w < 0;
3430 $h = 0 if $h < 0;
3431
3432 $w = int $w + 0.5;
3433 $h = int $h + 0.5;
3434
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3436 $widget->{w} = $w;
3437 $widget->{h} = $h;
3438
3439 $widget->emit (size_allocate => $w, $h);
3440 }
3441 }
3442 }
3443
3444 while ($self->{post_alloc_hook}) {
3445 $_->()
3446 for values %{delete $self->{post_alloc_hook}};
3447 }
3448
2126 3449
2127 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2128 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2129 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
2130 3453
2131 glMatrixMode GL_PROJECTION; 3454 glMatrixMode GL_PROJECTION;
2132 glLoadIdentity; 3455 glLoadIdentity;
2133 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2134 glMatrixMode GL_MODELVIEW; 3457 glMatrixMode GL_MODELVIEW;
2135 glLoadIdentity; 3458 glLoadIdentity;
2136 3459
2137 $self->_draw; 3460 $self->_draw;
2138} 3461}
… …
2140############################################################################# 3463#############################################################################
2141 3464
2142package CFClient::UI; 3465package CFClient::UI;
2143 3466
2144$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2145 3469
21461 34701
2147 3471

Diff Legend

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