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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.249 by root, Sun May 28 01:40:02 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 } 351 }
243} 352}
244 353
245sub size_allocate { 354sub size_allocate {
246 # nothing to be done 355 # nothing to be done
247} 356}
248 357
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363}
364
249sub children { 365sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 366}
261 367
262sub set_max_size { 368sub set_max_size {
263 my ($self, $w, $h) = @_; 369 my ($self, $w, $h) = @_;
264 370
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 371 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 372 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 373}
268 374
269# return top left coordinates 375sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 376 my ($self, $tooltip) = @_;
272 377
273 $self->{parent} 378 $tooltip =~ s/^\s+//;
274 or Carp::confess "no parent widget in _topleft\n";#d# 379 $tooltip =~ s/\s+$//;
275 380
276 $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 }
277} 389}
278 390
279# translate global coordinates to local coordinate system 391# translate global coordinates to local coordinate system
280sub coord2local { 392sub coord2local {
281 my ($self, $x, $y) = @_; 393 my ($self, $x, $y) = @_;
282 394
283 my ($X, $Y) = $self->_topleft; 395 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 396}
286 397
287# translate local coordinates to global coordinate system 398# translate local coordinates to global coordinate system
288sub coord2global { 399sub coord2global {
289 my ($self, $x, $y) = @_; 400 my ($self, $x, $y) = @_;
290 401
291 my ($X, $Y) = $self->_topleft; 402 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 403}
294 404
295sub focus_in { 405sub focus_in {
296 my ($self) = @_; 406 my ($self) = @_;
297 407
298 return if $FOCUS == $self; 408 return if $FOCUS == $self;
299 return unless $self->{can_focus}; 409 return unless $self->{can_focus};
300 410
301 my $focus = $FOCUS; $FOCUS = $self; 411 my $focus = $FOCUS; $FOCUS = $self;
302 412
303 $self->emit (focus_in => $focus); 413 $self->_emit (focus_in => $focus);
304 414
305 $focus->update if $focus; 415 $focus->update if $focus;
306 $FOCUS->update; 416 $FOCUS->update;
307} 417}
308 418
… …
311 421
312 return unless $FOCUS == $self; 422 return unless $FOCUS == $self;
313 423
314 my $focus = $FOCUS; undef $FOCUS; 424 my $focus = $FOCUS; undef $FOCUS;
315 425
316 $self->emit (focus_out => $focus); 426 $self->_emit (focus_out => $focus);
317 427
318 $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;
319} 432}
320 433
321sub mouse_motion { } 434sub mouse_motion { }
322sub button_up { } 435sub button_up { }
323sub key_down { } 436sub key_down { }
324sub key_up { } 437sub key_up { }
325 438
326sub button_down { 439sub button_down {
327 my ($self, $ev, $x, $y) = @_; 440 my ($self, $ev, $x, $y) = @_;
328 441
329 $self->focus_in; 442 $self->focus_in;
… …
363 if ($ENV{PCLIENT_DEBUG}) { 476 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix; 477 glPushMatrix;
365 glColor 1, 1, 0, 1; 478 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP; 480 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0; 481 glVertex 0 , 0;
369 glVertex $self->{w}, 0; 482 glVertex $self->{w} - 1, 0;
370 glVertex $self->{w}, $self->{h}; 483 glVertex $self->{w} - 1, $self->{h} - 1;
371 glVertex 0 , $self->{h}; 484 glVertex 0 , $self->{h} - 1;
372 glEnd; 485 glEnd;
373 glPopMatrix; 486 glPopMatrix;
374 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;
375 } 488 }
376} 489}
377 490
378sub _draw { 491sub _draw {
379 my ($self) = @_; 492 my ($self) = @_;
… …
395 508
396sub set_parent { 509sub set_parent {
397 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
398 511
399 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;
400} 517}
401 518
402sub check_size { 519sub check_size {
403 my ($self) = @_; 520 my ($self, $forced) = @_;
404 521
405 $self->{parent} 522 $self->{force_alloc} = 1 if $forced;
406 or return 1; 523 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 524}
427 525
428sub update { 526sub update {
429 my ($self) = @_; 527 my ($self) = @_;
430 528
… …
436 my ($self, $signal, $cb) = @_; 534 my ($self, $signal, $cb) = @_;
437 535
438 push @{ $self->{signal_cb}{$signal} }, $cb; 536 push @{ $self->{signal_cb}{$signal} }, $cb;
439} 537}
440 538
539sub _emit {
540 my ($self, $signal, @args) = @_;
541
542 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543}
544
441sub emit { 545sub emit {
442 my ($self, $signal, @args) = @_; 546 my ($self, $signal, @args) = @_;
443 547
444 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) = @_;
445} 554}
446 555
447sub DESTROY { 556sub DESTROY {
448 my ($self) = @_; 557 my ($self) = @_;
449 558
559 delete $WIDGET{$self+0};
450 #$self->deactivate; 560 #$self->deactivate;
451} 561}
452 562
453############################################################################# 563#############################################################################
454 564
… …
463 my $class = shift; 573 my $class = shift;
464 574
465 # range [value, low, high, page] 575 # range [value, low, high, page]
466 576
467 $class->SUPER::new ( 577 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 578 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 579 #active_bg => [1, 1, 1, 0.5],
470 @_ 580 @_
471 ) 581 )
472} 582}
473 583
474sub _draw { 584sub _draw {
475 my ($self) = @_; 585 my ($self) = @_;
476 586
587 my $color = $FOCUS == $self && $self->{active_bg}
588 ? $self->{active_bg}
589 : $self->{bg};
590
591 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 592 my ($w, $h) = @$self{qw(w h)};
478 593
479 glEnable GL_BLEND; 594 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 596 glColor @$color;
482 597
483 glBegin GL_QUADS; 598 glBegin GL_QUADS;
484 glVertex 0 , 0; 599 glVertex 0 , 0;
485 glVertex 0 , $h; 600 glVertex 0 , $h;
486 glVertex $w, $h; 601 glVertex $w, $h;
487 glVertex $w, 0; 602 glVertex $w, 0;
488 glEnd; 603 glEnd;
489 604
490 glDisable GL_BLEND; 605 glDisable GL_BLEND;
606 }
491} 607}
492 608
493############################################################################# 609#############################################################################
494 610
495package CFClient::UI::Empty; 611package CFClient::UI::Empty;
… …
527 643
528 $self 644 $self
529} 645}
530 646
531sub add { 647sub add {
532 my ($self, $child) = @_; 648 my ($self, @widgets) = @_;
533 649
534 $child->set_parent ($self); 650 $_->set_parent ($self)
651 for @widgets;
535 652
536 use sort 'stable'; 653 use sort 'stable';
537 654
538 $self->{children} = [ 655 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 656 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 657 @{$self->{children}}, @widgets
541 ]; 658 ];
542 659
543 $child->check_size; 660 $self->check_size (1);
661 $self->update;
544} 662}
545 663
546sub children { 664sub children {
547 @{ $_[0]{children} } 665 @{ $_[0]{children} }
548} 666}
… …
553 delete $child->{parent}; 671 delete $child->{parent};
554 $child->hide; 672 $child->hide;
555 673
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557 675
558 $self->check_size; 676 $self->check_size (1);
559 $self->update; 677 $self->update;
560} 678}
561 679
562sub clear { 680sub clear {
563 my ($self) = @_; 681 my ($self) = @_;
… …
567 685
568 for (@$children) { 686 for (@$children) {
569 delete $_->{parent}; 687 delete $_->{parent};
570 $_->hide; 688 $_->hide;
571 } 689 }
690
691 $self->check_size;
692 $self->update;
572} 693}
573 694
574sub find_widget { 695sub find_widget {
575 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
576 697
… …
651} 772}
652 773
653sub update { 774sub update {
654 my ($self) = @_; 775 my ($self) = @_;
655 776
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 778 $self->SUPER::update;
658} 779}
659 780
660sub size_allocate { 781sub size_allocate {
661 my ($self, $w, $h) = @_; 782 my ($self, $w, $h) = @_;
662 783
663 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 785 $self->update;
786}
787
788sub _render {
789 $_[0]{children}[0]->draw;
665} 790}
666 791
667sub render_child { 792sub render_child {
668 my ($self) = @_; 793 my ($self) = @_;
669 794
670 $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 {
671 glClearColor 0, 0, 0, 0; 796 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 797 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 798
674# glColorMask 1, 1, 1, 0; 799 $self->_render;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
681 }; 800 };
682} 801}
683 802
684sub _draw { 803sub _draw {
685 my ($self) = @_; 804 my ($self) = @_;
… …
687 my ($w, $h) = ($self->w, $self->h); 806 my ($w, $h) = ($self->w, $self->h);
688 807
689 my $tex = $self->{texture} 808 my $tex = $self->{texture}
690 or return; 809 or return;
691 810
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 811 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 813 glColor 1, 1, 1, 1;
697 814
698 $tex->draw_quad (0, 0, $w, $h); 815 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 816
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 817 glDisable GL_TEXTURE_2D;
702} 818}
703 819
704############################################################################# 820#############################################################################
705 821
706package CFClient::UI::ViewPort; 822package CFClient::UI::ViewPort;
707 823
708our @ISA = CFClient::UI::Window::; 824our @ISA = CFClient::UI::Window::;
709
710sub new { die }
711
712sub size_request {
713 my ($self) = @_;
714
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717
718 @$self{qw(child_w child_h)}
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 $self->{children}[1]->draw;
725}
726
727
728#############################################################################
729
730package CFClient::UI::Frame;
731
732our @ISA = CFClient::UI::Bin::;
733
734use CFClient::OpenGL;
735 825
736sub new { 826sub new {
737 my $class = shift; 827 my $class = shift;
738 828
829 $class->SUPER::new (
830 scroll_x => 0,
831 scroll_y => 1,
832 @_,
833 )
834}
835
836sub size_request {
837 my ($self) = @_;
838
839 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
840
841 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y};
843
844 ($w, $h)
845}
846
847sub size_allocate {
848 my ($self, $w, $h) = @_;
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);
854 $self->update;
855}
856
857sub set_offset {
858 my ($self, $x, $y) = @_;
859
860 $self->{view_x} = int $x;
861 $self->{view_y} = int $y;
862
863 $self->update;
864}
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
894sub _render {
895 my ($self) = @_;
896
897 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
898
899 $self->SUPER::_render;
900}
901
902#############################################################################
903
904package CFClient::UI::ScrolledWindow;
905
906our @ISA = CFClient::UI::HBox::;
907
908sub new {
909 my $class = shift;
910
911 my $self;
912
913 my $slider = new CFClient::UI::Slider
914 vertical => 1,
915 range => [0, 0, 1, 0.01], # HACK fix
916 on_changed => sub {
917 $self->{vp}->set_offset (0, $_[1]);
918 },
919 ;
920
739 my $self = $class->SUPER::new ( 921 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 922 vp => (new CFClient::UI::ViewPort expand => 1),
741 border_bg => [1, 1, 1, 1], 923 slider => $slider,
742 border => 0.8,
743 @_ 924 @_,
744 ); 925 );
745 926
927 $self->{vp}->add ($self->{scrolled});
928 $self->add ($self->{vp});
929 $self->add ($self->{slider});
930
746 $self 931 $self
747} 932}
748 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
953#TODO# update range on size_allocate depending on child
954# update viewport offset on scroll
955
956#############################################################################
957
958package CFClient::UI::Frame;
959
960our @ISA = CFClient::UI::Bin::;
961
962use CFClient::OpenGL;
963
964sub new {
965 my $class = shift;
966
967 $class->SUPER::new (
968 bg => undef,
969 @_,
970 )
971}
972
749sub _draw { 973sub _draw {
750 my ($self) = @_; 974 my ($self) = @_;
751 975
752 my ($w, $h) = ($self->{w}, $self->{h}); 976 if ($self->{bg}) {
977 my ($w, $h) = @$self{qw(w h)};
753 978
754 glEnable GL_BLEND; 979 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 981 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 982
759# glBegin GL_QUADS; 983 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 984 glVertex 0 , 0;
762# glVertex 0 , $h; 985 glVertex 0 , $h;
763# glVertex $w, $h; 986 glVertex $w, $h;
764# glVertex $w, 0; 987 glVertex $w, 0;
765# glEnd; 988 glEnd;
766 989
767
768 $self->child->draw;
769 glDisable GL_BLEND; 990 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 991 }
992
993 $self->SUPER::_draw;
771} 994}
772 995
773############################################################################# 996#############################################################################
774 997
775package CFClient::UI::FancyFrame; 998package CFClient::UI::FancyFrame;
… …
783 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);
784 1007
785sub new { 1008sub new {
786 my $class = shift; 1009 my $class = shift;
787 1010
788 # TODO: user_x, user_y, overwrite moveto?
789
790 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
793 border => 0.6, 1014 border => 0.6,
1015 is_toplevel => 1,
794 can_events => 1, 1016 can_events => 1,
795 @_ 1017 @_
796 ); 1018 );
797 1019
798 $self->{title} &&= new CFClient::UI::Label 1020 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 1021 align => 0,
… …
823 my ($self, $w, $h) = @_; 1045 my ($self, $w, $h) = @_;
824 1046
825 $h -= List::Util::max 0, $self->border * 2; 1047 $h -= List::Util::max 0, $self->border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 1048 $w -= List::Util::max 0, $self->border * 2;
827 1049
828 $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)
829 if $self->{title}; 1051 if $self->{title};
830 1052
831 $self->child->configure ($self->border, $self->border, $w, $h); 1053 $self->child->configure ($self->border, $self->border, $w, $h);
832} 1054}
833 1055
… …
852 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
853 1075
854 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
856 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
860 $self->check_size; 1084 $self->check_size;
861 }; 1085 };
862 1086
863 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
864 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
867 $self->{motion} = sub { 1091 $self->{motion} = sub {
868 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
869 1093
870 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
871 1095
872 $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});
873 $self->update; 1100 $self->update;
874 }; 1101 };
875 } 1102 }
876} 1103}
877 1104
… …
891 my ($self) = @_; 1118 my ($self) = @_;
892 1119
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1120 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1121 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 1122
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1123 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1125
901 my $border = $self->border; 1126 my $border = $self->border;
902 1127
903 glColor @{ $self->{border_bg} }; 1128 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1129 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1130 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1131 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1132 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1133
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1134 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1135 my $bg = $tex[0];
911 1136
912 # TODO: repeat texture not scale 1137 # TODO: repeat texture not scale
… …
916 glColor @{ $self->{bg} }; 1141 glColor @{ $self->{bg} };
917 1142
918 $bg->{s} = $rep_x; 1143 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y; 1144 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1; 1145 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 1146 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147 }
922 1148
923 glDisable GL_TEXTURE_2D; 1149 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1150
927 $self->{title}->draw if $self->{title}; 1151 $self->{title}->draw if $self->{title};
928 1152
929 $self->child->draw; 1153 $self->child->draw;
930} 1154}
… …
942sub new { 1166sub new {
943 my $class = shift; 1167 my $class = shift;
944 1168
945 $class->SUPER::new ( 1169 $class->SUPER::new (
946 col_expand => [], 1170 col_expand => [],
947 @_ 1171 @_,
948 ) 1172 )
1173}
1174
1175sub children {
1176 grep $_, map @$_, grep $_, @{ $_[0]{children} }
949} 1177}
950 1178
951sub add { 1179sub add {
952 my ($self, $x, $y, $child) = @_; 1180 my ($self, $x, $y, $child) = @_;
953 1181
954 $child->set_parent ($self); 1182 $child->set_parent ($self);
955 $self->{children}[$y][$x] = $child; 1183 $self->{children}[$y][$x] = $child;
956 1184
957 $child->check_size; 1185 $self->check_size (1);
958} 1186}
959 1187
960sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962}
963
964# 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?
965sub clear { 1189sub clear {
966 my ($self) = @_; 1190 my ($self) = @_;
967 1191
968 my @children = $self->children; 1192 my @children = $self->children;
969 delete $self->{children}; 1193 delete $self->{children};
… …
971 for (@children) { 1195 for (@children) {
972 delete $_->{parent}; 1196 delete $_->{parent};
973 $_->hide; 1197 $_->hide;
974 } 1198 }
975 1199
1200 $self->check_size (1);
976 $self->update; 1201 $self->update;
977} 1202}
978 1203
979sub get_wh { 1204sub get_wh {
980 my ($self) = @_; 1205 my ($self) = @_;
… …
1012sub size_allocate { 1237sub size_allocate {
1013 my ($self, $w, $h) = @_; 1238 my ($self, $w, $h) = @_;
1014 1239
1015 my ($ws, $hs) = $self->get_wh; 1240 my ($ws, $hs) = $self->get_wh;
1016 1241
1017 my $req_w = sum @$ws; 1242 my $req_w = (sum @$ws) || 1;
1018 my $req_h = sum @$hs; 1243 my $req_h = (sum @$hs) || 1;
1019 1244
1020 # TODO: nicer code && do row_expand 1245 # TODO: nicer code && do row_expand
1021 my @col_expand = @{$self->{col_expand}}; 1246 my @col_expand = @{$self->{col_expand}};
1022 @col_expand = (1) x @$ws unless @col_expand; 1247 @col_expand = (1) x @$ws unless @col_expand;
1023 my $col_expand = (sum @col_expand) || 1; 1248 my $col_expand = (sum @col_expand) || 1;
… …
1077 } 1302 }
1078} 1303}
1079 1304
1080############################################################################# 1305#############################################################################
1081 1306
1082package CFClient::UI::HBox; 1307package CFClient::UI::Box;
1083
1084# TODO: wrap into common Box base class
1085 1308
1086our @ISA = CFClient::UI::Container::; 1309our @ISA = CFClient::UI::Container::;
1087 1310
1088sub size_request { 1311sub size_request {
1089 my ($self) = @_; 1312 my ($self) = @_;
1090 1313
1091 my @alloc = map [$_->size_request], @{$self->{children}}; 1314 $self->{vertical}
1092 1315 ? (
1093 ( 1316 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1094 (List::Util::sum map $_->[0], @alloc), 1317 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1095 (List::Util::max map $_->[1], @alloc), 1318 )
1096 ) 1319 : (
1320 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1321 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1322 )
1097} 1323}
1098 1324
1099sub size_allocate { 1325sub size_allocate {
1100 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
1101 1327
1102 ($h, $w) = ($w, $h); 1328 my $space = $self->{vertical} ? $h : $w;
1103
1104 my $children = $self->{children}; 1329 my $children = $self->{children};
1105 1330
1106 my @h = map $_->{req_w}, @$children; 1331 my @req;
1107 1332
1108 my $req_h = List::Util::sum @h; 1333 if ($self->{homogeneous}) {
1109 1334 @req = ($space / (@$children || 1)) x @$children;
1110 if ($req_h > $h) {
1111 # ah well, not enough space
1112 $_ *= $h / $req_h for @h;
1113 } 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 {
1114 my $exp = List::Util::sum map $_->{expand}, @$children; 1343 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1115 $exp ||= 1;
1116 1344
1345 $space = ($space - $req) / $expand; # remaining space to give away
1346
1347 $req[$_] += $space * $children->[$_]{expand}
1117 for (0 .. $#$children) { 1348 for 0 .. $#$children;
1118 my $child = $children->[$_];
1119
1120 my $alloc_h = $h[$_];
1121 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1122 $h[$_] = $alloc_h;
1123 } 1349 }
1124 } 1350 }
1125 1351
1126 CFClient::UI::harmonize \@h; 1352 CFClient::UI::harmonize \@req;
1127 1353
1128 my $y = 0; 1354 my $pos = 0;
1129 for (0 .. $#$children) { 1355 for (0 .. $#$children) {
1130 my $child = $children->[$_];
1131 my $h = $h[$_]; 1356 my $alloc = $req[$_];
1132 $child->configure ($y, 0, $h, $w); 1357 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1133 1358
1134 $y += $h; 1359 $pos += $alloc;
1135 } 1360 }
1136 1361
1137 1 1362 1
1138} 1363}
1139 1364
1140############################################################################# 1365#############################################################################
1141 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
1142package CFClient::UI::VBox; 1382package CFClient::UI::VBox;
1143 1383
1144# TODO: wrap into common Box base class
1145
1146our @ISA = CFClient::UI::Container::; 1384our @ISA = CFClient::UI::Box::;
1147 1385
1148sub size_request { 1386sub new {
1149 my ($self) = @_; 1387 my $class = shift;
1150 1388
1151 my @alloc = map [$_->size_request], @{$self->{children}}; 1389 $class->SUPER::new (
1152 1390 vertical => 1,
1153 ( 1391 @_,
1154 (List::Util::max map $_->[0], @alloc),
1155 (List::Util::sum map $_->[1], @alloc),
1156 ) 1392 )
1157} 1393}
1158 1394
1159sub size_allocate {
1160 my ($self, $w, $h) = @_;
1161
1162 my $children = $self->{children};
1163
1164 my @h = map $_->{req_h}, @$children;
1165
1166 my $req_h = List::Util::sum @h;
1167
1168 if ($req_h > $h) {
1169 # ah well, not enough space
1170 $_ *= $h / $req_h for @h;
1171 } else {
1172 my $exp = List::Util::sum map $_->{expand}, @$children;
1173 $exp ||= 1;
1174
1175 for (0 .. $#$children) {
1176 my $child = $children->[$_];
1177
1178 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1179 }
1180 }
1181
1182 CFClient::UI::harmonize \@h;
1183
1184 my $y = 0;
1185 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_];
1188 $child->configure (0, $y, $w, $h);
1189
1190 $y += $h;
1191 }
1192
1193 1
1194}
1195
1196############################################################################# 1395#############################################################################
1197 1396
1198package CFClient::UI::Label; 1397package CFClient::UI::Label;
1199 1398
1200our @ISA = CFClient::UI::Base::; 1399our @ISA = CFClient::UI::DrawBG::;
1201 1400
1202use CFClient::OpenGL; 1401use CFClient::OpenGL;
1203 1402
1204sub new { 1403sub new {
1205 my ($class, %arg) = @_; 1404 my ($class, %arg) = @_;
1206 1405
1207 my $self = $class->SUPER::new ( 1406 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1407 fg => [1, 1, 1],
1408 #bg => none
1409 #active_bg => none
1209 #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),
1210 fontsize => 1, 1416 fontsize => 1,
1211 text => "",
1212 align => -1, 1417 align => -1,
1213 valign => -1, 1418 valign => -1,
1214 padding => 2, 1419 padding => 2,
1215 layout => new CFClient::Layout,
1216 can_events => 0, 1420 can_events => 0,
1217 %arg 1421 %arg
1218 ); 1422 );
1219 1423
1220 if (exists $self->{template}) { 1424 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1425 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1426 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1427 $self->{template} = $layout;
1224 } 1428 }
1225 1429
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1430 if (exists $self->{markup}) {
1227 $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 }
1228 1435
1229 $self 1436 $self
1230} 1437}
1231 1438
1232sub escape { 1439sub escape($) {
1233 local $_ = $_[1]; 1440 local $_ = $_[0];
1234 1441
1235 s/&/&amp;/g; 1442 s/&/&amp;/g;
1236 s/>/&gt;/g; 1443 s/>/&gt;/g;
1237 s/</&lt;/g; 1444 s/</&lt;/g;
1238 1445
1239 $_[1] 1446 $_
1240} 1447}
1241 1448
1242sub update { 1449sub update {
1243 my ($self) = @_; 1450 my ($self) = @_;
1244 1451
1245 delete $self->{texture}; 1452 delete $self->{texture};
1246 $self->SUPER::update; 1453 $self->SUPER::update;
1247} 1454}
1248 1455
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1456sub set_text {
1256 my ($self, $text) = @_; 1457 my ($self, $text) = @_;
1257 1458
1258 return if $self->{text} eq "T$text"; 1459 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1460 $self->{text} = "T$text";
1260 1461
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1463 $self->{layout}->set_text ($text);
1262 1464
1263 delete $self->{texture};
1264 $self->update; 1465 $self->update;
1265 $self->check_size; 1466 $self->check_size;
1266} 1467}
1267 1468
1268sub set_markup { 1469sub set_markup {
1269 my ($self, $markup) = @_; 1470 my ($self, $markup) = @_;
1270 1471
1271 return if $self->{text} eq "M$markup"; 1472 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1473 $self->{text} = "M$markup";
1273 1474
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1478 $self->{layout}->set_markup ($markup);
1275 1479
1276 delete $self->{texture};
1277 $self->update; 1480 $self->update;
1278 $self->check_size; 1481 $self->check_size;
1279} 1482}
1280 1483
1281sub size_request { 1484sub size_request {
1282 my ($self) = @_; 1485 my ($self) = @_;
1283 1486
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1487 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $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});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1491 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1492
1288 my ($w, $h) = $self->{layout}->size; 1493 my ($w, $h) = $self->{layout}->size;
1289 1494
1290 if (exists $self->{template}) { 1495 if (exists $self->{template}) {
… …
1312sub set_fontsize { 1517sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1518 my ($self, $fontsize) = @_;
1314 1519
1315 $self->{fontsize} = $fontsize; 1520 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1521 delete $self->{texture};
1522
1523 $self->update;
1317 $self->check_size; 1524 $self->check_size;
1318 $self->update;
1319} 1525}
1320 1526
1321sub _draw { 1527sub _draw {
1322 my ($self) = @_; 1528 my ($self) = @_;
1323 1529
1530 $self->SUPER::_draw; # draw background, if applicable
1531
1324 my $tex = $self->{texture} ||= do { 1532 my $tex = $self->{texture} ||= do {
1533 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1534 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $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});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539
1328 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
1329 }; 1551 };
1330 1552
1331 glEnable GL_BLEND;
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333 glEnable GL_TEXTURE_2D; 1553 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1555
1556 if ($tex->{format} == GL_ALPHA) {
1336 glColor @{$self->{fg}}; 1557 glColor @{$self->{fg}};
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $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 }
1351 1562
1352 glDisable GL_TEXTURE_2D; 1563 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1564}
1355 1565
1356############################################################################# 1566#############################################################################
1357 1567
1358package CFClient::UI::EntryBase; 1568package CFClient::UI::EntryBase;
… …
1371 active_fg => [0, 0, 0], 1581 active_fg => [0, 0, 0],
1372 can_hover => 1, 1582 can_hover => 1,
1373 can_focus => 1, 1583 can_focus => 1,
1374 valign => 0, 1584 valign => 0,
1375 can_events => 1, 1585 can_events => 1,
1586 #text => ...
1376 @_ 1587 @_
1377 ) 1588 )
1378} 1589}
1379 1590
1380sub _set_text { 1591sub _set_text {
… …
1390 $self->{text} = $text; 1601 $self->{text} = $text;
1391 1602
1392 $text =~ s/./*/g if $self->{hidden}; 1603 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 1604 $self->{layout}->set_text ("$text ");
1394 1605
1395 $self->emit (changed => $self->{text}); 1606 $self->_emit (changed => $self->{text});
1396}
1397
1398sub get_text {
1399 $_[0]{text}
1400}
1401
1402sub size_request {
1403 my ($self) = @_;
1404
1405 my ($w, $h) = $self->SUPER::size_request;
1406
1407 ($w + 1, $h) # add 1 for cursor
1408}
1409
1410sub size_allocate {
1411 my ($self, $w, $h) = @_;
1412
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414} 1607}
1415 1608
1416sub set_text { 1609sub set_text {
1417 my ($self, $text) = @_; 1610 my ($self, $text) = @_;
1418 1611
1419 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1420 $self->_set_text ($text); 1613 $self->_set_text ($text);
1421 $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
1422} 1628}
1423 1629
1424sub key_down { 1630sub key_down {
1425 my ($self, $ev) = @_; 1631 my ($self, $ev) = @_;
1426 1632
… …
1428 my $sym = $ev->{sym}; 1634 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1635 my $uni = $ev->{unicode};
1430 1636
1431 my $text = $self->get_text; 1637 my $text = $self->get_text;
1432 1638
1433 if ($sym == 8) { 1639 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1640 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1641 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1642 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1643 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1644 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1645 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1646 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1647 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1648 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1649 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1650 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1651 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1652 $self->_emit ('escape');
1447 } elsif ($uni) { 1653 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1654 substr $text, $self->{cursor}++, 0, chr $uni;
1449 } 1655 }
1450 1656
1451 $self->_set_text ($text); 1657 $self->_set_text ($text);
1452 $self->update; 1658 $self->update;
1659 $self->check_size;
1453} 1660}
1454 1661
1455sub focus_in { 1662sub focus_in {
1456 my ($self) = @_; 1663 my ($self) = @_;
1457 1664
… …
1537 if ($sym == 13) { 1744 if ($sym == 13) {
1538 unshift @{$self->{history}}, 1745 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 1746 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1; 1747 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 1748 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 1749 $self->_emit (activate => $txt);
1543 $self->update; 1750 $self->update;
1544 1751
1545 } elsif ($sym == CFClient::SDLK_UP) { 1752 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 1753 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 1754 $self->{history_saveback} = $self->get_text;
… …
1586 my $class = shift; 1793 my $class = shift;
1587 1794
1588 $class->SUPER::new ( 1795 $class->SUPER::new (
1589 padding => 4, 1796 padding => 4,
1590 fg => [1, 1, 1], 1797 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 1798 active_fg => [0, 0, 1],
1593 can_hover => 1, 1799 can_hover => 1,
1594 align => 0, 1800 align => 0,
1595 valign => 0, 1801 valign => 0,
1596 can_events => 1, 1802 can_events => 1,
1597 @_ 1803 @_
1598 ) 1804 )
1599} 1805}
1600 1806
1807sub activate { }
1808
1601sub button_up { 1809sub button_up {
1602 my ($self, $ev, $x, $y) = @_; 1810 my ($self, $ev, $x, $y) = @_;
1603 1811
1812 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 1813 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 1814 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate");
1607 }
1608} 1815}
1609 1816
1610sub _draw { 1817sub _draw {
1611 my ($self) = @_; 1818 my ($self) = @_;
1612 1819
… …
1614 1821
1615 if ($GRAB == $self) { 1822 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg}; 1823 $self->{fg} = $self->{active_fg};
1617 } 1824 }
1618 1825
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1826 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1827 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1828 glColor 0, 0, 0, 1;
1624 1829
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1830 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1831
1627 glDisable GL_TEXTURE_2D; 1832 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1833
1630 $self->SUPER::_draw; 1834 $self->SUPER::_draw;
1631} 1835}
1632 1836
1633############################################################################# 1837#############################################################################
… …
1647 1851
1648 $class->SUPER::new ( 1852 $class->SUPER::new (
1649 padding => 2, 1853 padding => 2,
1650 fg => [1, 1, 1], 1854 fg => [1, 1, 1],
1651 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],
1652 state => 0, 1858 state => 0,
1653 can_hover => 1, 1859 can_hover => 1,
1654 @_ 1860 @_
1655 ) 1861 )
1656} 1862}
… …
1665 my ($self, $ev, $x, $y) = @_; 1871 my ($self, $ev, $x, $y) = @_;
1666 1872
1667 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1668 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1669 $self->{state} = !$self->{state}; 1875 $self->{state} = !$self->{state};
1670 $self->emit (changed => $self->{state}); 1876 $self->_emit (changed => $self->{state});
1671 } 1877 }
1672} 1878}
1673 1879
1674sub _draw { 1880sub _draw {
1675 my ($self) = @_; 1881 my ($self) = @_;
… …
1680 1886
1681 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;
1682 1888
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1890
1685 glEnable GL_BLEND; 1891 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892
1686 glEnable GL_TEXTURE_2D; 1893 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1894 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1895 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1896}
1696 1897
1697############################################################################# 1898#############################################################################
1698 1899
1699package CFClient::UI::Image; 1900package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 1943 glTranslate 0, -$self->{w}, 0;
1743 1944
1744 ($w, $h) = ($h, $w); 1945 ($w, $h) = ($h, $w);
1745 } 1946 }
1746 1947
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 1948 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1949 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 1950
1752 $tex->draw_quad (0, 0, $w, $h); 1951 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 1952
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 1953 glDisable GL_TEXTURE_2D;
1756} 1954}
1757 1955
1758############################################################################# 1956#############################################################################
1759 1957
… …
1948 qw(s1_slider.png s1_slider_bg.png); 2146 qw(s1_slider.png s1_slider_bg.png);
1949 2147
1950sub new { 2148sub new {
1951 my $class = shift; 2149 my $class = shift;
1952 2150
1953 # range [value, low, high, page] 2151 # range [value, low, high, page, unit]
1954 2152
1955 # TODO: 0-width page 2153 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2154 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2155 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2156 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2157 fg => [1, 1, 1],
1960 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],
1961 range => [0, 0, 100, 10], 2161 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2162 req_w => $::WIDTH / 80,
1963 req_h => 20, 2163 req_h => $::WIDTH / 80,
1964 vertical => 0, 2164 vertical => 0,
1965 can_hover => 1, 2165 can_hover => 1,
1966 inner_pad => 5, 2166 inner_pad => 0.02,
1967 @_ 2167 @_
1968 ); 2168 );
1969 2169
2170 $self->set_value ($self->{range}[0]);
2171 $self->update;
2172
1970 $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 }
1971} 2206}
1972 2207
1973sub size_request { 2208sub size_request {
1974 my ($self) = @_; 2209 my ($self) = @_;
1975 2210
… …
1981 2216
1982sub button_down { 2217sub button_down {
1983 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
1984 2219
1985 $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
1986 $self->mouse_motion ($ev, $x, $y); 2224 $self->mouse_motion ($ev, $x, $y);
1987} 2225}
1988 2226
1989sub mouse_motion { 2227sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2228 my ($self, $ev, $x, $y) = @_;
1991 2229
1992 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
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2247 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100;
1994 2249
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2250 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2251
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2252 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2253 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2254
2000 $x -= $inner_pad_px; # substract the padding 2255 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2256 $value = $value * $self->{scale} + $self->{offset};
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2257
2006 $self->emit (changed => $x); 2258 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2259 $self->{knob_w} = $knob_w;
2008 } 2260 });
2009}
2010 2261
2011# the inner_* stuff is for generating a padding for the slider handle, 2262 $self->SUPER::update;
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017} 2263}
2018 2264
2019sub _draw { 2265sub _draw {
2020 my ($self) = @_; 2266 my ($self) = @_;
2021 2267
2022 $self->SUPER::_draw (); 2268 $self->SUPER::_draw ();
2023 2269
2024 my ($w, $h) = @$self{qw(w h)}; 2270 glScale $self->{w}, $self->{h};
2025 2271
2026 if ($self->{vertical}) { 2272 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2273 # draw a vertical slider like a rotated horizontal slider
2028 2274
2275 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2276 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2277 }
2034 2278
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2279 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2280 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2281
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2282 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2284
2061 # draw background 2285 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2286 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2287
2064 # draw handle 2288 # draw handle
2065 $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);
2066 2290
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2291 glDisable GL_TEXTURE_2D;
2069} 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 (@_) }
2070 2334
2071############################################################################# 2335#############################################################################
2072 2336
2073package CFClient::UI::TextView; 2337package CFClient::UI::TextView;
2074 2338
… …
2083 fontsize => 1, 2347 fontsize => 1,
2084 can_events => 0, 2348 can_events => 0,
2085 #font => default_font 2349 #font => default_font
2086 @_, 2350 @_,
2087 2351
2088 layout => (new CFClient::Layout), 2352 layout => (new CFClient::Layout 1),
2089 par => [], 2353 par => [],
2090 height => 0, 2354 height => 0,
2091 children => [ 2355 children => [
2092 (new CFClient::UI::Empty expand => 1), 2356 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2357 (new CFClient::UI::Slider vertical => 1),
… …
2104 2368
2105 $self->{fontsize} = $fontsize; 2369 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2370 $self->reflow;
2107} 2371}
2108 2372
2109sub text_height {
2110 my ($self, $text) = @_;
2111
2112 my $layout = $self->{layout};
2113
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text);
2117
2118 ($layout->size)[1]
2119}
2120
2121sub reflow {
2122 my ($self) = @_;
2123
2124 $self->{need_reflow}++;
2125 $self->update;
2126}
2127
2128sub size_allocate { 2373sub size_allocate {
2129 my ($self, $w, $h) = @_; 2374 my ($self, $w, $h) = @_;
2130 2375
2131 $self->SUPER::size_allocate ($w, $h); 2376 $self->SUPER::size_allocate ($w, $h);
2132 2377
… …
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 2380 $self->{layout}->set_width ($self->{children}[0]{w});
2136 2381
2137 $self->reflow; 2382 $self->reflow;
2138} 2383}
2139 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
2140sub add_paragraph { 2419sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2420 my ($self, $color, $text, $indent) = @_;
2142 2421
2143 #TODO: intelligently "reformat" paragraph 2422 for my $line (split /\n/, $text) {
2144 2423 my ($w, $h) = $self->text_size ($line);
2145 my $height = $self->text_height ($text);
2146
2147 $self->{height} += $height; 2424 $self->{height} += $h;
2425 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2426 }
2148 2427
2149 push @{$self->{par}}, [$height, $color, $text];
2150
2151 $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]);
2152 $self->{children}[1]->update;
2153} 2429}
2154 2430
2155sub update { 2431sub update {
2156 my ($self) = @_; 2432 my ($self) = @_;
2157 2433
… …
2159 2435
2160 return unless $self->{h} > 0; 2436 return unless $self->{h} > 0;
2161 2437
2162 delete $self->{texture}; 2438 delete $self->{texture};
2163 2439
2164 $ROOT->on_refresh ($self, sub { 2440 $ROOT->on_post_alloc ($self, sub {
2441 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2442
2165 if (delete $self->{need_reflow}) { 2443 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2444 my $height = 0;
2167 2445
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2446 my $layout = $self->{layout};
2447
2448 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2449
2169 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 }
2170 2461
2171 $self->{height} = $height; 2462 $self->{height} = $height;
2172 2463
2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2464 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174 2465
2175 delete $self->{texture}; 2466 delete $self->{texture};
2176 } 2467 }
2177 2468
2178 $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 {
2179 glClearColor 0, 0, 0, 0; 2470 glClearColor 0.5, 0.5, 0.5, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2471 glClear GL_COLOR_BUFFER_BIT;
2181 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
2182 glEnable GL_BLEND; 2484 glEnable GL_BLEND;
2485 #TODO# not correct in windows where rgba is forced off
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2486 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187 my $top = int $self->{children}[1]{range}[0];
2188
2189 my $y0 = $top;
2190 my $y1 = $top + $self->{h};
2191
2192 my $y = 0;
2193
2194 my $layout = $self->{layout};
2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197 2487
2198 for my $par (@{$self->{par}}) { 2488 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2489 my $h = $par->[1];
2200 2490
2201 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]);
2202 $layout->set_text ($par->[2]); 2494 $layout->set_markup ($par->[4]);
2203 2495
2204 glColor @{ $par->[1] }; 2496 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205 my ($W, $H) = $layout->size; 2497
2206 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;
2207 } 2500 }
2208 2501
2209 $y += $h; 2502 $y += $h;
2210 } 2503 }
2211 2504
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND; 2505 glDisable GL_BLEND;
2214 }; 2506 };
2215 }); 2507 });
2216} 2508}
2217 2509
2218sub _draw { 2510sub _draw {
2219 my ($self) = @_; 2511 my ($self) = @_;
2220 2512
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2513 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2515 glColor 1, 1, 1, 1;
2226 $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});
2227 glDisable GL_TEXTURE_2D; 2517 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2518
2230 $self->{children}[1]->draw; 2519 $self->{children}[1]->draw;
2231 2520
2232} 2521}
2233 2522
… …
2281 2570
2282sub new { 2571sub new {
2283 my $class = shift; 2572 my $class = shift;
2284 2573
2285 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2286 state => 0, 2575 state => 0,
2287 connect_activate => \&toggle_flopper, 2576 on_activate => \&toggle_flopper,
2288 @_ 2577 @_
2289 ); 2578 );
2290 2579
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2580 $self
2297} 2581}
2298 2582
2299sub toggle_flopper { 2583sub toggle_flopper {
2300 my ($self) = @_; 2584 my ($self) = @_;
2301 2585
2302 # TODO: use animation 2586 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 2587}
2314 2588
2315############################################################################# 2589#############################################################################
2316 2590
2317package CFClient::UI::Tooltip; 2591package CFClient::UI::Tooltip;
… …
2327 @_, 2601 @_,
2328 can_events => 0, 2602 can_events => 0,
2329 ) 2603 )
2330} 2604}
2331 2605
2332sub set_markup { 2606sub set_tooltip_from {
2333 my ($self, $text) = @_; 2607 my ($self, $widget) = @_;
2334 2608
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2609 $self->add (new CFClient::UI::Label
2336 $self->{label}->set_markup ($text); 2610 markup => $widget->{tooltip},
2337 $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 );
2338} 2617}
2339 2618
2340sub size_request { 2619sub size_request {
2341 my ($self) = @_; 2620 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2621
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2622 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2623
2347 ($w + 4, $h + 4) 2624 ($w + 4, $h + 4)
2348} 2625}
… …
2354} 2631}
2355 2632
2356sub _draw { 2633sub _draw {
2357 my ($self) = @_; 2634 my ($self) = @_;
2358 2635
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2636 glTranslate 0.375, 0.375;
2361 2637
2362 my ($w, $h) = @$self{qw(w h)}; 2638 my ($w, $h) = @$self{qw(w h)};
2363 2639
2364 glColor 1, 0.8, 0.4; 2640 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2651 glVertex 0 , $h;
2376 glVertex $w, $h; 2652 glVertex $w, $h;
2377 glVertex $w, 0; 2653 glVertex $w, 0;
2378 glEnd; 2654 glEnd;
2379 2655
2380 glPopMatrix; 2656 glTranslate 2 - 0.375, 2 - 0.375;
2381
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2657 $self->SUPER::_draw;
2384} 2658}
2385 2659
2386############################################################################# 2660#############################################################################
2387 2661
… …
2392use CFClient::OpenGL; 2666use CFClient::OpenGL;
2393 2667
2394sub new { 2668sub new {
2395 my $class = shift; 2669 my $class = shift;
2396 2670
2397 $class->SUPER::new ( 2671 my $self = $class->SUPER::new (
2398 aspect => 1, 2672 aspect => 1,
2673 can_events => 0,
2399 @_, 2674 @_,
2400 ) 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
2401} 2692}
2402 2693
2403sub size_request { 2694sub size_request {
2404 (32, 8) 2695 (32, 8)
2405} 2696}
2406 2697
2698sub update {
2699 my ($self) = @_;
2700
2701 return unless $self->{visible};
2702
2703 $self->SUPER::update;
2704}
2705
2407sub _draw { 2706sub _draw {
2408 my ($self) = @_; 2707 my ($self) = @_;
2409 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
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2720 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2721
2412 # TODO animation
2413 if ($tex) { 2722 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2723 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2725 glColor 1, 1, 1, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2726 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2727 glDisable GL_TEXTURE_2D;
2421 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++;
2422 } 2779 }
2423} 2780}
2424 2781
2425############################################################################# 2782#############################################################################
2426 2783
… …
2462 2819
2463# 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)
2464sub popup { 2821sub popup {
2465 my ($self, $ev) = @_; 2822 my ($self, $ev) = @_;
2466 2823
2467 $self->emit ("popdown"); 2824 $self->_emit ("popdown");
2468 2825
2469 # maybe save $GRAB? must be careful about events... 2826 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self; 2827 $GRAB = $self;
2471 $self->{button} = $ev->{button}; 2828 $self->{button} = $ev->{button};
2472 2829
… …
2475} 2832}
2476 2833
2477sub mouse_motion { 2834sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2835 my ($self, $ev, $x, $y) = @_;
2479 2836
2480 # TODO: should use vbox->fdind_widget or so 2837 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2838 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2839 $self->{hover} = $self->{item}{$HOVER};
2483} 2840}
2484 2841
2485sub button_up { 2842sub button_up {
… …
2487 2844
2488 if ($ev->{button} == $self->{button}) { 2845 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB; 2846 undef $GRAB;
2490 $self->hide; 2847 $self->hide;
2491 2848
2492 $self->emit ("popdown"); 2849 $self->_emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover}; 2850 $self->{hover}[1]->() if $self->{hover};
2494 } 2851 }
2495} 2852}
2496 2853
2497############################################################################# 2854#############################################################################
2498 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
2499package CFClient::UI::Root; 2966package CFClient::UI::Root;
2500 2967
2501our @ISA = CFClient::UI::Container::; 2968our @ISA = CFClient::UI::Container::;
2502 2969
2503use CFClient::OpenGL; 2970use CFClient::OpenGL;
2504 2971
2505sub check_size { 2972sub new {
2506 my ($self) = @_; 2973 my $class = shift;
2507 2974
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2975 $class->SUPER::new (
2509} 2976 visible => 1,
2510 2977 @_,
2511sub size_request { 2978 )
2512 ($::WIDTH, $::HEIGHT)
2513} 2979}
2514 2980
2515sub configure { 2981sub configure {
2516 my ($self, $x, $y, $w, $h) = @_; 2982 my ($self, $x, $y, $w, $h) = @_;
2517 2983
2518 $self->SUPER::configure ($x, $y, $w, $h); 2984 $self->{w} = $w;
2985 $self->{h} = $h;
2986}
2519 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
2520 for my $child (@{$self->{children}}) { 3004 for my $child ($self->children) {
2521 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)};
2522 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
2523 $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;
2524 $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
2525 $child->configure ($X, $Y, $W,$H); 3018 $child->configure ($X, $Y, $W, $H);
2526 } 3019 }
2527} 3020}
2528 3021
2529sub _topleft { 3022sub coord2local {
2530 my ($self, $x, $y) = @_; 3023 my ($self, $x, $y) = @_;
2531 3024
2532 ($x, $y) 3025 ($x, $y)
2533} 3026}
2534 3027
3028sub coord2global {
3029 my ($self, $x, $y) = @_;
3030
3031 ($x, $y)
3032}
3033
2535sub update { 3034sub update {
2536 my ($self) = @_; 3035 my ($self) = @_;
2537 3036
2538 $self->check_size; 3037 $self->check_size;
2539 ::refresh (); 3038 $::WANT_REFRESH++;
2540} 3039}
2541 3040
2542sub add { 3041sub add {
2543 my ($self, $child) = @_; 3042 my ($self, @children) = @_;
2544 3043
3044 for my $child (@children) {
3045 $child->{is_toplevel} = 1;
3046
2545 # integerize window positions 3047 # integerise window positions
2546 $child->{x} = int $child->{x}; 3048 $child->{x} = int $child->{x};
2547 $child->{y} = int $child->{y}; 3049 $child->{y} = int $child->{y};
3050 }
2548 3051
2549 $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 }
2550} 3071}
2551 3072
2552sub on_refresh { 3073sub on_refresh {
2553 my ($self, $id, $cb) = @_; 3074 my ($self, $id, $cb) = @_;
2554 3075
2555 $self->{refresh_hook}{$id} = $cb; 3076 $self->{refresh_hook}{$id} = $cb;
2556} 3077}
2557 3078
3079sub on_post_alloc {
3080 my ($self, $id, $cb) = @_;
3081
3082 $self->{post_alloc_hook}{$id} = $cb;
3083}
3084
2558sub draw { 3085sub draw {
2559 my ($self) = @_; 3086 my ($self) = @_;
2560 3087
2561 while (my $rcb = delete $self->{refresh_hook}) { 3088 while ($self->{refresh_hook}) {
2562 $_->() 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 (
3129 sort { $a->[0]{visible} <=> $b->[0]{visible} }
3130 values %{delete $self->{size_alloc}}
3131 ) {
3132 my ($widget, $w, $h) = @$_;
3133
3134 $w = 0 if $w < 0;
3135 $h = 0 if $h < 0;
3136
3137 $widget->{w} = $w;
3138 $widget->{h} = $h;
3139 $widget->emit (size_allocate => $w, $h);
3140 }
3141 }
3142
3143 while ($self->{post_alloc_hook}) {
3144 $_->()
3145 for values %{delete $self->{post_alloc_hook}};
2563 } 3146 }
2564 3147
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3148 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3149 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 3150 glClear GL_COLOR_BUFFER_BIT;
2568 3151
2569 glMatrixMode GL_PROJECTION; 3152 glMatrixMode GL_PROJECTION;
2570 glLoadIdentity; 3153 glLoadIdentity;
2571 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3154 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572 glMatrixMode GL_MODELVIEW; 3155 glMatrixMode GL_MODELVIEW;
2573 glLoadIdentity; 3156 glLoadIdentity;
2574 3157
2575 $self->_draw; 3158 $self->_draw;
2576} 3159}
2577 3160
2578############################################################################# 3161#############################################################################
2579 3162
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 }
2682}
2683
2684
2685#############################################################################
2686
2687package CFClient::UI; 3163package CFClient::UI;
2688 3164
2689$ROOT = new CFClient::UI::Root; 3165$ROOT = new CFClient::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 3166$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2691 3167
26921 31681
2693 3169

Diff Legend

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