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.169 by elmex, Mon Apr 24 10:43:39 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
239} 367}
240 368
369sub children {
370}
371
241sub set_max_size { 372sub set_max_size {
242 my ($self, $w, $h) = @_; 373 my ($self, $w, $h) = @_;
243 374
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 375 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 376 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 377}
247 378
248# return top left coordinates 379sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 380 my ($self, $tooltip) = @_;
251 381
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 382 $tooltip =~ s/^\s+//;
383 $tooltip =~ s/\s+$//;
384
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 }
253} 393}
254 394
255# translate global coordinates to local coordinate system 395# translate global coordinates to local coordinate system
256sub coord2local { 396sub coord2local {
257 my ($self, $x, $y) = @_; 397 my ($self, $x, $y) = @_;
258 398
259 my ($X, $Y) = $self->_topleft; 399 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 400}
262 401
263# translate local coordinates to global coordinate system 402# translate local coordinates to global coordinate system
264sub coord2global { 403sub coord2global {
265 my ($self, $x, $y) = @_; 404 my ($self, $x, $y) = @_;
266 405
267 my ($X, $Y) = $self->_topleft; 406 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 407}
270 408
271sub focus_in { 409sub focus_in {
272 my ($self) = @_; 410 my ($self) = @_;
273 411
274 return if $FOCUS == $self; 412 return if $FOCUS == $self;
275 return unless $self->{can_focus}; 413 return unless $self->{can_focus};
276 414
277 my $focus = $FOCUS; $FOCUS = $self; 415 my $focus = $FOCUS; $FOCUS = $self;
278 416
279 $self->emit (focus_in => $focus); 417 $self->_emit (focus_in => $focus);
280 418
281 $focus->update if $focus; 419 $focus->update if $focus;
282 $FOCUS->update; 420 $FOCUS->update;
283} 421}
284 422
… …
287 425
288 return unless $FOCUS == $self; 426 return unless $FOCUS == $self;
289 427
290 my $focus = $FOCUS; undef $FOCUS; 428 my $focus = $FOCUS; undef $FOCUS;
291 429
292 $self->emit (focus_out => $focus); 430 $self->_emit (focus_out => $focus);
293 431
294 $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;
295} 436}
296 437
297sub mouse_motion { } 438sub mouse_motion { }
298sub button_up { } 439sub button_up { }
299sub key_down { } 440sub key_down { }
300sub key_up { } 441sub key_up { }
301 442
302sub button_down { 443sub button_down {
303 my ($self, $ev, $x, $y) = @_; 444 my ($self, $ev, $x, $y) = @_;
304 445
305 $self->focus_in; 446 $self->focus_in;
… …
308sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 449sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
309sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 450sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
310sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 451sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
311sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 452sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
312sub 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}
313 517
314sub draw { 518sub draw {
315 my ($self) = @_; 519 my ($self) = @_;
316 520
317 return unless $self->{h} && $self->{w}; 521 return unless $self->{h} && $self->{w};
… …
339 if ($ENV{PCLIENT_DEBUG}) { 543 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix; 544 glPushMatrix;
341 glColor 1, 1, 0, 1; 545 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 546 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP; 547 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0; 548 glVertex 0 , 0;
345 glVertex $self->{w}, 0; 549 glVertex $self->{w} - 1, 0;
346 glVertex $self->{w}, $self->{h}; 550 glVertex $self->{w} - 1, $self->{h} - 1;
347 glVertex 0 , $self->{h}; 551 glVertex 0 , $self->{h} - 1;
348 glEnd; 552 glEnd;
349 glPopMatrix; 553 glPopMatrix;
350 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;
351 } 555 }
352} 556}
353 557
354sub _draw { 558sub _draw {
355 my ($self) = @_; 559 my ($self) = @_;
356 560
357 warn "no draw defined for $self\n"; 561 warn "no draw defined for $self\n";
358} 562}
359 563
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 { 564sub DESTROY {
424 my ($self) = @_; 565 my ($self) = @_;
425 566
567 delete $WIDGET{$self+0};
426 #$self->deactivate; 568 #$self->deactivate;
427} 569}
428 570
429############################################################################# 571#############################################################################
430 572
… …
439 my $class = shift; 581 my $class = shift;
440 582
441 # range [value, low, high, page] 583 # range [value, low, high, page]
442 584
443 $class->SUPER::new ( 585 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 586 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 587 #active_bg => [1, 1, 1, 0.5],
446 @_ 588 @_
447 ) 589 )
448} 590}
449 591
450sub _draw { 592sub _draw {
451 my ($self) = @_; 593 my ($self) = @_;
452 594
595 my $color = $FOCUS == $self && $self->{active_bg}
596 ? $self->{active_bg}
597 : $self->{bg};
598
599 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 600 my ($w, $h) = @$self{qw(w h)};
454 601
455 glEnable GL_BLEND; 602 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 604 glColor @$color;
458 605
459 glBegin GL_QUADS; 606 glBegin GL_QUADS;
460 glVertex 0 , 0; 607 glVertex 0 , 0;
461 glVertex 0 , $h; 608 glVertex 0 , $h;
462 glVertex $w, $h; 609 glVertex $w, $h;
463 glVertex $w, 0; 610 glVertex $w, 0;
464 glEnd; 611 glEnd;
465 612
466 glDisable GL_BLEND; 613 glDisable GL_BLEND;
614 }
467} 615}
468 616
469############################################################################# 617#############################################################################
470 618
471package CFClient::UI::Empty; 619package CFClient::UI::Empty;
… …
503 651
504 $self 652 $self
505} 653}
506 654
507sub add { 655sub add {
508 my ($self, $child) = @_; 656 my ($self, @widgets) = @_;
509 657
510 $child->set_parent ($self); 658 $_->set_parent ($self)
659 for @widgets;
511 660
512 use sort 'stable'; 661 use sort 'stable';
513 662
514 $self->{children} = [ 663 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 664 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 665 @{$self->{children}}, @widgets
517 ]; 666 ];
518 667
519 $child->check_size; 668 $self->realloc;
669}
670
671sub children {
672 @{ $_[0]{children} }
520} 673}
521 674
522sub remove { 675sub remove {
523 my ($self, $child) = @_; 676 my ($self, $child) = @_;
524 677
525 delete $child->{parent}; 678 delete $child->{parent};
526 $child->hide; 679 $child->hide;
527 680
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 682
530 $self->check_size; 683 $self->realloc;
531 $self->update;
532} 684}
533 685
534sub clear { 686sub clear {
535 my ($self) = @_; 687 my ($self) = @_;
536 688
… …
539 691
540 for (@$children) { 692 for (@$children) {
541 delete $_->{parent}; 693 delete $_->{parent};
542 $_->hide; 694 $_->hide;
543 } 695 }
696
697 $self->realloc;
544} 698}
545 699
546sub find_widget { 700sub find_widget {
547 my ($self, $x, $y) = @_; 701 my ($self, $x, $y) = @_;
548 702
… …
601sub size_request { 755sub size_request {
602 $_[0]{children}[0]->size_request 756 $_[0]{children}[0]->size_request
603} 757}
604 758
605sub size_allocate { 759sub size_allocate {
606 my ($self, $w, $h) = @_; 760 my ($self, $w, $h, $changed) = @_;
607 761
608 $self->{children}[0]->configure (0, 0, $w, $h); 762 $self->{children}[0]->configure (0, 0, $w, $h);
609} 763}
610 764
611############################################################################# 765#############################################################################
… …
623} 777}
624 778
625sub update { 779sub update {
626 my ($self) = @_; 780 my ($self) = @_;
627 781
628 # we want to do this delayed... 782 $ROOT->on_post_alloc ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 783 $self->SUPER::update;
631} 784}
632 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
633sub render_chld { 798sub render_child {
634 my ($self) = @_; 799 my ($self) = @_;
635 800
636 $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 {
637 glClearColor 0, 0, 0, 1; 802 glClearColor 0, 0, 0, 0;
638 glClear GL_COLOR_BUFFER_BIT; 803 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw; 804
805 $self->_render;
640 }; 806 };
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} 807}
650 808
651sub _draw { 809sub _draw {
652 my ($self) = @_; 810 my ($self) = @_;
653 811
654 my ($w, $h) = ($self->w, $self->h); 812 my ($w, $h) = ($self->w, $self->h);
655 813
656 my $tex = $self->{texture} 814 my $tex = $self->{texture}
657 or return; 815 or return;
658 816
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 817 glEnable GL_TEXTURE_2D;
662 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;
663 820
664 $tex->draw_quad (0, 0, $w, $h); 821 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 822
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 823 glDisable GL_TEXTURE_2D;
668} 824}
669 825
670############################################################################# 826#############################################################################
671 827
672package CFClient::UI::ViewPort; 828package CFClient::UI::ViewPort;
673 829
674our @ISA = CFClient::UI::Window::; 830our @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 831
702sub new { 832sub new {
703 my $class = shift; 833 my $class = shift;
704 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
705 my $self = $class->SUPER::new ( 927 $self = $class->SUPER::new (
706 bg => [1, 1, 1, 1], 928 vp => (new CFClient::UI::ViewPort expand => 1),
707 border_bg => [1, 1, 1, 1], 929 slider => $slider,
708 border => 0.8,
709 @_ 930 @_,
710 ); 931 );
711 932
933 $self->{vp}->add ($self->{scrolled});
934 $self->add ($self->{vp});
935 $self->add ($self->{slider});
936
712 $self 937 $self
713} 938}
714 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
715sub _draw { 979sub _draw {
716 my ($self) = @_; 980 my ($self) = @_;
717 981
718 my ($w, $h) = ($self->{w}, $self->{h}); 982 if ($self->{bg}) {
983 my ($w, $h) = @$self{qw(w h)};
719 984
720 glEnable GL_BLEND; 985 glEnable GL_BLEND;
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 986 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722 glEnable GL_TEXTURE_2D; 987 glColor @{ $self->{bg} };
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724 988
725# glBegin GL_QUADS; 989 glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0; 990 glVertex 0 , 0;
728# glVertex 0 , $h; 991 glVertex 0 , $h;
729# glVertex $w, $h; 992 glVertex $w, $h;
730# glVertex $w, 0; 993 glVertex $w, 0;
731# glEnd; 994 glEnd;
732 995
733
734 $self->child->draw;
735 glDisable GL_BLEND; 996 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D; 997 }
998
999 $self->SUPER::_draw;
737} 1000}
738 1001
739############################################################################# 1002#############################################################################
740 1003
741package CFClient::UI::FancyFrame; 1004package CFClient::UI::FancyFrame;
… …
749 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);
750 1013
751sub new { 1014sub new {
752 my $class = shift; 1015 my $class = shift;
753 1016
754 # TODO: user_x, user_y, overwrite moveto?
755
756 my $self = $class->SUPER::new ( 1017 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 1018 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 1019 border_bg => [1, 1, 1, 1],
759 border => 0.8, 1020 border => 0.6,
1021 is_toplevel => 1,
760 can_events => 1, 1022 can_events => 1,
761 @_ 1023 @_
762 ); 1024 );
763 1025
764 $self->{title} &&= new CFClient::UI::Label 1026 $self->{title} &&= new CFClient::UI::Label
765 align => 0, 1027 align => 0,
766 valign => 1, 1028 valign => 1,
767 text => $self->{title}, 1029 text => $self->{title},
768 fontsize => 1; 1030 fontsize => $self->{border};
769 1031
770 $self 1032 $self
771} 1033}
772 1034
773sub border { 1035sub border {
… …
784 $h + $self->border * 2, 1046 $h + $self->border * 2,
785 ) 1047 )
786} 1048}
787 1049
788sub size_allocate { 1050sub size_allocate {
789 my ($self, $w, $h) = @_; 1051 my ($self, $w, $h, $changed) = @_;
1052
1053 return unless $changed;
790 1054
791 $h -= List::Util::max 0, $self->border * 2; 1055 $h -= List::Util::max 0, $self->border * 2;
792 $w -= List::Util::max 0, $self->border * 2; 1056 $w -= List::Util::max 0, $self->border * 2;
793 1057
794 $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)
795 if $self->{title}; 1059 if $self->{title};
796 1060
797 $self->child->configure ($self->border, $self->border, $w, $h); 1061 $self->child->configure ($self->border, $self->border, $w, $h);
798} 1062}
799 1063
800sub button_down { 1064sub button_down {
801 my ($self, $ev, $x, $y) = @_; 1065 my ($self, $ev, $x, $y) = @_;
802 1066
1067 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 1068 my $border = $self->border;
804 1069
805 if ($x < $self->{w} && $x >= $self->{w} - $border 1070 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 1071 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 1072
1073 if ($lr & $td) {
1074 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1075 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 1076 my ($bw, $bh) = ($self->{w}, $self->{h});
810 1077
1078 my $mx = $x < $border;
1079 my $my = $y < $border;
1080
811 $self->{motion} = sub { 1081 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 1082 my ($ev, $x, $y) = @_;
813 1083
814 ($x, $y) = ($ev->{x}, $ev->{y}); 1084 my $dx = $ev->{x} - $ox;
1085 my $dy = $ev->{y} - $oy;
815 1086
816 $self->{user_w} = $bw + $x - $ox; 1087 $self->{user_x} = $wx + $dx * $mx;
817 $self->{user_h} = $bh + $y - $oy; 1088 $self->{user_y} = $wy + $dy * $my;
818 $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;
819 }; 1093 };
820 1094
821 } elsif ($x >= 0 && $x < $self->{w} 1095 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1096 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 1097 my ($bx, $by) = ($self->{x}, $self->{y});
826 1098
827 $self->{motion} = sub { 1099 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
829 1101
830 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 ($x, $y) = ($ev->{x}, $ev->{y});
831 1103
832 $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});
833 $self->update; 1108 $self->realloc;
834 }; 1109 };
835 } 1110 }
836} 1111}
837 1112
838sub button_up { 1113sub button_up {
… …
851 my ($self) = @_; 1126 my ($self) = @_;
852 1127
853 my ($w, $h ) = ($self->{w}, $self->{h}); 1128 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1129 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855 1130
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D; 1131 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860 1133
861 my $border = $self->border; 1134 my $border = $self->border;
862 1135
863 glColor @{ $self->{border_bg} }; 1136 glColor @{ $self->{border_bg} };
864 $tex[1]->draw_quad (0, 0, $w, $border); 1137 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 1138 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1139 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1140 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
868 1141
1142 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869 my $bg = $tex[0]; 1143 my $bg = $tex[0];
870 1144
871 # TODO: repeat texture not scale 1145 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 1146 my $rep_x = $cw / $bg->{w};
873 my $rep_y = $ch / $bg->{h}; 1147 my $rep_y = $ch / $bg->{h};
874 1148
875 glColor @{ $self->{bg} }; 1149 glColor @{ $self->{bg} };
876 1150
877 $bg->{s} = $rep_x; 1151 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y; 1152 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1; 1153 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 }
881 1156
882 glDisable GL_TEXTURE_2D; 1157 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND;
884 1158
885 $self->{title}->draw if $self->{title}; 1159 $self->{title}->draw if $self->{title};
1160
886 $self->child->draw; 1161 $self->child->draw;
887} 1162}
888 1163
889############################################################################# 1164#############################################################################
890 1165
… …
899sub new { 1174sub new {
900 my $class = shift; 1175 my $class = shift;
901 1176
902 $class->SUPER::new ( 1177 $class->SUPER::new (
903 col_expand => [], 1178 col_expand => [],
904 @_ 1179 @_,
905 ) 1180 )
1181}
1182
1183sub children {
1184 grep $_, map @$_, grep $_, @{ $_[0]{children} }
906} 1185}
907 1186
908sub add { 1187sub add {
909 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
910 1189
911 $child->set_parent ($self); 1190 $child->set_parent ($self);
912 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
913 1192
914 $child->check_size; 1193 $self->realloc;
915} 1194}
916 1195
917# 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?
918sub clear { 1197sub clear {
919 my ($self) = @_; 1198 my ($self) = @_;
920 1199
921 my $children = delete $self->{children}; 1200 my @children = $self->children;
1201 delete $self->{children};
922 1202
923 for (grep $_, map @$_, grep $_, @$children) { 1203 for (@children) {
924 delete $_->{parent}; 1204 delete $_->{parent};
925 $_->hide; 1205 $_->hide;
926 } 1206 }
927 1207
928 $self->update; 1208 $self->realloc;
929} 1209}
930 1210
931sub get_wh { 1211sub get_wh {
932 my ($self) = @_; 1212 my ($self) = @_;
933 1213
… …
960 (sum @$hs), 1240 (sum @$hs),
961 ) 1241 )
962} 1242}
963 1243
964sub size_allocate { 1244sub size_allocate {
965 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
966 1246
967 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
968 1248
969 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
970 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
971 1251
972 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
973 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
974 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
975 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1029 } 1309 }
1030} 1310}
1031 1311
1032############################################################################# 1312#############################################################################
1033 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
1034package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
1035 1375
1036# TODO: wrap into common Box base class
1037
1038our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
1039 1377
1040sub size_request { 1378sub new {
1041 my ($self) = @_; 1379 my $class = shift;
1042 1380
1043 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
1044 1382 vertical => 0,
1045 ( 1383 @_,
1046 (List::Util::sum map $_->[0], @alloc),
1047 (List::Util::max map $_->[1], @alloc),
1048 ) 1384 )
1049} 1385}
1050 1386
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############################################################################# 1387#############################################################################
1093 1388
1094package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1095 1390
1096# TODO: wrap into common Box base class
1097
1098our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1099 1392
1100sub size_request { 1393sub new {
1101 my ($self) = @_; 1394 my $class = shift;
1102 1395
1103 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1104 1397 vertical => 1,
1105 ( 1398 @_,
1106 (List::Util::max map $_->[0], @alloc),
1107 (List::Util::sum map $_->[1], @alloc),
1108 ) 1399 )
1109} 1400}
1110 1401
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############################################################################# 1402#############################################################################
1149 1403
1150package CFClient::UI::Label; 1404package CFClient::UI::Label;
1151 1405
1152our @ISA = CFClient::UI::Base::; 1406our @ISA = CFClient::UI::DrawBG::;
1153 1407
1154use CFClient::OpenGL; 1408use CFClient::OpenGL;
1155 1409
1156sub new { 1410sub new {
1157 my ($class, %arg) = @_; 1411 my ($class, %arg) = @_;
1158 1412
1159 my $self = $class->SUPER::new ( 1413 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1414 fg => [1, 1, 1],
1415 #bg => none
1416 #active_bg => none
1161 #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),
1162 fontsize => 1, 1423 fontsize => 1,
1163 text => "",
1164 align => -1, 1424 align => -1,
1165 valign => -1, 1425 valign => -1,
1166 padding => 2, 1426 padding => 2,
1167 layout => new CFClient::Layout,
1168 can_events => 0, 1427 can_events => 0,
1169 %arg 1428 %arg
1170 ); 1429 );
1171 1430
1172 if (exists $self->{template}) { 1431 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1432 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1433 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1434 $self->{template} = $layout;
1176 } 1435 }
1177 1436
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1437 if (exists $self->{markup}) {
1179 $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 }
1180 1442
1181 $self 1443 $self
1182} 1444}
1183 1445
1184sub escape { 1446sub escape($) {
1185 local $_ = $_[1]; 1447 local $_ = $_[0];
1186 1448
1187 s/&/&amp;/g; 1449 s/&/&amp;/g;
1188 s/>/&gt;/g; 1450 s/>/&gt;/g;
1189 s/</&lt;/g; 1451 s/</&lt;/g;
1190 1452
1191 $_[1] 1453 $_
1454}
1455
1456sub update {
1457 my ($self) = @_;
1458
1459 delete $self->{texture};
1460 $self->SUPER::update;
1192} 1461}
1193 1462
1194sub set_text { 1463sub set_text {
1195 my ($self, $text) = @_; 1464 my ($self, $text) = @_;
1196 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;
1197 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1198 1471
1199 delete $self->{texture}; 1472 $self->realloc;
1200 $self->check_size;
1201 $self->update; 1473 $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; 1488 $self->update;
1212} 1489}
1213 1490
1214sub size_request { 1491sub size_request {
1215 my ($self) = @_; 1492 my ($self) = @_;
1216 1493
1217 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1494 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $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});
1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220 1499
1221 my ($w, $h) = $self->{layout}->size; 1500 my ($w, $h) = $self->{layout}->size;
1222 1501
1223 if (exists $self->{template}) { 1502 if (exists $self->{template}) {
… …
1235 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1236 ) 1515 )
1237} 1516}
1238 1517
1239sub size_allocate { 1518sub size_allocate {
1240 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1241 1520
1242 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1243} 1523}
1244 1524
1245sub set_fontsize { 1525sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1247 1527
1248 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1529 delete $self->{texture};
1250 $self->check_size; 1530
1251 $self->update; 1531 $self->realloc;
1252} 1532}
1253 1533
1254sub _draw { 1534sub _draw {
1255 my ($self) = @_; 1535 my ($self) = @_;
1256 1536
1537 $self->SUPER::_draw; # draw background, if applicable
1538
1257 my $tex = $self->{texture} ||= do { 1539 my $tex = $self->{texture} ||= do {
1540 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1541 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $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});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546
1261 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
1262 }; 1558 };
1263 1559
1264 glEnable GL_BLEND;
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266 glEnable GL_TEXTURE_2D; 1560 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1562
1563 if ($tex->{format} == GL_ALPHA) {
1269 glColor @{$self->{fg}}; 1564 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}); 1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 }
1284 1569
1285 glDisable GL_TEXTURE_2D; 1570 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1571}
1288 1572
1289############################################################################# 1573#############################################################################
1290 1574
1291package CFClient::UI::EntryBase; 1575package CFClient::UI::EntryBase;
… …
1304 active_fg => [0, 0, 0], 1588 active_fg => [0, 0, 0],
1305 can_hover => 1, 1589 can_hover => 1,
1306 can_focus => 1, 1590 can_focus => 1,
1307 valign => 0, 1591 valign => 0,
1308 can_events => 1, 1592 can_events => 1,
1593 #text => ...
1309 @_ 1594 @_
1310 ) 1595 )
1311} 1596}
1312 1597
1313sub _set_text { 1598sub _set_text {
… …
1323 $self->{text} = $text; 1608 $self->{text} = $text;
1324 1609
1325 $text =~ s/./*/g if $self->{hidden}; 1610 $text =~ s/./*/g if $self->{hidden};
1326 $self->{layout}->set_text ("$text "); 1611 $self->{layout}->set_text ("$text ");
1327 1612
1328 $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;
1329} 1623}
1330 1624
1331sub get_text { 1625sub get_text {
1332 $_[0]{text} 1626 $_[0]{text}
1333} 1627}
… …
1336 my ($self) = @_; 1630 my ($self) = @_;
1337 1631
1338 my ($w, $h) = $self->SUPER::size_request; 1632 my ($w, $h) = $self->SUPER::size_request;
1339 1633
1340 ($w + 1, $h) # add 1 for cursor 1634 ($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} 1635}
1356 1636
1357sub key_down { 1637sub key_down {
1358 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1359 1639
… …
1361 my $sym = $ev->{sym}; 1641 my $sym = $ev->{sym};
1362 my $uni = $ev->{unicode}; 1642 my $uni = $ev->{unicode};
1363 1643
1364 my $text = $self->get_text; 1644 my $text = $self->get_text;
1365 1645
1366 if ($sym == 8) { 1646 if ($uni == 8) {
1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1647 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368 } elsif ($sym == 127) { 1648 } elsif ($uni == 127) {
1369 substr $text, $self->{cursor}, 1, ""; 1649 substr $text, $self->{cursor}, 1, "";
1370 } elsif ($sym == CFClient::SDLK_LEFT) { 1650 } elsif ($sym == CFClient::SDLK_LEFT) {
1371 --$self->{cursor} if $self->{cursor}; 1651 --$self->{cursor} if $self->{cursor};
1372 } elsif ($sym == CFClient::SDLK_RIGHT) { 1652 } elsif ($sym == CFClient::SDLK_RIGHT) {
1373 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1653 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1374 } elsif ($sym == CFClient::SDLK_HOME) { 1654 } elsif ($sym == CFClient::SDLK_HOME) {
1375 $self->{cursor} = 0; 1655 $self->{cursor} = 0;
1376 } elsif ($sym == CFClient::SDLK_END) { 1656 } elsif ($sym == CFClient::SDLK_END) {
1377 $self->{cursor} = length $text; 1657 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) { 1658 } elsif ($uni == 27) {
1379 $self->emit ('escape'); 1659 $self->_emit ('escape');
1380 } elsif ($uni) { 1660 } elsif ($uni) {
1381 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1382 } 1662 }
1383 1663
1384 $self->_set_text ($text); 1664 $self->_set_text ($text);
1385 $self->update; 1665
1666 $self->realloc;
1386} 1667}
1387 1668
1388sub focus_in { 1669sub focus_in {
1389 my ($self) = @_; 1670 my ($self) = @_;
1390 1671
… …
1470 if ($sym == 13) { 1751 if ($sym == 13) {
1471 unshift @{$self->{history}}, 1752 unshift @{$self->{history}},
1472 my $txt = $self->get_text; 1753 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1; 1754 $self->{history_pointer} = -1;
1474 $self->{history_saveback} = ''; 1755 $self->{history_saveback} = '';
1475 $self->emit (activate => $txt); 1756 $self->_emit (activate => $txt);
1476 $self->update; 1757 $self->update;
1477 1758
1478 } elsif ($sym == CFClient::SDLK_UP) { 1759 } elsif ($sym == CFClient::SDLK_UP) {
1479 if ($self->{history_pointer} < 0) { 1760 if ($self->{history_pointer} < 0) {
1480 $self->{history_saveback} = $self->get_text; 1761 $self->{history_saveback} = $self->get_text;
… …
1519 my $class = shift; 1800 my $class = shift;
1520 1801
1521 $class->SUPER::new ( 1802 $class->SUPER::new (
1522 padding => 4, 1803 padding => 4,
1523 fg => [1, 1, 1], 1804 fg => [1, 1, 1],
1524 bg => [1, 1, 1, 0.2],
1525 active_fg => [0, 0, 1], 1805 active_fg => [0, 0, 1],
1526 can_hover => 1, 1806 can_hover => 1,
1527 align => 0, 1807 align => 0,
1528 valign => 0, 1808 valign => 0,
1529 can_events => 1, 1809 can_events => 1,
1530 @_ 1810 @_
1531 ) 1811 )
1532} 1812}
1533 1813
1814sub activate { }
1815
1534sub button_up { 1816sub button_up {
1535 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1536 1818
1819 $self->emit ("activate")
1537 if ($x >= 0 && $x < $self->{w} 1820 if $x >= 0 && $x < $self->{w}
1538 && $y >= 0 && $y < $self->{h}) { 1821 && $y >= 0 && $y < $self->{h};
1539 $self->emit ("activate");
1540 }
1541} 1822}
1542 1823
1543sub _draw { 1824sub _draw {
1544 my ($self) = @_; 1825 my ($self) = @_;
1545 1826
… …
1547 1828
1548 if ($GRAB == $self) { 1829 if ($GRAB == $self) {
1549 $self->{fg} = $self->{active_fg}; 1830 $self->{fg} = $self->{active_fg};
1550 } 1831 }
1551 1832
1552 glEnable GL_BLEND;
1553 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1554 glEnable GL_TEXTURE_2D; 1833 glEnable GL_TEXTURE_2D;
1555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1556 glColor 0, 0, 0, 1; 1835 glColor 0, 0, 0, 1;
1557 1836
1558 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1837 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1559 1838
1560 glDisable GL_TEXTURE_2D; 1839 glDisable GL_TEXTURE_2D;
1561 glDisable GL_BLEND;
1562 1840
1563 $self->SUPER::_draw; 1841 $self->SUPER::_draw;
1564} 1842}
1565 1843
1566############################################################################# 1844#############################################################################
… …
1580 1858
1581 $class->SUPER::new ( 1859 $class->SUPER::new (
1582 padding => 2, 1860 padding => 2,
1583 fg => [1, 1, 1], 1861 fg => [1, 1, 1],
1584 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],
1585 state => 0, 1865 state => 0,
1586 can_hover => 1, 1866 can_hover => 1,
1587 @_ 1867 @_
1588 ) 1868 )
1589} 1869}
… …
1598 my ($self, $ev, $x, $y) = @_; 1878 my ($self, $ev, $x, $y) = @_;
1599 1879
1600 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1601 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1602 $self->{state} = !$self->{state}; 1882 $self->{state} = !$self->{state};
1603 $self->emit (changed => $self->{state}); 1883 $self->_emit (changed => $self->{state});
1604 } 1884 }
1605} 1885}
1606 1886
1607sub _draw { 1887sub _draw {
1608 my ($self) = @_; 1888 my ($self) = @_;
… …
1613 1893
1614 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;
1615 1895
1616 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1617 1897
1618 glEnable GL_BLEND; 1898 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899
1619 glEnable GL_TEXTURE_2D; 1900 glEnable GL_TEXTURE_2D;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621
1622 my $tex = $self->{state} ? $tex[1] : $tex[0];
1623
1624 $tex->draw_quad (0, 0, $s, $s); 1901 $tex->draw_quad_alpha (0, 0, $s, $s);
1625
1626 glDisable GL_TEXTURE_2D; 1902 glDisable GL_TEXTURE_2D;
1627 glDisable GL_BLEND;
1628} 1903}
1629 1904
1630############################################################################# 1905#############################################################################
1631 1906
1632package CFClient::UI::Image; 1907package CFClient::UI::Image;
… …
1675 glTranslate 0, -$self->{w}, 0; 1950 glTranslate 0, -$self->{w}, 0;
1676 1951
1677 ($w, $h) = ($h, $w); 1952 ($w, $h) = ($h, $w);
1678 } 1953 }
1679 1954
1680 glEnable GL_BLEND;
1681 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1682 glEnable GL_TEXTURE_2D; 1955 glEnable GL_TEXTURE_2D;
1683 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1684 1957
1685 $tex->draw_quad (0, 0, $w, $h); 1958 $tex->draw_quad_alpha (0, 0, $w, $h);
1686 1959
1687 glDisable GL_BLEND;
1688 glDisable GL_TEXTURE_2D; 1960 glDisable GL_TEXTURE_2D;
1689} 1961}
1690 1962
1691############################################################################# 1963#############################################################################
1692 1964
… …
1740} 2012}
1741 2013
1742sub set_max { 2014sub set_max {
1743 my ($self, $max) = @_; 2015 my ($self, $max) = @_;
1744 2016
2017 return if $self->{max_val} == $max;
2018
1745 $self->{max_val} = $max; 2019 $self->{max_val} = $max;
2020 $self->update;
1746} 2021}
1747 2022
1748sub set_value { 2023sub set_value {
1749 my ($self, $val, $max) = @_; 2024 my ($self, $val, $max) = @_;
1750 2025
1751 $self->set_max ($max) 2026 $self->set_max ($max)
1752 if defined $max; 2027 if defined $max;
1753 2028
1754 $max = $self->{max_val}; 2029 return if $self->{val} == $val;
2030
1755 $self->{val} = $val; 2031 $self->{val} = $val;
1756
1757 $self->update; 2032 $self->update;
1758} 2033}
1759 2034
1760sub _draw { 2035sub _draw {
1761 my ($self) = @_; 2036 my ($self) = @_;
… …
1824 2099
1825sub new { 2100sub new {
1826 my ($class, %arg) = @_; 2101 my ($class, %arg) = @_;
1827 2102
1828 my $self = $class->SUPER::new ( 2103 my $self = $class->SUPER::new (
1829 tooltip => $arg{type}, 2104 tooltip => $arg{type},
1830 can_hover => 1, 2105 can_hover => 1,
2106 can_events => 1,
1831 %arg, 2107 %arg,
1832 ); 2108 );
1833 2109
1834 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2110 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1835 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2111 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1843 2119
1844 $self->{value}->set_fontsize ($fsize); 2120 $self->{value}->set_fontsize ($fsize);
1845 $self->{max} ->set_fontsize ($fsize); 2121 $self->{max} ->set_fontsize ($fsize);
1846} 2122}
1847 2123
2124sub set_max {
2125 my ($self, $max) = @_;
2126
2127 $self->{gauge}->set_max ($max);
2128 $self->{max}->set_text ($max);
2129}
2130
1848sub set_value { 2131sub set_value {
1849 my ($self, $val, $max) = @_; 2132 my ($self, $val, $max) = @_;
1850 2133
1851 $self->set_max ($max) 2134 $self->set_max ($max)
1852 if defined $max; 2135 if defined $max;
1853 2136
1854 $self->{gauge}->set_value ($val, $max); 2137 $self->{gauge}->set_value ($val, $max);
1855 $self->{value}->set_text ($val); 2138 $self->{value}->set_text ($val);
1856}
1857
1858sub set_max {
1859 my ($self, $max) = @_;
1860
1861 $self->{gauge}->set_max ($max);
1862 $self->{max}->set_text ($max);
1863} 2139}
1864 2140
1865############################################################################# 2141#############################################################################
1866 2142
1867package CFClient::UI::Slider; 2143package CFClient::UI::Slider;
… …
1877 qw(s1_slider.png s1_slider_bg.png); 2153 qw(s1_slider.png s1_slider_bg.png);
1878 2154
1879sub new { 2155sub new {
1880 my $class = shift; 2156 my $class = shift;
1881 2157
1882 # range [value, low, high, page] 2158 # range [value, low, high, page, unit]
1883 2159
1884 # TODO: 0-width page 2160 # TODO: 0-width page
1885 # TODO: req_w/h are wrong with vertical 2161 # TODO: req_w/h are wrong with vertical
1886 # TODO: calculations are off 2162 # TODO: calculations are off
1887 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
1888 fg => [1, 1, 1], 2164 fg => [1, 1, 1],
1889 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],
1890 range => [0, 0, 100, 10], 2168 range => [0, 0, 100, 10, 0],
1891 req_w => 20, 2169 req_w => $::WIDTH / 80,
1892 req_h => 20, 2170 req_h => $::WIDTH / 80,
1893 vertical => 0, 2171 vertical => 0,
1894 can_hover => 1, 2172 can_hover => 1,
1895 inner_pad => 5, 2173 inner_pad => 0.02,
1896 @_ 2174 @_
1897 ); 2175 );
1898 2176
2177 $self->set_value ($self->{range}[0]);
2178 $self->update;
2179
1899 $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 }
1900} 2215}
1901 2216
1902sub size_request { 2217sub size_request {
1903 my ($self) = @_; 2218 my ($self) = @_;
1904 2219
… …
1910 2225
1911sub button_down { 2226sub button_down {
1912 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
1913 2228
1914 $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
1915 $self->mouse_motion ($ev, $x, $y); 2233 $self->mouse_motion ($ev, $x, $y);
1916} 2234}
1917 2235
1918sub mouse_motion { 2236sub mouse_motion {
1919 my ($self, $ev, $x, $y) = @_; 2237 my ($self, $ev, $x, $y) = @_;
1920 2238
1921 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
1922 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2256 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100;
1923 2258
1924 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2259 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1925 2260
1926 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2261 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1927 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2262 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1928 2263
1929 $x -= $inner_pad_px; # substract the padding 2264 $value = ($value - $lo) / $range;
1930 $x = $x * ($hi - $lo) / $inner_w + $lo; 2265 $value = $value * $self->{scale} + $self->{offset};
1931 $x = $lo if $x < $lo;
1932 $x = $hi - $page if $x > $hi - $page;
1933 $self->{range}[0] = $x;
1934 2266
1935 $self->emit (changed => $x); 2267 $self->{knob_x} = $value - $knob_w * 0.5;
1936 $self->update; 2268 $self->{knob_w} = $knob_w;
1937 } 2269 });
1938}
1939 2270
1940# the inner_* stuff is for generating a padding for the slider handle, 2271 $self->SUPER::update;
1941# so that the handle doesn't leave the texture. This calculation isn't 100%
1942# correct propably, but it does the job for now
1943sub _calc_inner_pad_px {
1944 my ($self, $w) = @_;
1945 ($w / 100) * $self->{inner_pad} # % to pixels
1946} 2272}
1947 2273
1948sub _draw { 2274sub _draw {
1949 my ($self) = @_; 2275 my ($self) = @_;
1950 2276
1951 $self->SUPER::_draw (); 2277 $self->SUPER::_draw ();
1952 2278
1953 my ($w, $h) = @$self{qw(w h)}; 2279 glScale $self->{w}, $self->{h};
1954 2280
1955 if ($self->{vertical}) { 2281 if ($self->{vertical}) {
1956 # draw a vertical slider like a rotated horizontal slider 2282 # draw a vertical slider like a rotated horizontal slider
1957 2283
2284 glTranslate 1, 0, 0;
1958 glRotate 90, 0, 0, 1; 2285 glRotate 90, 0, 0, 1;
1959 glTranslate 0, -$self->{w}, 0;
1960
1961 ($w, $h) = ($h, $w);
1962 } 2286 }
1963 2287
1964 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2288 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1965 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2289 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1966 2290
1967 my ($value, $lo, $hi, $page) = @{$self->{range}};
1968
1969 $hi = $value + 1 if $lo == $hi;
1970
1971 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1972 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1973
1974 $page = int $page * $inner_w / ($hi - $lo);
1975 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1976
1977 $w -= $page;
1978 $page &= ~1;
1979 glTranslate $page * 0.5, 0, 0;
1980 $page ||= 2;
1981
1982 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1983 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1984
1985 glEnable GL_BLEND;
1986 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1987 glEnable GL_TEXTURE_2D; 2291 glEnable GL_TEXTURE_2D;
1988 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1989 2293
1990 # draw background 2294 # draw background
1991 $tex[1]->draw_quad (0, 0, $w, $h); 2295 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1992 2296
1993 # draw handle 2297 # draw handle
1994 $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);
1995 2299
1996 glDisable GL_BLEND;
1997 glDisable GL_TEXTURE_2D; 2300 glDisable GL_TEXTURE_2D;
1998} 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 (@_) }
1999 2343
2000############################################################################# 2344#############################################################################
2001 2345
2002package CFClient::UI::TextView; 2346package CFClient::UI::TextView;
2003 2347
… …
2012 fontsize => 1, 2356 fontsize => 1,
2013 can_events => 0, 2357 can_events => 0,
2014 #font => default_font 2358 #font => default_font
2015 @_, 2359 @_,
2016 2360
2017 layout => (new CFClient::Layout), 2361 layout => (new CFClient::Layout 1),
2018 par => [], 2362 par => [],
2019 height => 0, 2363 height => 0,
2020 children => [ 2364 children => [
2021 (new CFClient::UI::Empty expand => 1), 2365 (new CFClient::UI::Empty expand => 1),
2022 (new CFClient::UI::Slider vertical => 1), 2366 (new CFClient::UI::Slider vertical => 1),
2023 ], 2367 ],
2024 ); 2368 );
2025 2369
2026 $self->{children}[1]->connect (changed => sub { 2370 $self->{children}[1]->connect (changed => sub { $self->update });
2027 $self->update;
2028 });
2029 2371
2030 $self 2372 $self
2031} 2373}
2032 2374
2033sub set_fontsize { 2375sub set_fontsize {
… …
2035 2377
2036 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2037 $self->reflow; 2379 $self->reflow;
2038} 2380}
2039 2381
2040sub text_height {
2041 my ($self, $text) = @_;
2042
2043 my $layout = $self->{layout};
2044
2045 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2046 $layout->set_width ($self->{w});
2047 $layout->set_text ($text);
2048
2049 ($layout->size)[1]
2050}
2051
2052sub reflow {
2053 my ($self) = @_;
2054
2055 $self->{need_reflow}++;
2056 $self->update;
2057}
2058
2059sub size_allocate { 2382sub size_allocate {
2060 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2061 2384
2062 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2063 2388
2064 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2065 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2066 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2067 2392
2068 $self->reflow; 2393 $self->reflow;
2069} 2394}
2070 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
2071sub add_paragraph { 2430sub add_paragraph {
2072 my ($self, $color, $text) = @_; 2431 my ($self, $color, $text, $indent) = @_;
2073 2432
2074 #TODO: intelligently "reformat" paragraph 2433 for my $line (split /\n/, $text) {
2075 2434 my ($w, $h) = $self->text_size ($line);
2076 my $height = $self->text_height ($text);
2077
2078 $self->{height} += $height; 2435 $self->{height} += $h;
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2437 }
2079 2438
2080 push @{$self->{par}}, [$height, $color, $text];
2081
2082 $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]);
2083 $self->{children}[1]->update;
2084} 2440}
2085 2441
2086sub update { 2442sub update {
2087 my ($self) = @_; 2443 my ($self) = @_;
2088 2444
… …
2090 2446
2091 return unless $self->{h} > 0; 2447 return unless $self->{h} > 0;
2092 2448
2093 delete $self->{texture}; 2449 delete $self->{texture};
2094 2450
2095 $ROOT->on_refresh ($self, sub { 2451 $ROOT->on_post_alloc ($self, sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453
2096 if (delete $self->{need_reflow}) { 2454 if (delete $self->{need_reflow}) {
2097 my $height = 0; 2455 my $height = 0;
2098 2456
2099 $height += $_->[0] = $self->text_height ($_->[2]) 2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2100 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 }
2101 2472
2102 $self->{height} = $height; 2473 $self->{height} = $height;
2103 2474
2104 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2105 2476
2106 delete $self->{texture}; 2477 delete $self->{texture};
2107 } 2478 }
2108 2479
2109 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2110 glClearColor 0, 0, 0, 1; 2481 glClearColor 0.5, 0.5, 0.5, 0;
2111 glClear GL_COLOR_BUFFER_BIT; 2482 glClear GL_COLOR_BUFFER_BIT;
2112 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
2113 glEnable GL_BLEND; 2495 glEnable GL_BLEND;
2496 #TODO# not correct in windows where rgba is forced off
2114 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2497 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2115 glEnable GL_TEXTURE_2D;
2116 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2117
2118 my $top = int $self->{children}[1]{range}[0];
2119
2120 my $y0 = $top;
2121 my $y1 = $top + $self->{h};
2122
2123 my $y = 0;
2124
2125 my $layout = $self->{layout};
2126
2127 $layout->set_font ($self->{font}) if $self->{font};
2128 2498
2129 for my $par (@{$self->{par}}) { 2499 for my $par (@{$self->{par}}) {
2130 my $h = $par->[0]; 2500 my $h = $par->[1];
2131 2501
2132 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]);
2133 $layout->set_text ($par->[2]); 2505 $layout->set_markup ($par->[4]);
2134 2506
2135 glColor @{ $par->[1] }; 2507 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2136 my ($W, $H) = $layout->size; 2508
2137 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;
2138 } 2511 }
2139 2512
2140 $y += $h; 2513 $y += $h;
2141 } 2514 }
2142 2515
2143 glDisable GL_TEXTURE_2D;
2144 glDisable GL_BLEND; 2516 glDisable GL_BLEND;
2145 }; 2517 };
2146 }); 2518 });
2147} 2519}
2148 2520
2149sub _draw { 2521sub _draw {
2150 my ($self) = @_; 2522 my ($self) = @_;
2151 2523
2152 if ($self->{texture}) {
2153 glEnable GL_TEXTURE_2D; 2524 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526 glColor 1, 1, 1, 1;
2155 $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});
2156 glDisable GL_TEXTURE_2D; 2528 glDisable GL_TEXTURE_2D;
2157 }
2158 2529
2159 $self->{children}[1]->draw; 2530 $self->{children}[1]->draw;
2160 2531
2161} 2532}
2162 2533
… …
2210 2581
2211sub new { 2582sub new {
2212 my $class = shift; 2583 my $class = shift;
2213 2584
2214 my $self = $class->SUPER::new ( 2585 my $self = $class->SUPER::new (
2215 state => 0, 2586 state => 0,
2216 connect_activate => \&toggle_flopper, 2587 on_activate => \&toggle_flopper,
2217 @_ 2588 @_
2218 ); 2589 );
2219 2590
2220 if ($self->{state}) {
2221 $self->{state} = 0;
2222 $self->toggle_flopper;
2223 }
2224
2225 $self 2591 $self
2226} 2592}
2227 2593
2228sub toggle_flopper { 2594sub toggle_flopper {
2229 my ($self) = @_; 2595 my ($self) = @_;
2230 2596
2231 # TODO: use animation 2597 $self->{other}->toggle_visibility;
2232 if ($self->{state} = !$self->{state}) {
2233 $CFClient::UI::ROOT->add ($self->{other});
2234 $self->{other}->move ($self->coord2global (0, $self->{h}));
2235 $self->emit ("open");
2236 } else {
2237 $CFClient::UI::ROOT->remove ($self->{other});
2238 $self->emit ("close");
2239 }
2240
2241 $self->emit (changed => $self->{state});
2242} 2598}
2243 2599
2244############################################################################# 2600#############################################################################
2245 2601
2246package CFClient::UI::Tooltip; 2602package CFClient::UI::Tooltip;
… …
2256 @_, 2612 @_,
2257 can_events => 0, 2613 can_events => 0,
2258 ) 2614 )
2259} 2615}
2260 2616
2261sub set_markup { 2617sub set_tooltip_from {
2262 my ($self, $text) = @_; 2618 my ($self, $widget) = @_;
2263 2619
2264 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2620 $self->add (new CFClient::UI::Label
2265 $self->{label}->set_markup ($text); 2621 markup => $widget->{tooltip},
2266 $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 );
2267} 2628}
2268 2629
2269sub size_request { 2630sub size_request {
2270 my ($self) = @_; 2631 my ($self) = @_;
2271 2632
2272 $self->child->set_max_size ($::WIDTH * 0.3);
2273
2274 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2633 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2275 2634
2276 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2277} 2636}
2278 2637
2279sub size_allocate { 2638sub size_allocate {
2280 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2281 2640
2641 return unless $changed;
2642
2282 $self->SUPER::size_allocate ($w - 4, $h - 4); 2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2283} 2644}
2284 2645
2285sub _draw { 2646sub _draw {
2286 my ($self) = @_; 2647 my ($self) = @_;
2287 2648
2288 glPushMatrix;
2289 glTranslate 0.375, 0.375; 2649 glTranslate 0.375, 0.375;
2290 2650
2291 my ($w, $h) = @$self{qw(w h)}; 2651 my ($w, $h) = @$self{qw(w h)};
2292 2652
2293 glColor 1, 0.8, 0.4; 2653 glColor 1, 0.8, 0.4;
… …
2304 glVertex 0 , $h; 2664 glVertex 0 , $h;
2305 glVertex $w, $h; 2665 glVertex $w, $h;
2306 glVertex $w, 0; 2666 glVertex $w, 0;
2307 glEnd; 2667 glEnd;
2308 2668
2309 glPopMatrix; 2669 glTranslate 2 - 0.375, 2 - 0.375;
2310 2670
2311 glTranslate 2, 2;
2312 $self->SUPER::_draw; 2671 $self->SUPER::_draw;
2313} 2672}
2314 2673
2315############################################################################# 2674#############################################################################
2316 2675
… …
2321use CFClient::OpenGL; 2680use CFClient::OpenGL;
2322 2681
2323sub new { 2682sub new {
2324 my $class = shift; 2683 my $class = shift;
2325 2684
2326 $class->SUPER::new ( 2685 my $self = $class->SUPER::new (
2327 aspect => 1, 2686 aspect => 1,
2687 can_events => 0,
2328 @_, 2688 @_,
2329 ) 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
2330} 2706}
2331 2707
2332sub size_request { 2708sub size_request {
2333 (32, 8) 2709 (32, 8)
2334} 2710}
2335 2711
2712sub update {
2713 my ($self) = @_;
2714
2715 return unless $self->{visible};
2716
2717 $self->SUPER::update;
2718}
2719
2336sub draw { 2720sub _draw {
2337 my ($self) = @_; 2721 my ($self) = @_;
2338 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
2339 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2734 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2340 2735
2341 if ($tex) { 2736 if ($tex) {
2342 glEnable GL_BLEND;
2343 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2344 glEnable GL_TEXTURE_2D; 2737 glEnable GL_TEXTURE_2D;
2345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2346 glColor 1, 1, 1, 1; 2739 glColor 1, 1, 1, 1;
2347 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2740 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2348 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2349 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 @_,
2350 } 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;
2351} 2976}
2352 2977
2353############################################################################# 2978#############################################################################
2354 2979
2355package CFClient::UI::Root; 2980package CFClient::UI::Root;
2356 2981
2357our @ISA = CFClient::UI::Container::; 2982our @ISA = CFClient::UI::Container::;
2358 2983
2359use CFClient::OpenGL; 2984use CFClient::OpenGL;
2360 2985
2361sub check_size { 2986sub new {
2362 my ($self) = @_; 2987 my $class = shift;
2363 2988
2364 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2989 my $self = $class->SUPER::new (
2365} 2990 visible => 1,
2991 @_,
2992 );
2366 2993
2367sub size_request { 2994 Scalar::Util::weaken ($self->{root} = $self);
2368 ($::WIDTH, $::HEIGHT) 2995
2996 $self
2369} 2997}
2370 2998
2371sub configure { 2999sub configure {
2372 my ($self, $x, $y, $w, $h) = @_; 3000 my ($self, $x, $y, $w, $h) = @_;
2373 3001
2374 $self->SUPER::configure ($x, $y, $w, $h); 3002 $self->{w} = $w;
3003 $self->{h} = $h;
3004}
2375 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
2376 for my $child (@{$self->{children}}) { 3024 for my $child ($self->children) {
2377 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)};
2378 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
2379 $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;
2380 $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
2381 $child->configure ($X, $Y, $W,$H); 3038 $child->configure ($X, $Y, $W, $H);
2382 } 3039 }
2383} 3040}
2384 3041
2385sub _topleft { 3042sub coord2local {
2386 my ($self, $x, $y) = @_; 3043 my ($self, $x, $y) = @_;
2387 3044
2388 ($x, $y) 3045 ($x, $y)
2389} 3046}
2390 3047
3048sub coord2global {
3049 my ($self, $x, $y) = @_;
3050
3051 ($x, $y)
3052}
3053
2391sub update { 3054sub update {
2392 my ($self) = @_; 3055 my ($self) = @_;
2393 3056
2394 $self->check_size; 3057 $::WANT_REFRESH++;
2395 ::refresh ();
2396} 3058}
2397 3059
2398sub add { 3060sub add {
2399 my ($self, $child) = @_; 3061 my ($self, @children) = @_;
2400 3062
3063 for my $child (@children) {
3064 $child->{is_toplevel} = 1;
3065
2401 # integerize window positions 3066 # integerise window positions
2402 $child->{x} = int $child->{x}; 3067 $child->{x} = int $child->{x};
2403 $child->{y} = int $child->{y}; 3068 $child->{y} = int $child->{y};
3069 }
2404 3070
2405 $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 }
2406} 3084}
2407 3085
2408sub on_refresh { 3086sub on_refresh {
2409 my ($self, $id, $cb) = @_; 3087 my ($self, $id, $cb) = @_;
2410 3088
2411 $self->{refresh_hook}{$id} = $cb; 3089 $self->{refresh_hook}{$id} = $cb;
2412} 3090}
2413 3091
3092sub on_post_alloc {
3093 my ($self, $id, $cb) = @_;
3094
3095 $self->{post_alloc_hook}{$id} = $cb;
3096}
3097
2414sub draw { 3098sub draw {
2415 my ($self) = @_; 3099 my ($self) = @_;
2416 3100
2417 while (my $rcb = delete $self->{refresh_hook}) { 3101 while ($self->{refresh_hook}) {
2418 $_->() 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}};
2419 } 3159 }
2420 3160
2421 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3161 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2422 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3162 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2423 glClear GL_COLOR_BUFFER_BIT; 3163 glClear GL_COLOR_BUFFER_BIT;
2424 3164
2425 glMatrixMode GL_PROJECTION; 3165 glMatrixMode GL_PROJECTION;
2426 glLoadIdentity; 3166 glLoadIdentity;
2427 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3167 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2428 glMatrixMode GL_MODELVIEW; 3168 glMatrixMode GL_MODELVIEW;
2429 glLoadIdentity; 3169 glLoadIdentity;
2430 3170
2431 $self->_draw; 3171 $self->_draw;
2432} 3172}
… …
2434############################################################################# 3174#############################################################################
2435 3175
2436package CFClient::UI; 3176package CFClient::UI;
2437 3177
2438$ROOT = new CFClient::UI::Root; 3178$ROOT = new CFClient::UI::Root;
2439$TOOLTIP = new CFClient::UI::Tooltip; 3179$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2440 3180
24411 31811
2442 3182

Diff Legend

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