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

Diff Legend

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