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

Diff Legend

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