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.246 by root, Sun May 28 00:40:51 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
… …
170 %$self = (); 240 %$self = ();
171} 241}
172 242
173sub show { 243sub show {
174 my ($self) = @_; 244 my ($self) = @_;
175
176 return if $self->{parent}; 245 return if $self->{parent};
177 246
178 $CFClient::UI::ROOT->add ($self); 247 $CFClient::UI::ROOT->add ($self);
179} 248}
180 249
181sub hide { 250sub show_centered {
182 my ($self) = @_; 251 my ($self) = @_;
252 return if $self->{parent};
253
254 $self->show;
255
256 $CFClient::UI::ROOT->on_post_alloc (
257 "centered $self" => sub {
258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
259 },
260 );
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;
515
516 $self->check_size;
517 $self->show;
401} 518}
402 519
403sub check_size { 520sub check_size {
404 my ($self) = @_; 521 my ($self, $forced) = @_;
405 522
406 $self->{parent} 523 $self->{force_alloc} = 1 if $forced;
407 or return 1; 524 $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} 525}
428 526
429sub update { 527sub update {
430 my ($self) = @_; 528 my ($self) = @_;
431 529
… …
437 my ($self, $signal, $cb) = @_; 535 my ($self, $signal, $cb) = @_;
438 536
439 push @{ $self->{signal_cb}{$signal} }, $cb; 537 push @{ $self->{signal_cb}{$signal} }, $cb;
440} 538}
441 539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
442sub emit { 546sub emit {
443 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
444 548
445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
446} 555}
447 556
448sub DESTROY { 557sub DESTROY {
449 my ($self) = @_; 558 my ($self) = @_;
450 559
560 delete $WIDGET{$self+0};
451 #$self->deactivate; 561 #$self->deactivate;
452} 562}
453 563
454############################################################################# 564#############################################################################
455 565
… …
464 my $class = shift; 574 my $class = shift;
465 575
466 # range [value, low, high, page] 576 # range [value, low, high, page]
467 577
468 $class->SUPER::new ( 578 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 579 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 580 #active_bg => [1, 1, 1, 0.5],
471 @_ 581 @_
472 ) 582 )
473} 583}
474 584
475sub _draw { 585sub _draw {
476 my ($self) = @_; 586 my ($self) = @_;
477 587
588 my $color = $FOCUS == $self && $self->{active_bg}
589 ? $self->{active_bg}
590 : $self->{bg};
591
592 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 593 my ($w, $h) = @$self{qw(w h)};
479 594
480 glEnable GL_BLEND; 595 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 597 glColor @$color;
483 598
484 glBegin GL_QUADS; 599 glBegin GL_QUADS;
485 glVertex 0 , 0; 600 glVertex 0 , 0;
486 glVertex 0 , $h; 601 glVertex 0 , $h;
487 glVertex $w, $h; 602 glVertex $w, $h;
488 glVertex $w, 0; 603 glVertex $w, 0;
489 glEnd; 604 glEnd;
490 605
491 glDisable GL_BLEND; 606 glDisable GL_BLEND;
607 }
492} 608}
493 609
494############################################################################# 610#############################################################################
495 611
496package CFClient::UI::Empty; 612package CFClient::UI::Empty;
… …
528 644
529 $self 645 $self
530} 646}
531 647
532sub add { 648sub add {
533 my ($self, $child) = @_; 649 my ($self, @widgets) = @_;
534 650
535 $child->set_parent ($self); 651 $_->set_parent ($self)
652 for @widgets;
536 653
537 use sort 'stable'; 654 use sort 'stable';
538 655
539 $self->{children} = [ 656 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 657 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 658 @{$self->{children}}, @widgets
542 ]; 659 ];
543 660
544 $child->check_size; 661 $self->check_size (1);
545 $self->update; 662 $self->update;
546} 663}
547 664
548sub children { 665sub children {
549 @{ $_[0]{children} } 666 @{ $_[0]{children} }
… …
555 delete $child->{parent}; 672 delete $child->{parent};
556 $child->hide; 673 $child->hide;
557 674
558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559 676
560 $self->check_size; 677 $self->check_size (1);
561 $self->update; 678 $self->update;
562} 679}
563 680
564sub clear { 681sub clear {
565 my ($self) = @_; 682 my ($self) = @_;
… …
656} 773}
657 774
658sub update { 775sub update {
659 my ($self) = @_; 776 my ($self) = @_;
660 777
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 778 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 779 $self->SUPER::update;
663} 780}
664 781
665sub size_allocate { 782sub size_allocate {
666 my ($self, $w, $h) = @_; 783 my ($self, $w, $h) = @_;
… …
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0; 797 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT; 798 glClear GL_COLOR_BUFFER_BIT;
682 799
683 $self->_render; 800 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 }; 801 };
692} 802}
693 803
694sub _draw { 804sub _draw {
695 my ($self) = @_; 805 my ($self) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 807 my ($w, $h) = ($self->w, $self->h);
698 808
699 my $tex = $self->{texture} 809 my $tex = $self->{texture}
700 or return; 810 or return;
701 811
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 812 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 814 glColor 1, 1, 1, 1;
707 815
708 $tex->draw_quad (0, 0, $w, $h); 816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 817
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 818 glDisable GL_TEXTURE_2D;
712} 819}
713 820
714############################################################################# 821#############################################################################
715 822
716package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
717 824
718our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
719 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
720sub size_request { 837sub size_request {
721 my ($self) = @_; 838 my ($self) = @_;
722 839
723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
725 841
726 @$self{qw(child_w child_h)} 842 @$self{qw(child_w child_h)}
727} 843}
728 844
729sub size_allocate { 845sub size_allocate {
730 my ($self, $w, $h) = @_; 846 my ($self, $w, $h) = @_;
731 847
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850
851 $self->child->configure (0, 0, $w, $h);
732 $self->update; 852 $self->update;
733} 853}
734 854
735sub set_offset { 855sub set_offset {
736 my ($self, $x, $y) = @_; 856 my ($self, $x, $y) = @_;
… …
739 $self->{view_y} = int $y; 859 $self->{view_y} = int $y;
740 860
741 $self->update; 861 $self->update;
742} 862}
743 863
864# hmm, this does not work for topleft of $self... but we should not ask for that
865sub coord2local {
866 my ($self, $x, $y) = @_;
867
868 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
869}
870
871sub coord2global {
872 my ($self, $x, $y) = @_;
873
874 $x = List::Util::min $self->{w}, $x - $self->{view_x};
875 $y = List::Util::min $self->{h}, $y - $self->{view_y};
876
877 $self->SUPER::coord2global ($x, $y)
878}
879
880sub find_widget {
881 my ($self, $x, $y) = @_;
882
883 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
884 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
885 ) {
886 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
887 } else {
888 $self->CFClient::UI::Base::find_widget ($x, $y)
889 }
890}
891
744sub _render { 892sub _render {
745 my ($self) = @_; 893 my ($self) = @_;
746 894
747 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
748 896
… …
759 my $class = shift; 907 my $class = shift;
760 908
761 my $self; 909 my $self;
762 910
763 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
764 vertical => 1, 912 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub { 914 on_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 915 $self->{vp}->set_offset (0, $_[1]);
768 }, 916 },
769 ; 917 ;
770 918
771 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort), 920 vp => (new CFClient::UI::ViewPort expand => 1),
773 slider => $slider, 921 slider => $slider,
774 @_, 922 @_,
775 ); 923 );
776 924
777 $self->{vp}->add ($self->{scrolled}); 925 $self->{vp}->add ($self->{scrolled});
… …
779 $self->add ($self->{slider}); 927 $self->add ($self->{slider});
780 928
781 $self 929 $self
782} 930}
783 931
932sub update {
933 my ($self) = @_;
934
935 $self->SUPER::update;
936
937 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940}
941
942sub size_allocate {
943 my ($self, $w, $h) = @_;
944
945 $self->SUPER::size_allocate ($w, $h);
946
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949}
950
784#TODO# update range on size_allocate depeneing on child 951#TODO# update range on size_allocate depending on child
785# update viewport offset on scroll 952# update viewport offset on scroll
786 953
787############################################################################# 954#############################################################################
788 955
789package CFClient::UI::Frame; 956package CFClient::UI::Frame;
… …
793use CFClient::OpenGL; 960use CFClient::OpenGL;
794 961
795sub new { 962sub new {
796 my $class = shift; 963 my $class = shift;
797 964
798 my $self = $class->SUPER::new ( 965 $class->SUPER::new (
799 bg => [1, 1, 1, 1], 966 bg => undef,
800 border_bg => [1, 1, 1, 1],
801 border => 0.8,
802 @_ 967 @_,
803 ); 968 )
804
805 $self
806} 969}
807 970
808sub _draw { 971sub _draw {
809 my ($self) = @_; 972 my ($self) = @_;
810 973
811 my ($w, $h) = ($self->{w}, $self->{h}); 974 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)};
812 976
813 glEnable GL_BLEND; 977 glEnable GL_BLEND;
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glEnable GL_TEXTURE_2D; 979 glColor @{ $self->{bg} };
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817 980
818# glBegin GL_QUADS; 981 glBegin GL_QUADS;
819# glColor 0, 0, 0, 0;
820# glVertex 0 , 0; 982 glVertex 0 , 0;
821# glVertex 0 , $h; 983 glVertex 0 , $h;
822# glVertex $w, $h; 984 glVertex $w, $h;
823# glVertex $w, 0; 985 glVertex $w, 0;
824# glEnd; 986 glEnd;
825 987
826
827 $self->child->draw;
828 glDisable GL_BLEND; 988 glDisable GL_BLEND;
829 glDisable GL_TEXTURE_2D; 989 }
990
991 $self->SUPER::_draw;
830} 992}
831 993
832############################################################################# 994#############################################################################
833 995
834package CFClient::UI::FancyFrame; 996package CFClient::UI::FancyFrame;
… …
842 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
843 1005
844sub new { 1006sub new {
845 my $class = shift; 1007 my $class = shift;
846 1008
847 # TODO: user_x, user_y, overwrite moveto?
848
849 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
850 bg => [1, 1, 1, 1], 1010 bg => [1, 1, 1, 1],
851 border_bg => [1, 1, 1, 1], 1011 border_bg => [1, 1, 1, 1],
852 border => 0.6, 1012 border => 0.6,
1013 is_toplevel => 1,
853 can_events => 1, 1014 can_events => 1,
854 @_ 1015 @_
855 ); 1016 );
856 1017
857 $self->{title} &&= new CFClient::UI::Label 1018 $self->{title} &&= new CFClient::UI::Label
858 align => 0, 1019 align => 0,
… …
882 my ($self, $w, $h) = @_; 1043 my ($self, $w, $h) = @_;
883 1044
884 $h -= List::Util::max 0, $self->border * 2; 1045 $h -= List::Util::max 0, $self->border * 2;
885 $w -= List::Util::max 0, $self->border * 2; 1046 $w -= List::Util::max 0, $self->border * 2;
886 1047
887 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1048 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
888 if $self->{title}; 1049 if $self->{title};
889 1050
890 $self->child->configure ($self->border, $self->border, $w, $h); 1051 $self->child->configure ($self->border, $self->border, $w, $h);
891} 1052}
892 1053
… …
911 my ($ev, $x, $y) = @_; 1072 my ($ev, $x, $y) = @_;
912 1073
913 my $dx = $ev->{x} - $ox; 1074 my $dx = $ev->{x} - $ox;
914 my $dy = $ev->{y} - $oy; 1075 my $dy = $ev->{y} - $oy;
915 1076
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
916 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
917 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
918 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1081 $self->move ($self->{user_x}, $self->{user_y});
919 $self->check_size; 1082 $self->check_size;
920 }; 1083 };
921 1084
922 } elsif ($lr ^ $td) { 1085 } elsif ($lr ^ $td) {
923 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1086 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
926 $self->{motion} = sub { 1089 $self->{motion} = sub {
927 my ($ev, $x, $y) = @_; 1090 my ($ev, $x, $y) = @_;
928 1091
929 ($x, $y) = ($ev->{x}, $ev->{y}); 1092 ($x, $y) = ($ev->{x}, $ev->{y});
930 1093
931 $self->move ($bx + $x - $ox, $by + $y - $oy); 1094 $self->{user_x} = $bx + $x - $ox;
1095 $self->{user_y} = $by + $y - $oy;
1096
1097 $self->move ($self->{user_x}, $self->{user_y});
932 $self->update; 1098 $self->update;
933 }; 1099 };
934 } 1100 }
935} 1101}
936 1102
… …
950 my ($self) = @_; 1116 my ($self) = @_;
951 1117
952 my ($w, $h ) = ($self->{w}, $self->{h}); 1118 my ($w, $h ) = ($self->{w}, $self->{h});
953 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1119 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954 1120
955 glEnable GL_BLEND;
956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957 glEnable GL_TEXTURE_2D; 1121 glEnable GL_TEXTURE_2D;
958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1122 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959 1123
960 my $border = $self->border; 1124 my $border = $self->border;
961 1125
962 glColor @{ $self->{border_bg} }; 1126 glColor @{ $self->{border_bg} };
963 $tex[1]->draw_quad (0, 0, $w, $border); 1127 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
964 $tex[3]->draw_quad (0, $border, $border, $ch); 1128 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1129 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1130 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
967 1131
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1132 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969 my $bg = $tex[0]; 1133 my $bg = $tex[0];
970 1134
971 # TODO: repeat texture not scale 1135 # TODO: repeat texture not scale
… …
975 glColor @{ $self->{bg} }; 1139 glColor @{ $self->{bg} };
976 1140
977 $bg->{s} = $rep_x; 1141 $bg->{s} = $rep_x;
978 $bg->{t} = $rep_y; 1142 $bg->{t} = $rep_y;
979 $bg->{wrap_mode} = 1; 1143 $bg->{wrap_mode} = 1;
980 $bg->draw_quad ($border, $border, $cw, $ch); 1144 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145 }
981 1146
982 glDisable GL_TEXTURE_2D; 1147 glDisable GL_TEXTURE_2D;
983 glDisable GL_BLEND;
984 }
985 1148
986 $self->{title}->draw if $self->{title}; 1149 $self->{title}->draw if $self->{title};
987 1150
988 $self->child->draw; 1151 $self->child->draw;
989} 1152}
… …
1001sub new { 1164sub new {
1002 my $class = shift; 1165 my $class = shift;
1003 1166
1004 $class->SUPER::new ( 1167 $class->SUPER::new (
1005 col_expand => [], 1168 col_expand => [],
1006 @_ 1169 @_,
1007 ) 1170 )
1171}
1172
1173sub children {
1174 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1008} 1175}
1009 1176
1010sub add { 1177sub add {
1011 my ($self, $x, $y, $child) = @_; 1178 my ($self, $x, $y, $child) = @_;
1012 1179
1013 $child->set_parent ($self); 1180 $child->set_parent ($self);
1014 $self->{children}[$y][$x] = $child; 1181 $self->{children}[$y][$x] = $child;
1015 1182
1016 $child->check_size; 1183 $self->check_size (1);
1017} 1184}
1018 1185
1019sub children {
1020 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1021}
1022
1023# TODO: move to container class maybe? send childs a signal on removal? 1186# TODO: move to container class maybe? send children a signal on removal?
1024sub clear { 1187sub clear {
1025 my ($self) = @_; 1188 my ($self) = @_;
1026 1189
1027 my @children = $self->children; 1190 my @children = $self->children;
1028 delete $self->{children}; 1191 delete $self->{children};
… …
1030 for (@children) { 1193 for (@children) {
1031 delete $_->{parent}; 1194 delete $_->{parent};
1032 $_->hide; 1195 $_->hide;
1033 } 1196 }
1034 1197
1198 $self->check_size (1);
1035 $self->update; 1199 $self->update;
1036} 1200}
1037 1201
1038sub get_wh { 1202sub get_wh {
1039 my ($self) = @_; 1203 my ($self) = @_;
… …
1071sub size_allocate { 1235sub size_allocate {
1072 my ($self, $w, $h) = @_; 1236 my ($self, $w, $h) = @_;
1073 1237
1074 my ($ws, $hs) = $self->get_wh; 1238 my ($ws, $hs) = $self->get_wh;
1075 1239
1076 my $req_w = sum @$ws; 1240 my $req_w = (sum @$ws) || 1;
1077 my $req_h = sum @$hs; 1241 my $req_h = (sum @$hs) || 1;
1078 1242
1079 # TODO: nicer code && do row_expand 1243 # TODO: nicer code && do row_expand
1080 my @col_expand = @{$self->{col_expand}}; 1244 my @col_expand = @{$self->{col_expand}};
1081 @col_expand = (1) x @$ws unless @col_expand; 1245 @col_expand = (1) x @$ws unless @col_expand;
1082 my $col_expand = (sum @col_expand) || 1; 1246 my $col_expand = (sum @col_expand) || 1;
… …
1136 } 1300 }
1137} 1301}
1138 1302
1139############################################################################# 1303#############################################################################
1140 1304
1141package CFClient::UI::HBox; 1305package CFClient::UI::Box;
1142
1143# TODO: wrap into common Box base class
1144 1306
1145our @ISA = CFClient::UI::Container::; 1307our @ISA = CFClient::UI::Container::;
1146 1308
1147sub size_request { 1309sub size_request {
1148 my ($self) = @_; 1310 my ($self) = @_;
1149 1311
1150 my @alloc = map [$_->size_request], @{$self->{children}}; 1312 $self->{vertical}
1151 1313 ? (
1152 ( 1314 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1153 (List::Util::sum map $_->[0], @alloc), 1315 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1154 (List::Util::max map $_->[1], @alloc), 1316 )
1155 ) 1317 : (
1318 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1320 )
1156} 1321}
1157 1322
1158sub size_allocate { 1323sub size_allocate {
1159 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1160 1325
1161 ($h, $w) = ($w, $h); 1326 my $space = $self->{vertical} ? $h : $w;
1162
1163 my $children = $self->{children}; 1327 my $children = $self->{children};
1164 1328
1165 my @h = map $_->{req_w}, @$children; 1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1166
1167 my $req_h = List::Util::sum @h; 1330 my $req = List::Util::sum @req;
1168 1331
1169 if ($req_h > $h) { 1332 if ($req > $space) {
1170 # ah well, not enough space 1333 # ah well, not enough space
1171 $_ *= $h / $req_h for @h; 1334 $_ *= $space / $req for @req;
1172 } else { 1335 } else {
1173 my $exp = List::Util::sum map $_->{expand}, @$children; 1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1174 $exp ||= 1;
1175 1337
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1176 for (0 .. $#$children) { 1339 for 0 .. $#$children;
1177 my $child = $children->[$_];
1178
1179 my $alloc_h = $h[$_];
1180 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1181 $h[$_] = $alloc_h;
1182 }
1183 } 1340 }
1184 1341
1185 CFClient::UI::harmonize \@h; 1342 CFClient::UI::harmonize \@req;
1186 1343
1187 my $y = 0; 1344 my $pos = 0;
1188 for (0 .. $#$children) { 1345 for (0 .. $#$children) {
1189 my $child = $children->[$_];
1190 my $h = $h[$_]; 1346 my $alloc = $req[$_];
1191 $child->configure ($y, 0, $h, $w); 1347 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1192 1348
1193 $y += $h; 1349 $pos += $alloc;
1194 } 1350 }
1195 1351
1196 1 1352 1
1197} 1353}
1198 1354
1199############################################################################# 1355#############################################################################
1200 1356
1357package CFClient::UI::HBox;
1358
1359our @ISA = CFClient::UI::Box::;
1360
1361sub new {
1362 my $class = shift;
1363
1364 $class->SUPER::new (
1365 vertical => 0,
1366 @_,
1367 )
1368}
1369
1370#############################################################################
1371
1201package CFClient::UI::VBox; 1372package CFClient::UI::VBox;
1202 1373
1203# TODO: wrap into common Box base class
1204
1205our @ISA = CFClient::UI::Container::; 1374our @ISA = CFClient::UI::Box::;
1206 1375
1207sub size_request { 1376sub new {
1208 my ($self) = @_; 1377 my $class = shift;
1209 1378
1210 my @alloc = map [$_->size_request], @{$self->{children}}; 1379 $class->SUPER::new (
1211 1380 vertical => 1,
1212 ( 1381 @_,
1213 (List::Util::max map $_->[0], @alloc),
1214 (List::Util::sum map $_->[1], @alloc),
1215 ) 1382 )
1216} 1383}
1217 1384
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############################################################################# 1385#############################################################################
1256 1386
1257package CFClient::UI::Label; 1387package CFClient::UI::Label;
1258 1388
1259our @ISA = CFClient::UI::Base::; 1389our @ISA = CFClient::UI::DrawBG::;
1260 1390
1261use CFClient::OpenGL; 1391use CFClient::OpenGL;
1262 1392
1263sub new { 1393sub new {
1264 my ($class, %arg) = @_; 1394 my ($class, %arg) = @_;
1265 1395
1266 my $self = $class->SUPER::new ( 1396 my $self = $class->SUPER::new (
1267 fg => [1, 1, 1], 1397 fg => [1, 1, 1],
1398 #bg => none
1399 #active_bg => none
1268 #font => default_font 1400 #font => default_font
1401 #text => initial text
1402 #markup => initial narkup
1403 #max_w => maximum pixel width
1404 ellipsise => 3, # end
1405 layout => (new CFClient::Layout),
1269 fontsize => 1, 1406 fontsize => 1,
1270 text => "",
1271 align => -1, 1407 align => -1,
1272 valign => -1, 1408 valign => -1,
1273 padding => 2, 1409 padding => 2,
1274 layout => new CFClient::Layout,
1275 can_events => 0, 1410 can_events => 0,
1276 %arg 1411 %arg
1277 ); 1412 );
1278 1413
1279 if (exists $self->{template}) { 1414 if (exists $self->{template}) {
1280 my $layout = new CFClient::Layout; 1415 my $layout = new CFClient::Layout;
1281 $layout->set_text (delete $self->{template}); 1416 $layout->set_text (delete $self->{template});
1282 $self->{template} = $layout; 1417 $self->{template} = $layout;
1283 } 1418 }
1284 1419
1285 $self->set_text (delete $self->{text}) if exists $self->{text}; 1420 if (exists $self->{markup}) {
1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1421 $self->set_markup (delete $self->{markup});
1422 } else {
1423 $self->set_text (delete $self->{text});
1424 }
1287 1425
1288 $self 1426 $self
1289} 1427}
1290 1428
1291sub escape { 1429sub escape($) {
1292 local $_ = $_[1]; 1430 local $_ = $_[0];
1293 1431
1294 s/&/&amp;/g; 1432 s/&/&amp;/g;
1295 s/>/&gt;/g; 1433 s/>/&gt;/g;
1296 s/</&lt;/g; 1434 s/</&lt;/g;
1297 1435
1298 $_[1] 1436 $_
1299} 1437}
1300 1438
1301sub update { 1439sub update {
1302 my ($self) = @_; 1440 my ($self) = @_;
1303 1441
1304 delete $self->{texture}; 1442 delete $self->{texture};
1305 $self->SUPER::update; 1443 $self->SUPER::update;
1306} 1444}
1307 1445
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1314sub set_text { 1446sub set_text {
1315 my ($self, $text) = @_; 1447 my ($self, $text) = @_;
1316 1448
1317 return if $self->{text} eq "T$text"; 1449 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text"; 1450 $self->{text} = "T$text";
1319 1451
1452 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320 $self->{layout}->set_text ($text); 1453 $self->{layout}->set_text ($text);
1321 1454
1322 delete $self->{texture};
1323 $self->update; 1455 $self->update;
1324 $self->check_size; 1456 $self->check_size;
1325} 1457}
1326 1458
1327sub set_markup { 1459sub set_markup {
1328 my ($self, $markup) = @_; 1460 my ($self, $markup) = @_;
1329 1461
1330 return if $self->{text} eq "M$markup"; 1462 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup"; 1463 $self->{text} = "M$markup";
1332 1464
1465 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466
1467 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333 $self->{layout}->set_markup ($markup); 1468 $self->{layout}->set_markup ($markup);
1334 1469
1335 delete $self->{texture};
1336 $self->update; 1470 $self->update;
1337 $self->check_size; 1471 $self->check_size;
1338} 1472}
1339 1473
1340sub size_request { 1474sub size_request {
1341 my ($self) = @_; 1475 my ($self) = @_;
1342 1476
1343 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1477 $self->{layout}->set_font ($self->{font}) if $self->{font};
1344 $self->{layout}->set_width ($self->{max_w} || -1); 1478 $self->{layout}->set_width ($self->{max_w} || -1);
1479 $self->{layout}->set_ellipsise ($self->{ellipsise});
1480 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1345 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1481 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1346 1482
1347 my ($w, $h) = $self->{layout}->size; 1483 my ($w, $h) = $self->{layout}->size;
1348 1484
1349 if (exists $self->{template}) { 1485 if (exists $self->{template}) {
… …
1371sub set_fontsize { 1507sub set_fontsize {
1372 my ($self, $fontsize) = @_; 1508 my ($self, $fontsize) = @_;
1373 1509
1374 $self->{fontsize} = $fontsize; 1510 $self->{fontsize} = $fontsize;
1375 delete $self->{texture}; 1511 delete $self->{texture};
1512
1513 $self->update;
1376 $self->check_size; 1514 $self->check_size;
1377 $self->update;
1378} 1515}
1379 1516
1380sub _draw { 1517sub _draw {
1381 my ($self) = @_; 1518 my ($self) = @_;
1382 1519
1520 $self->SUPER::_draw; # draw background, if applicable
1521
1383 my $tex = $self->{texture} ||= do { 1522 my $tex = $self->{texture} ||= do {
1523 $self->{layout}->set_foreground (@{$self->{fg}});
1384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1524 $self->{layout}->set_font ($self->{font}) if $self->{font};
1385 $self->{layout}->set_width ($self->{w}); 1525 $self->{layout}->set_width ($self->{w});
1526 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1386 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529
1387 new_from_layout CFClient::Texture $self->{layout} 1530 my $tex = new_from_layout CFClient::Texture $self->{layout};
1531
1532 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1533 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1534 : ($self->{w} - $tex->{w}) * 0.5);
1535
1536 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1537 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1538 : ($self->{h} - $tex->{h}) * 0.5);
1539
1540 $tex
1388 }; 1541 };
1389 1542
1390 glEnable GL_BLEND;
1391 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392 glEnable GL_TEXTURE_2D; 1543 glEnable GL_TEXTURE_2D;
1393 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394 1545
1546 if ($tex->{format} == GL_ALPHA) {
1395 glColor @{$self->{fg}}; 1547 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}); 1548 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1549 } else {
1550 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1551 }
1410 1552
1411 glDisable GL_TEXTURE_2D; 1553 glDisable GL_TEXTURE_2D;
1412 glDisable GL_BLEND;
1413} 1554}
1414 1555
1415############################################################################# 1556#############################################################################
1416 1557
1417package CFClient::UI::EntryBase; 1558package CFClient::UI::EntryBase;
… …
1430 active_fg => [0, 0, 0], 1571 active_fg => [0, 0, 0],
1431 can_hover => 1, 1572 can_hover => 1,
1432 can_focus => 1, 1573 can_focus => 1,
1433 valign => 0, 1574 valign => 0,
1434 can_events => 1, 1575 can_events => 1,
1576 #text => ...
1435 @_ 1577 @_
1436 ) 1578 )
1437} 1579}
1438 1580
1439sub _set_text { 1581sub _set_text {
… …
1449 $self->{text} = $text; 1591 $self->{text} = $text;
1450 1592
1451 $text =~ s/./*/g if $self->{hidden}; 1593 $text =~ s/./*/g if $self->{hidden};
1452 $self->{layout}->set_text ("$text "); 1594 $self->{layout}->set_text ("$text ");
1453 1595
1454 $self->emit (changed => $self->{text}); 1596 $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} 1597}
1474 1598
1475sub set_text { 1599sub set_text {
1476 my ($self, $text) = @_; 1600 my ($self, $text) = @_;
1477 1601
1478 $self->{cursor} = length $text; 1602 $self->{cursor} = length $text;
1479 $self->_set_text ($text); 1603 $self->_set_text ($text);
1480 $self->update; 1604 $self->update;
1605 $self->check_size;
1606}
1607
1608sub get_text {
1609 $_[0]{text}
1610}
1611
1612sub size_request {
1613 my ($self) = @_;
1614
1615 my ($w, $h) = $self->SUPER::size_request;
1616
1617 ($w + 1, $h) # add 1 for cursor
1481} 1618}
1482 1619
1483sub key_down { 1620sub key_down {
1484 my ($self, $ev) = @_; 1621 my ($self, $ev) = @_;
1485 1622
… …
1487 my $sym = $ev->{sym}; 1624 my $sym = $ev->{sym};
1488 my $uni = $ev->{unicode}; 1625 my $uni = $ev->{unicode};
1489 1626
1490 my $text = $self->get_text; 1627 my $text = $self->get_text;
1491 1628
1492 if ($sym == 8) { 1629 if ($uni == 8) {
1493 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1630 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494 } elsif ($sym == 127) { 1631 } elsif ($uni == 127) {
1495 substr $text, $self->{cursor}, 1, ""; 1632 substr $text, $self->{cursor}, 1, "";
1496 } elsif ($sym == CFClient::SDLK_LEFT) { 1633 } elsif ($sym == CFClient::SDLK_LEFT) {
1497 --$self->{cursor} if $self->{cursor}; 1634 --$self->{cursor} if $self->{cursor};
1498 } elsif ($sym == CFClient::SDLK_RIGHT) { 1635 } elsif ($sym == CFClient::SDLK_RIGHT) {
1499 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1636 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1500 } elsif ($sym == CFClient::SDLK_HOME) { 1637 } elsif ($sym == CFClient::SDLK_HOME) {
1501 $self->{cursor} = 0; 1638 $self->{cursor} = 0;
1502 } elsif ($sym == CFClient::SDLK_END) { 1639 } elsif ($sym == CFClient::SDLK_END) {
1503 $self->{cursor} = length $text; 1640 $self->{cursor} = length $text;
1504 } elsif ($sym == 27) { 1641 } elsif ($uni == 27) {
1505 $self->emit ('escape'); 1642 $self->_emit ('escape');
1506 } elsif ($uni) { 1643 } elsif ($uni) {
1507 substr $text, $self->{cursor}++, 0, chr $uni; 1644 substr $text, $self->{cursor}++, 0, chr $uni;
1508 } 1645 }
1509 1646
1510 $self->_set_text ($text); 1647 $self->_set_text ($text);
1511 $self->update; 1648 $self->update;
1649 $self->check_size;
1512} 1650}
1513 1651
1514sub focus_in { 1652sub focus_in {
1515 my ($self) = @_; 1653 my ($self) = @_;
1516 1654
… …
1596 if ($sym == 13) { 1734 if ($sym == 13) {
1597 unshift @{$self->{history}}, 1735 unshift @{$self->{history}},
1598 my $txt = $self->get_text; 1736 my $txt = $self->get_text;
1599 $self->{history_pointer} = -1; 1737 $self->{history_pointer} = -1;
1600 $self->{history_saveback} = ''; 1738 $self->{history_saveback} = '';
1601 $self->emit (activate => $txt); 1739 $self->_emit (activate => $txt);
1602 $self->update; 1740 $self->update;
1603 1741
1604 } elsif ($sym == CFClient::SDLK_UP) { 1742 } elsif ($sym == CFClient::SDLK_UP) {
1605 if ($self->{history_pointer} < 0) { 1743 if ($self->{history_pointer} < 0) {
1606 $self->{history_saveback} = $self->get_text; 1744 $self->{history_saveback} = $self->get_text;
… …
1645 my $class = shift; 1783 my $class = shift;
1646 1784
1647 $class->SUPER::new ( 1785 $class->SUPER::new (
1648 padding => 4, 1786 padding => 4,
1649 fg => [1, 1, 1], 1787 fg => [1, 1, 1],
1650 bg => [1, 1, 1, 0.2],
1651 active_fg => [0, 0, 1], 1788 active_fg => [0, 0, 1],
1652 can_hover => 1, 1789 can_hover => 1,
1653 align => 0, 1790 align => 0,
1654 valign => 0, 1791 valign => 0,
1655 can_events => 1, 1792 can_events => 1,
1656 @_ 1793 @_
1657 ) 1794 )
1658} 1795}
1659 1796
1797sub activate { }
1798
1660sub button_up { 1799sub button_up {
1661 my ($self, $ev, $x, $y) = @_; 1800 my ($self, $ev, $x, $y) = @_;
1662 1801
1802 $self->emit ("activate")
1663 if ($x >= 0 && $x < $self->{w} 1803 if $x >= 0 && $x < $self->{w}
1664 && $y >= 0 && $y < $self->{h}) { 1804 && $y >= 0 && $y < $self->{h};
1665 $self->emit ("activate");
1666 }
1667} 1805}
1668 1806
1669sub _draw { 1807sub _draw {
1670 my ($self) = @_; 1808 my ($self) = @_;
1671 1809
… …
1673 1811
1674 if ($GRAB == $self) { 1812 if ($GRAB == $self) {
1675 $self->{fg} = $self->{active_fg}; 1813 $self->{fg} = $self->{active_fg};
1676 } 1814 }
1677 1815
1678 glEnable GL_BLEND;
1679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680 glEnable GL_TEXTURE_2D; 1816 glEnable GL_TEXTURE_2D;
1681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682 glColor 0, 0, 0, 1; 1818 glColor 0, 0, 0, 1;
1683 1819
1684 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1820 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685 1821
1686 glDisable GL_TEXTURE_2D; 1822 glDisable GL_TEXTURE_2D;
1687 glDisable GL_BLEND;
1688 1823
1689 $self->SUPER::_draw; 1824 $self->SUPER::_draw;
1690} 1825}
1691 1826
1692############################################################################# 1827#############################################################################
… …
1706 1841
1707 $class->SUPER::new ( 1842 $class->SUPER::new (
1708 padding => 2, 1843 padding => 2,
1709 fg => [1, 1, 1], 1844 fg => [1, 1, 1],
1710 active_fg => [1, 1, 0], 1845 active_fg => [1, 1, 0],
1846 bg => [0, 0, 0, 0.2],
1847 active_bg => [1, 1, 1, 0.5],
1711 state => 0, 1848 state => 0,
1712 can_hover => 1, 1849 can_hover => 1,
1713 @_ 1850 @_
1714 ) 1851 )
1715} 1852}
… …
1724 my ($self, $ev, $x, $y) = @_; 1861 my ($self, $ev, $x, $y) = @_;
1725 1862
1726 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1863 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1727 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1864 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1728 $self->{state} = !$self->{state}; 1865 $self->{state} = !$self->{state};
1729 $self->emit (changed => $self->{state}); 1866 $self->_emit (changed => $self->{state});
1730 } 1867 }
1731} 1868}
1732 1869
1733sub _draw { 1870sub _draw {
1734 my ($self) = @_; 1871 my ($self) = @_;
… …
1739 1876
1740 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1877 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1741 1878
1742 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1879 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743 1880
1744 glEnable GL_BLEND; 1881 my $tex = $self->{state} ? $tex[1] : $tex[0];
1882
1745 glEnable GL_TEXTURE_2D; 1883 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); 1884 $tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752 glDisable GL_TEXTURE_2D; 1885 glDisable GL_TEXTURE_2D;
1753 glDisable GL_BLEND;
1754} 1886}
1755 1887
1756############################################################################# 1888#############################################################################
1757 1889
1758package CFClient::UI::Image; 1890package CFClient::UI::Image;
… …
1801 glTranslate 0, -$self->{w}, 0; 1933 glTranslate 0, -$self->{w}, 0;
1802 1934
1803 ($w, $h) = ($h, $w); 1935 ($w, $h) = ($h, $w);
1804 } 1936 }
1805 1937
1806 glEnable GL_BLEND;
1807 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808 glEnable GL_TEXTURE_2D; 1938 glEnable GL_TEXTURE_2D;
1809 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1939 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810 1940
1811 $tex->draw_quad (0, 0, $w, $h); 1941 $tex->draw_quad_alpha (0, 0, $w, $h);
1812 1942
1813 glDisable GL_BLEND;
1814 glDisable GL_TEXTURE_2D; 1943 glDisable GL_TEXTURE_2D;
1815} 1944}
1816 1945
1817############################################################################# 1946#############################################################################
1818 1947
… …
2007 qw(s1_slider.png s1_slider_bg.png); 2136 qw(s1_slider.png s1_slider_bg.png);
2008 2137
2009sub new { 2138sub new {
2010 my $class = shift; 2139 my $class = shift;
2011 2140
2012 # range [value, low, high, page] 2141 # range [value, low, high, page, unit]
2013 2142
2014 # TODO: 0-width page 2143 # TODO: 0-width page
2015 # TODO: req_w/h are wrong with vertical 2144 # TODO: req_w/h are wrong with vertical
2016 # TODO: calculations are off 2145 # TODO: calculations are off
2017 my $self = $class->SUPER::new ( 2146 my $self = $class->SUPER::new (
2018 fg => [1, 1, 1], 2147 fg => [1, 1, 1],
2019 active_fg => [0, 0, 0], 2148 active_fg => [0, 0, 0],
2149 bg => [0, 0, 0, 0.2],
2150 active_bg => [1, 1, 1, 0.5],
2020 range => [0, 0, 100, 10], 2151 range => [0, 0, 100, 10, 0],
2021 req_w => $::WIDTH / 80, 2152 req_w => $::WIDTH / 80,
2022 req_h => $::WIDTH / 80, 2153 req_h => $::WIDTH / 80,
2023 vertical => 0, 2154 vertical => 0,
2024 can_hover => 1, 2155 can_hover => 1,
2025 inner_pad => 5, 2156 inner_pad => 0.02,
2026 @_ 2157 @_
2027 ); 2158 );
2028 2159
2160 $self->set_value ($self->{range}[0]);
2161 $self->update;
2162
2029 $self 2163 $self
2164}
2165
2166sub set_range {
2167 my ($self, $range) = @_;
2168
2169 ($range, $self->{range}) = ($self->{range}, $range);
2170
2171 $self->update
2172 if "@$range" ne "@{$self->{range}}";
2173}
2174
2175sub set_value {
2176 my ($self, $value) = @_;
2177
2178 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2179
2180 $hi = $lo + 1 if $hi <= $lo;
2181
2182 $page = $hi - $lo if $page > $hi - $lo;
2183
2184 $value = $lo if $value < $lo;
2185 $value = $hi - $page if $value > $hi - $page;
2186
2187 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2188 if $unit;
2189
2190 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2191
2192 if ($value != $old_value) {
2193 $self->_emit (changed => $value);
2194 $self->update;
2195 }
2030} 2196}
2031 2197
2032sub size_request { 2198sub size_request {
2033 my ($self) = @_; 2199 my ($self) = @_;
2034 2200
… …
2040 2206
2041sub button_down { 2207sub button_down {
2042 my ($self, $ev, $x, $y) = @_; 2208 my ($self, $ev, $x, $y) = @_;
2043 2209
2044 $self->SUPER::button_down ($ev, $x, $y); 2210 $self->SUPER::button_down ($ev, $x, $y);
2211
2212 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2213
2045 $self->mouse_motion ($ev, $x, $y); 2214 $self->mouse_motion ($ev, $x, $y);
2046} 2215}
2047 2216
2048sub mouse_motion { 2217sub mouse_motion {
2049 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
2050 2219
2051 if ($GRAB == $self) { 2220 if ($GRAB == $self) {
2221 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2222
2223 my (undef, $lo, $hi, $page) = @{$self->{range}};
2224
2225 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2226
2227 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2228 }
2229}
2230
2231sub update {
2232 my ($self) = @_;
2233
2234 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2235 $self->set_value ($self->{range}[0]);
2236
2052 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2237 my ($value, $lo, $hi, $page) = @{$self->{range}};
2238 my $range = ($hi - $page - $lo) || 1e-100;
2053 2239
2054 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2240 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2055 2241
2056 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2242 $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 2243 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2058 2244
2059 $x -= $inner_pad_px; # substract the padding 2245 $value = ($value - $lo) / $range;
2060 $x = $x * ($hi - $lo) / $inner_w + $lo; 2246 $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 2247
2065 $self->emit (changed => $x); 2248 $self->{knob_x} = $value - $knob_w * 0.5;
2066 $self->update; 2249 $self->{knob_w} = $knob_w;
2067 } 2250 });
2068}
2069 2251
2070# the inner_* stuff is for generating a padding for the slider handle, 2252 $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} 2253}
2077 2254
2078sub _draw { 2255sub _draw {
2079 my ($self) = @_; 2256 my ($self) = @_;
2080 2257
2081 $self->SUPER::_draw (); 2258 $self->SUPER::_draw ();
2082 2259
2083 my ($w, $h) = @$self{qw(w h)}; 2260 glScale $self->{w}, $self->{h};
2084 2261
2085 if ($self->{vertical}) { 2262 if ($self->{vertical}) {
2086 # draw a vertical slider like a rotated horizontal slider 2263 # draw a vertical slider like a rotated horizontal slider
2087 2264
2265 glTranslate 1, 0, 0;
2088 glRotate 90, 0, 0, 1; 2266 glRotate 90, 0, 0, 1;
2089 glTranslate 0, -$self->{w}, 0;
2090
2091 ($w, $h) = ($h, $w);
2092 } 2267 }
2093 2268
2094 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2269 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2270 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096 2271
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; 2272 glEnable GL_TEXTURE_2D;
2118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119 2274
2120 # draw background 2275 # draw background
2121 $tex[1]->draw_quad (0, 0, $w, $h); 2276 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122 2277
2123 # draw handle 2278 # draw handle
2124 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2279 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2125 2280
2126 glDisable GL_BLEND;
2127 glDisable GL_TEXTURE_2D; 2281 glDisable GL_TEXTURE_2D;
2128} 2282}
2283
2284#############################################################################
2285
2286package CFClient::UI::ValSlider;
2287
2288our @ISA = CFClient::UI::HBox::;
2289
2290sub new {
2291 my ($class, %arg) = @_;
2292
2293 my $range = delete $arg{range};
2294
2295 my $self = $class->SUPER::new (
2296 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2297 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2298 to_value => sub { shift },
2299 from_value => sub { shift },
2300 %arg,
2301 );
2302
2303 $self->{slider}->connect (changed => sub {
2304 my ($self, $value) = @_;
2305 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2306 $self->{parent}->emit (changed => $value);
2307 });
2308
2309# $self->{entry}->connect (changed => sub {
2310# my ($self, $value) = @_;
2311# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2312# $self->{parent}->emit (changed => $value);
2313# });
2314
2315 $self->add ($self->{slider}, $self->{entry});
2316
2317 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2318
2319 $self
2320}
2321
2322sub set_range { shift->{slider}->set_range (@_) }
2323sub set_value { shift->{slider}->set_value (@_) }
2129 2324
2130############################################################################# 2325#############################################################################
2131 2326
2132package CFClient::UI::TextView; 2327package CFClient::UI::TextView;
2133 2328
… …
2142 fontsize => 1, 2337 fontsize => 1,
2143 can_events => 0, 2338 can_events => 0,
2144 #font => default_font 2339 #font => default_font
2145 @_, 2340 @_,
2146 2341
2147 layout => (new CFClient::Layout), 2342 layout => (new CFClient::Layout 1),
2148 par => [], 2343 par => [],
2149 height => 0, 2344 height => 0,
2150 children => [ 2345 children => [
2151 (new CFClient::UI::Empty expand => 1), 2346 (new CFClient::UI::Empty expand => 1),
2152 (new CFClient::UI::Slider vertical => 1), 2347 (new CFClient::UI::Slider vertical => 1),
… …
2163 2358
2164 $self->{fontsize} = $fontsize; 2359 $self->{fontsize} = $fontsize;
2165 $self->reflow; 2360 $self->reflow;
2166} 2361}
2167 2362
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 { 2363sub size_allocate {
2188 my ($self, $w, $h) = @_; 2364 my ($self, $w, $h) = @_;
2189 2365
2190 $self->SUPER::size_allocate ($w, $h); 2366 $self->SUPER::size_allocate ($w, $h);
2191 2367
… …
2194 $self->{layout}->set_width ($self->{children}[0]{w}); 2370 $self->{layout}->set_width ($self->{children}[0]{w});
2195 2371
2196 $self->reflow; 2372 $self->reflow;
2197} 2373}
2198 2374
2375sub text_size {
2376 my ($self, $text, $indent) = @_;
2377
2378 my $layout = $self->{layout};
2379
2380 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2381 $layout->set_width ($self->{children}[0]{w} - $indent);
2382 $layout->set_markup ($text);
2383
2384 $layout->size
2385}
2386
2387sub reflow {
2388 my ($self) = @_;
2389
2390 $self->{need_reflow}++;
2391 $self->update;
2392}
2393
2394sub set_offset {
2395 my ($self, $offset) = @_;
2396
2397 # todo: base offset on lines or so, not on pixels
2398 $self->{children}[1]->set_value ($offset);
2399}
2400
2401sub clear {
2402 my ($self) = @_;
2403
2404 $self->{par} = [];
2405 $self->{height} = 0;
2406 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2407}
2408
2199sub add_paragraph { 2409sub add_paragraph {
2200 my ($self, $color, $text) = @_; 2410 my ($self, $color, $text, $indent) = @_;
2201 2411
2202 #TODO: intelligently "reformat" paragraph 2412 for my $line (split /\n/, $text) {
2203 2413 my ($w, $h) = $self->text_size ($line);
2204 my $height = $self->text_height ($text);
2205
2206 $self->{height} += $height; 2414 $self->{height} += $h;
2415 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2416 }
2207 2417
2208 push @{$self->{par}}, [$height, $color, $text];
2209
2210 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2418 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2211 $self->{children}[1]->update;
2212} 2419}
2213 2420
2214sub update { 2421sub update {
2215 my ($self) = @_; 2422 my ($self) = @_;
2216 2423
… …
2218 2425
2219 return unless $self->{h} > 0; 2426 return unless $self->{h} > 0;
2220 2427
2221 delete $self->{texture}; 2428 delete $self->{texture};
2222 2429
2223 $ROOT->on_refresh ($self, sub { 2430 $ROOT->on_post_alloc ($self, sub {
2431 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2432
2224 if (delete $self->{need_reflow}) { 2433 if (delete $self->{need_reflow}) {
2225 my $height = 0; 2434 my $height = 0;
2226 2435
2227 $height += $_->[0] = $self->text_height ($_->[2]) 2436 my $layout = $self->{layout};
2437
2438 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2439
2228 for @{$self->{par}}; 2440 for (@{$self->{par}}) {
2441 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2442 $layout->set_width ($W - $_->[3]);
2443 $layout->set_markup ($_->[4]);
2444 my ($w, $h) = $layout->size;
2445 $_->[0] = $w + $_->[3];
2446 $_->[1] = $h;
2447 }
2448
2449 $height += $_->[1];
2450 }
2229 2451
2230 $self->{height} = $height; 2452 $self->{height} = $height;
2231 2453
2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2454 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2233 2455
2234 delete $self->{texture}; 2456 delete $self->{texture};
2235 } 2457 }
2236 2458
2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2459 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2238 glClearColor 0, 0, 0, 0; 2460 glClearColor 0.5, 0.5, 0.5, 0;
2239 glClear GL_COLOR_BUFFER_BIT; 2461 glClear GL_COLOR_BUFFER_BIT;
2240 2462
2463 my $top = int $self->{children}[1]{range}[0];
2464
2465 my $y0 = $top;
2466 my $y1 = $top + $H;
2467
2468 my $y = 0;
2469
2470 my $layout = $self->{layout};
2471
2472 $layout->set_font ($self->{font}) if $self->{font};
2473
2241 glEnable GL_BLEND; 2474 glEnable GL_BLEND;
2475 #TODO# not correct in windows where rgba is forced off
2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2476 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 2477
2257 for my $par (@{$self->{par}}) { 2478 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2479 my $h = $par->[1];
2259 2480
2260 if ($y0 < $y + $h && $y < $y1) { 2481 if ($y0 < $y + $h && $y < $y1) {
2482 $layout->set_foreground (@{ $par->[2] });
2483 $layout->set_width ($W - $par->[3]);
2261 $layout->set_text ($par->[2]); 2484 $layout->set_markup ($par->[4]);
2262 2485
2263 glColor @{ $par->[1] }; 2486 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 my ($W, $H) = $layout->size; 2487
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2488 glRasterPos $par->[3], $y - $y0;
2489 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266 } 2490 }
2267 2491
2268 $y += $h; 2492 $y += $h;
2269 } 2493 }
2270 2494
2271 glDisable GL_TEXTURE_2D;
2272 glDisable GL_BLEND; 2495 glDisable GL_BLEND;
2273 }; 2496 };
2274 }); 2497 });
2275} 2498}
2276 2499
2277sub _draw { 2500sub _draw {
2278 my ($self) = @_; 2501 my ($self) = @_;
2279 2502
2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282 glEnable GL_TEXTURE_2D; 2503 glEnable GL_TEXTURE_2D;
2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1; 2505 glColor 1, 1, 1, 1;
2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2506 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286 glDisable GL_TEXTURE_2D; 2507 glDisable GL_TEXTURE_2D;
2287 glDisable GL_BLEND;
2288 2508
2289 $self->{children}[1]->draw; 2509 $self->{children}[1]->draw;
2290 2510
2291} 2511}
2292 2512
… …
2340 2560
2341sub new { 2561sub new {
2342 my $class = shift; 2562 my $class = shift;
2343 2563
2344 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2345 state => 0, 2565 state => 0,
2346 connect_activate => \&toggle_flopper, 2566 on_activate => \&toggle_flopper,
2347 @_ 2567 @_
2348 ); 2568 );
2349 2569
2350 if ($self->{state}) {
2351 $self->{state} = 0;
2352 $self->toggle_flopper;
2353 }
2354
2355 $self 2570 $self
2356} 2571}
2357 2572
2358sub toggle_flopper { 2573sub toggle_flopper {
2359 my ($self) = @_; 2574 my ($self) = @_;
2360 2575
2361 # TODO: use animation 2576 $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} 2577}
2373 2578
2374############################################################################# 2579#############################################################################
2375 2580
2376package CFClient::UI::Tooltip; 2581package CFClient::UI::Tooltip;
… …
2386 @_, 2591 @_,
2387 can_events => 0, 2592 can_events => 0,
2388 ) 2593 )
2389} 2594}
2390 2595
2391sub set_markup { 2596sub set_tooltip_from {
2392 my ($self, $text) = @_; 2597 my ($self, $widget) = @_;
2393 2598
2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2599 $self->add (new CFClient::UI::Label
2395 $self->{label}->set_markup ($text); 2600 markup => $widget->{tooltip},
2396 $self->add ($self->{label}); 2601 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602 fontsize => 0.8,
2603 fg => [0, 0, 0, 1],
2604 ellipsise => 0,
2605 font => ($widget->{tooltip_font} || $::FONT_PROP),
2606 );
2397} 2607}
2398 2608
2399sub size_request { 2609sub size_request {
2400 my ($self) = @_; 2610 my ($self) = @_;
2401
2402 $self->child->set_max_size ($::WIDTH * 0.3);
2403 2611
2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2612 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405 2613
2406 ($w + 4, $h + 4) 2614 ($w + 4, $h + 4)
2407} 2615}
… …
2413} 2621}
2414 2622
2415sub _draw { 2623sub _draw {
2416 my ($self) = @_; 2624 my ($self) = @_;
2417 2625
2418 glPushMatrix;
2419 glTranslate 0.375, 0.375; 2626 glTranslate 0.375, 0.375;
2420 2627
2421 my ($w, $h) = @$self{qw(w h)}; 2628 my ($w, $h) = @$self{qw(w h)};
2422 2629
2423 glColor 1, 0.8, 0.4; 2630 glColor 1, 0.8, 0.4;
… …
2434 glVertex 0 , $h; 2641 glVertex 0 , $h;
2435 glVertex $w, $h; 2642 glVertex $w, $h;
2436 glVertex $w, 0; 2643 glVertex $w, 0;
2437 glEnd; 2644 glEnd;
2438 2645
2439 glPopMatrix; 2646 glTranslate 2 - 0.375, 2 - 0.375;
2440
2441 glTranslate 2, 2;
2442 $self->SUPER::_draw; 2647 $self->SUPER::_draw;
2443} 2648}
2444 2649
2445############################################################################# 2650#############################################################################
2446 2651
… …
2451use CFClient::OpenGL; 2656use CFClient::OpenGL;
2452 2657
2453sub new { 2658sub new {
2454 my $class = shift; 2659 my $class = shift;
2455 2660
2456 $class->SUPER::new ( 2661 my $self = $class->SUPER::new (
2457 aspect => 1, 2662 aspect => 1,
2663 can_events => 0,
2458 @_, 2664 @_,
2459 ) 2665 );
2666
2667 if ($self->{anim} && $self->{animspeed}) {
2668 Scalar::Util::weaken (my $widget = $self);
2669
2670 $self->{timer} = Event->timer (
2671 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2672 hard => 1,
2673 interval => $self->{animspeed},
2674 cb => sub {
2675 ++$widget->{frame};
2676 $widget->update;
2677 },
2678 );
2679 }
2680
2681 $self
2460} 2682}
2461 2683
2462sub size_request { 2684sub size_request {
2463 (32, 8) 2685 (32, 8)
2464} 2686}
2465 2687
2688sub update {
2689 my ($self) = @_;
2690
2691 return unless $self->{visible};
2692
2693 $self->SUPER::update;
2694}
2695
2466sub _draw { 2696sub _draw {
2467 my ($self) = @_; 2697 my ($self) = @_;
2468 2698
2699 return unless $::CONN;
2700
2701 my $face;
2702
2703 if ($self->{frame}) {
2704 my $anim = $::CONN->{anim}[$self->{anim}];
2705
2706 $face = $anim->[ $self->{frame} % @$anim ]
2707 if $anim && @$anim;
2708 }
2709
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2710 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2711
2471 # TODO animation
2472 if ($tex) { 2712 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2713 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2715 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2716 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND; 2718 }
2719}
2720
2721sub DESTROY {
2722 my ($self) = @_;
2723
2724 $self->{timer}->cancel
2725 if $self->{timer};
2726
2727 $self->SUPER::DESTROY;
2728}
2729
2730#############################################################################
2731
2732package CFClient::UI::Inventory;
2733
2734our @ISA = CFClient::UI::ScrolledWindow::;
2735
2736sub new {
2737 my $class = shift;
2738
2739 my $self = $class->SUPER::new (
2740 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2741 @_,
2742 );
2743
2744 $self
2745}
2746
2747sub set_items {
2748 my ($self, $items) = @_;
2749
2750 $self->{scrolled}->clear;
2751 return unless $items;
2752
2753 my @items = sort {
2754 ($a->{type} <=> $b->{type})
2755 or ($a->{name} cmp $b->{name})
2756 } @$items;
2757
2758 $self->{real_items} = \@items;
2759
2760 my $row = 0;
2761 for my $item (@items) {
2762 CFClient::Item::update_widgets $item;
2763
2764 $self->{scrolled}->add (0, $row, $item->{face_widget});
2765 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2766 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2767
2768 $row++;
2481 } 2769 }
2482} 2770}
2483 2771
2484############################################################################# 2772#############################################################################
2485 2773
… …
2521 2809
2522# popup given the event (must be a mouse button down event currently) 2810# popup given the event (must be a mouse button down event currently)
2523sub popup { 2811sub popup {
2524 my ($self, $ev) = @_; 2812 my ($self, $ev) = @_;
2525 2813
2526 $self->emit ("popdown"); 2814 $self->_emit ("popdown");
2527 2815
2528 # maybe save $GRAB? must be careful about events... 2816 # maybe save $GRAB? must be careful about events...
2529 $GRAB = $self; 2817 $GRAB = $self;
2530 $self->{button} = $ev->{button}; 2818 $self->{button} = $ev->{button};
2531 2819
… …
2546 2834
2547 if ($ev->{button} == $self->{button}) { 2835 if ($ev->{button} == $self->{button}) {
2548 undef $GRAB; 2836 undef $GRAB;
2549 $self->hide; 2837 $self->hide;
2550 2838
2551 $self->emit ("popdown"); 2839 $self->_emit ("popdown");
2552 $self->{hover}[1]->() if $self->{hover}; 2840 $self->{hover}[1]->() if $self->{hover};
2553 } 2841 }
2554} 2842}
2555 2843
2556############################################################################# 2844#############################################################################
2557 2845
2846package CFClient::UI::Statusbox;
2847
2848our @ISA = CFClient::UI::VBox::;
2849
2850sub new {
2851 my $class = shift;
2852
2853 $class->SUPER::new (
2854 fontsize => 0.8,
2855 @_,
2856 )
2857}
2858
2859sub reorder {
2860 my ($self) = @_;
2861 my $NOW = time;
2862
2863 while (my ($k, $v) = each %{ $self->{item} }) {
2864 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2865 }
2866
2867 my @widgets;
2868
2869 my @items = sort {
2870 $a->{pri} <=> $b->{pri}
2871 or $b->{id} <=> $a->{id}
2872 } values %{ $self->{item} };
2873
2874 my $count = 10 + 1;
2875 for my $item (@items) {
2876 last unless --$count;
2877
2878 push @widgets, $item->{label} ||= do {
2879 # TODO: doesn't handle markup well (read as: at all)
2880 my $short = $item->{count} > 1
2881 ? "<b>$item->{count} ×</b> $item->{text}"
2882 : $item->{text};
2883
2884 for ($short) {
2885 s/^\s+//;
2886 s/\s+/ /g;
2887 }
2888
2889 new CFClient::UI::Label
2890 markup => $short,
2891 tooltip => $item->{tooltip},
2892 tooltip_font => $::FONT_PROP,
2893 tooltip_width => 0.67,
2894 fontsize => $item->{fontsize} || $self->{fontsize},
2895 max_w => $::WIDTH * 0.44,
2896 fg => $item->{fg},
2897 can_events => 1,
2898 can_hover => 1
2899 };
2900 }
2901
2902 $self->clear;
2903 $self->SUPER::add (reverse @widgets);
2904}
2905
2906sub add {
2907 my ($self, $text, %arg) = @_;
2908
2909 $text =~ s/^\s+//;
2910 $text =~ s/\s+$//;
2911
2912 return unless $text;
2913
2914 my $timeout = time + ((delete $arg{timeout}) || 60);
2915
2916 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2917
2918 if (my $item = $self->{item}{$group}) {
2919 if ($item->{text} eq $text) {
2920 $item->{count}++;
2921 } else {
2922 $item->{count} = 1;
2923 $item->{text} = $item->{tooltip} = $text;
2924 }
2925 $item->{id} = ++$self->{id};
2926 $item->{timeout} = $timeout;
2927 delete $item->{label};
2928 } else {
2929 $self->{item}{$group} = {
2930 id => ++$self->{id},
2931 text => $text,
2932 timeout => $timeout,
2933 tooltip => $text,
2934 fg => [0.8, 0.8, 0.8, 0.8],
2935 pri => 0,
2936 count => 1,
2937 %arg,
2938 };
2939 }
2940
2941 $self->reorder;
2942}
2943
2944sub reconfigure {
2945 my ($self) = @_;
2946
2947 delete $_->{label}
2948 for values %{ $self->{item} || {} };
2949
2950 $self->reorder;
2951 $self->SUPER::reconfigure;
2952}
2953
2954#############################################################################
2955
2558package CFClient::UI::Root; 2956package CFClient::UI::Root;
2559 2957
2560our @ISA = CFClient::UI::Container::; 2958our @ISA = CFClient::UI::Container::;
2561 2959
2562use CFClient::OpenGL; 2960use CFClient::OpenGL;
2563 2961
2564sub check_size { 2962sub new {
2565 my ($self) = @_; 2963 my $class = shift;
2566 2964
2567 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2965 $class->SUPER::new (
2568} 2966 visible => 1,
2569 2967 @_,
2570sub size_request { 2968 )
2571 ($::WIDTH, $::HEIGHT)
2572} 2969}
2573 2970
2574sub configure { 2971sub configure {
2575 my ($self, $x, $y, $w, $h) = @_; 2972 my ($self, $x, $y, $w, $h) = @_;
2576 2973
2577 $self->SUPER::configure ($x, $y, $w, $h); 2974 $self->{w} = $w;
2975 $self->{h} = $h;
2976}
2578 2977
2978sub check_size {
2979 my ($self) = @_;
2980
2981 $self->size_allocate ($self->{w}, $self->{h})
2982 if $self->{w};
2983}
2984
2985sub size_request {
2986 my ($self) = @_;
2987
2988 ($self->{w}, $self->{h})
2989}
2990
2991sub size_allocate {
2992 my ($self, $w, $h) = @_;
2993
2579 for my $child (@{$self->{children}}) { 2994 for my $child ($self->children) {
2580 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2995 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581 2996
2997 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2998 if exists $child->{req_x};
2999
3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3001 if exists $child->{req_y};
3002
3003 delete @$child{qw(req_x req_y)};
3004
2582 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3005 $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; 3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007
2584 $child->configure ($X, $Y, $W,$H); 3008 $child->configure ($X, $Y, $W, $H);
2585 } 3009 }
2586} 3010}
2587 3011
2588sub _topleft { 3012sub coord2local {
2589 my ($self, $x, $y) = @_; 3013 my ($self, $x, $y) = @_;
2590 3014
2591 ($x, $y) 3015 ($x, $y)
2592} 3016}
2593 3017
3018sub coord2global {
3019 my ($self, $x, $y) = @_;
3020
3021 ($x, $y)
3022}
3023
2594sub update { 3024sub update {
2595 my ($self) = @_; 3025 my ($self) = @_;
2596 3026
2597 $self->check_size; 3027 $self->check_size;
2598 ::refresh (); 3028 $::WANT_REFRESH++;
2599} 3029}
2600 3030
2601sub add { 3031sub add {
2602 my ($self, $child) = @_; 3032 my ($self, @children) = @_;
2603 3033
3034 for my $child (@children) {
3035 $child->{is_toplevel} = 1;
3036
2604 # integerize window positions 3037 # integerise window positions
2605 $child->{x} = int $child->{x}; 3038 $child->{x} = int $child->{x};
2606 $child->{y} = int $child->{y}; 3039 $child->{y} = int $child->{y};
3040 }
2607 3041
2608 $self->SUPER::add ($child); 3042 $self->SUPER::add (@children);
3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3049}
3050
3051sub remove {
3052 my ($self, @children) = @_;
3053
3054 $self->SUPER::remove (@children);
3055
3056 while (@children) {
3057 my $w = pop @children;
3058 push @children, $w->children;
3059 $w->set_invisible;
3060 }
2609} 3061}
2610 3062
2611sub on_refresh { 3063sub on_refresh {
2612 my ($self, $id, $cb) = @_; 3064 my ($self, $id, $cb) = @_;
2613 3065
2614 $self->{refresh_hook}{$id} = $cb; 3066 $self->{refresh_hook}{$id} = $cb;
2615} 3067}
2616 3068
3069sub on_post_alloc {
3070 my ($self, $id, $cb) = @_;
3071
3072 $self->{post_alloc_hook}{$id} = $cb;
3073}
3074
2617sub draw { 3075sub draw {
2618 my ($self) = @_; 3076 my ($self) = @_;
2619 3077
2620 while (my $rcb = delete $self->{refresh_hook}) { 3078 while ($self->{refresh_hook}) {
2621 $_->() for values %$rcb; 3079 $_->()
3080 for values %{delete $self->{refresh_hook}};
3081 }
3082
3083 if ($self->{check_size}) {
3084 my @queue;
3085
3086 for (;;) {
3087 if ($self->{check_size}) {
3088 #TODO use array-of-depth approach
3089
3090 @queue = sort { $a->{visible} <=> $b->{visible} }
3091 @queue, values %{delete $self->{check_size}};
3092 }
3093
3094 my $widget = pop @queue || last;
3095
3096 defined $widget->{visible} or last; # do not resize invisible widgets
3097
3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3099 ? @$widget{qw(def_w def_h)}
3100 : $widget->size_request;
3101
3102 if (delete $widget->{force_alloc}
3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105
3106 $widget->{req_w} = $w;
3107 $widget->{req_h} = $h;
3108
3109 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3110
3111 $widget->{parent}->check_size
3112 if $widget->{parent};
3113 }
3114 }
3115 }
3116
3117 while ($self->{size_alloc}) {
3118 for (values %{delete $self->{size_alloc}}) {
3119 my ($widget, $w, $h) = @$_;
3120
3121 $w = 0 if $w < 0;
3122 $h = 0 if $h < 0;
3123
3124 $widget->{w} = $w;
3125 $widget->{h} = $h;
3126 $widget->emit (size_allocate => $w, $h);
3127 }
3128 }
3129
3130 while ($self->{post_alloc_hook}) {
3131 $_->()
3132 for values %{delete $self->{post_alloc_hook}};
2622 } 3133 }
2623 3134
2624 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3135 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3136 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626 glClear GL_COLOR_BUFFER_BIT; 3137 glClear GL_COLOR_BUFFER_BIT;
2627 3138
2628 glMatrixMode GL_PROJECTION; 3139 glMatrixMode GL_PROJECTION;
2629 glLoadIdentity; 3140 glLoadIdentity;
2630 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3141 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2631 glMatrixMode GL_MODELVIEW; 3142 glMatrixMode GL_MODELVIEW;
2632 glLoadIdentity; 3143 glLoadIdentity;
2633 3144
2634 $self->_draw; 3145 $self->_draw;
2635} 3146}
2636 3147
2637############################################################################# 3148#############################################################################
2638 3149
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; 3150package CFClient::UI;
2693 3151
2694$ROOT = new CFClient::UI::Root; 3152$ROOT = new CFClient::UI::Root;
2695$TOOLTIP = new CFClient::UI::Tooltip; 3153$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2696 3154
26971 31551
2698 3156

Diff Legend

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