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

Diff Legend

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