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.248 by root, Sun May 28 01:37:45 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines