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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines