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.232 by root, Thu May 25 02:23:14 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
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48} 51}
49 52
50# class methods for events 53# class methods for events
51sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 56 if $FOCUS;
54} 57}
55 58
56sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 61 if $FOCUS;
59} 62}
60 63
61sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
62 my ($ev) = @_; 65 my ($ev) = @_;
… …
71 check_tooltip; 74 check_tooltip;
72 } 75 }
73 76
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 78
76 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 81}
81 82
82sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
83 my ($ev) = @_; 84 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
85 86
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 88
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 90
90 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 93
95 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 96 $grab->update if $grab;
98 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 114
116 check_tooltip; 115 check_tooltip;
117 } 116 }
118 117
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 119 if $HOVER;
123} 120}
124 121
125# convert position array to integers 122# convert position array to integers
126sub harmonize { 123sub harmonize {
127 my ($vals) = @_; 124 my ($vals) = @_;
… …
131 for (@$vals) { 128 for (@$vals) {
132 my $i = int $_ + $rem; 129 my $i = int $_ + $rem;
133 $rem += $_ - $i; 130 $rem += $_ - $i;
134 $_ = $i; 131 $_ = $i;
135 } 132 }
133}
134
135sub full_refresh {
136 # make a copy, otherwise for complains about freed values.
137 my @widgets = values %WIDGET;
138
139 $_->update
140 for @widgets;
141}
142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
151# call when resolution changes etc.
152sub rescale_widgets {
153 my ($sx, $sy) = @_;
154
155 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) {
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 }
166 }
167
168 reconfigure_widgets;
136} 169}
137 170
138############################################################################# 171#############################################################################
139 172
140package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
158 if (/^connect_(.*)$/) { 191 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 192 $self->connect ($1 => delete $self->{$_});
160 } 193 }
161 } 194 }
162 195
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197
163 $self 198 $self
164} 199}
165 200
166sub destroy { 201sub destroy {
167 my ($self) = @_; 202 my ($self) = @_;
… …
170 %$self = (); 205 %$self = ();
171} 206}
172 207
173sub show { 208sub show {
174 my ($self) = @_; 209 my ($self) = @_;
175
176 return if $self->{parent}; 210 return if $self->{parent};
177 211
178 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
179} 213}
180 214
181sub hide { 215sub show_centered {
182 my ($self) = @_; 216 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220
221 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 },
225 );
226}
227
228sub set_invisible {
229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
183 234
184 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
244sub hide {
245 my ($self) = @_;
246
247 $self->set_invisible;
186 248
187 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
188 if $self->{parent}; 250 if $self->{parent};
189} 251}
190 252
… …
232 $self->{y} = $y; 294 $self->{y} = $y;
233 $self->update; 295 $self->update;
234 } 296 }
235 297
236 if ($self->{w} != $w || $self->{h} != $h) { 298 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 299 $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 } 300 }
244} 301}
245 302
246sub size_allocate { 303sub size_allocate {
247 # nothing to be done 304 # nothing to be done
248} 305}
249 306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
250sub children { 314sub 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} 315}
262 316
263sub set_max_size { 317sub set_max_size {
264 my ($self, $w, $h) = @_; 318 my ($self, $w, $h) = @_;
265 319
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
268} 322}
269 323
270# return top left coordinates 324sub set_tooltip {
271sub _topleft {
272 my ($self, $x, $y) = @_; 325 my ($self, $tooltip) = @_;
273 326
274 $self->{parent} 327 $self->{tooltip} = $tooltip;
275 or Carp::confess "no parent widget in _topleft\n";#d#
276 328
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 329 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner};
331 CFClient::UI::check_tooltip;
332 }
278} 333}
279 334
280# translate global coordinates to local coordinate system 335# translate global coordinates to local coordinate system
281sub coord2local { 336sub coord2local {
282 my ($self, $x, $y) = @_; 337 my ($self, $x, $y) = @_;
283 338
284 my ($X, $Y) = $self->_topleft; 339 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 340}
287 341
288# translate local coordinates to global coordinate system 342# translate local coordinates to global coordinate system
289sub coord2global { 343sub coord2global {
290 my ($self, $x, $y) = @_; 344 my ($self, $x, $y) = @_;
291 345
292 my ($X, $Y) = $self->_topleft; 346 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 347}
295 348
296sub focus_in { 349sub focus_in {
297 my ($self) = @_; 350 my ($self) = @_;
298 351
299 return if $FOCUS == $self; 352 return if $FOCUS == $self;
300 return unless $self->{can_focus}; 353 return unless $self->{can_focus};
301 354
302 my $focus = $FOCUS; $FOCUS = $self; 355 my $focus = $FOCUS; $FOCUS = $self;
303 356
304 $self->emit (focus_in => $focus); 357 $self->_emit (focus_in => $focus);
305 358
306 $focus->update if $focus; 359 $focus->update if $focus;
307 $FOCUS->update; 360 $FOCUS->update;
308} 361}
309 362
… …
312 365
313 return unless $FOCUS == $self; 366 return unless $FOCUS == $self;
314 367
315 my $focus = $FOCUS; undef $FOCUS; 368 my $focus = $FOCUS; undef $FOCUS;
316 369
317 $self->emit (focus_out => $focus); 370 $self->_emit (focus_out => $focus);
318 371
319 $focus->update if $focus; #? 372 $focus->update if $focus; #?
373
374 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
375 unless $FOCUS;
320} 376}
321 377
322sub mouse_motion { } 378sub mouse_motion { }
323sub button_up { } 379sub button_up { }
324sub key_down { } 380sub key_down { }
325sub key_up { } 381sub key_up { }
326 382
327sub button_down { 383sub button_down {
328 my ($self, $ev, $x, $y) = @_; 384 my ($self, $ev, $x, $y) = @_;
329 385
330 $self->focus_in; 386 $self->focus_in;
… …
370 glVertex $self->{w}, 0; 426 glVertex $self->{w}, 0;
371 glVertex $self->{w}, $self->{h}; 427 glVertex $self->{w}, $self->{h};
372 glVertex 0 , $self->{h}; 428 glVertex 0 , $self->{h};
373 glEnd; 429 glEnd;
374 glPopMatrix; 430 glPopMatrix;
375 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376 } 432 }
377} 433}
378 434
379sub _draw { 435sub _draw {
380 my ($self) = @_; 436 my ($self) = @_;
… …
396 452
397sub set_parent { 453sub set_parent {
398 my ($self, $parent) = @_; 454 my ($self, $parent) = @_;
399 455
400 Scalar::Util::weaken ($self->{parent} = $parent); 456 Scalar::Util::weaken ($self->{parent} = $parent);
457
458 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size
460 unless exists $self->{req_w};
461
462 $self->show;
401} 463}
402 464
403sub check_size { 465sub check_size {
404 my ($self) = @_; 466 my ($self, $forced) = @_;
405 467
406 $self->{parent} 468 $self->{force_alloc} = 1 if $forced;
407 or return 1; 469 $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} 470}
428 471
429sub update { 472sub update {
430 my ($self) = @_; 473 my ($self) = @_;
431 474
… …
437 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
438 481
439 push @{ $self->{signal_cb}{$signal} }, $cb; 482 push @{ $self->{signal_cb}{$signal} }, $cb;
440} 483}
441 484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
442sub emit { 491sub emit {
443 my ($self, $signal, @args) = @_; 492 my ($self, $signal, @args) = @_;
444 493
445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
446} 496}
447 497
448sub DESTROY { 498sub DESTROY {
449 my ($self) = @_; 499 my ($self) = @_;
450 500
501 delete $WIDGET{$self+0};
451 #$self->deactivate; 502 #$self->deactivate;
452} 503}
453 504
454############################################################################# 505#############################################################################
455 506
… …
464 my $class = shift; 515 my $class = shift;
465 516
466 # range [value, low, high, page] 517 # range [value, low, high, page]
467 518
468 $class->SUPER::new ( 519 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 520 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 521 #active_bg => [1, 1, 1, 0.5],
471 @_ 522 @_
472 ) 523 )
473} 524}
474 525
475sub _draw { 526sub _draw {
476 my ($self) = @_; 527 my ($self) = @_;
477 528
529 my $color = $FOCUS == $self && $self->{active_bg}
530 ? $self->{active_bg}
531 : $self->{bg};
532
533 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 534 my ($w, $h) = @$self{qw(w h)};
479 535
480 glEnable GL_BLEND; 536 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 538 glColor @$color;
483 539
484 glBegin GL_QUADS; 540 glBegin GL_QUADS;
485 glVertex 0 , 0; 541 glVertex 0 , 0;
486 glVertex 0 , $h; 542 glVertex 0 , $h;
487 glVertex $w, $h; 543 glVertex $w, $h;
488 glVertex $w, 0; 544 glVertex $w, 0;
489 glEnd; 545 glEnd;
490 546
491 glDisable GL_BLEND; 547 glDisable GL_BLEND;
548 }
492} 549}
493 550
494############################################################################# 551#############################################################################
495 552
496package CFClient::UI::Empty; 553package CFClient::UI::Empty;
… …
528 585
529 $self 586 $self
530} 587}
531 588
532sub add { 589sub add {
533 my ($self, $child) = @_; 590 my ($self, @widgets) = @_;
534 591
535 $child->set_parent ($self); 592 $_->set_parent ($self)
593 for @widgets;
536 594
537 use sort 'stable'; 595 use sort 'stable';
538 596
539 $self->{children} = [ 597 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 598 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 599 @{$self->{children}}, @widgets
542 ]; 600 ];
543 601
544 $child->check_size; 602 $self->check_size (1);
545 $self->update; 603 $self->update;
546} 604}
547 605
548sub children { 606sub children {
549 @{ $_[0]{children} } 607 @{ $_[0]{children} }
… …
656} 714}
657 715
658sub update { 716sub update {
659 my ($self) = @_; 717 my ($self) = @_;
660 718
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 719 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 720 $self->SUPER::update;
663} 721}
664 722
665sub size_allocate { 723sub size_allocate {
666 my ($self, $w, $h) = @_; 724 my ($self, $w, $h) = @_;
… …
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 737 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0; 738 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT; 739 glClear GL_COLOR_BUFFER_BIT;
682 740
683 $self->_render; 741 $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 }; 742 };
692} 743}
693 744
694sub _draw { 745sub _draw {
695 my ($self) = @_; 746 my ($self) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 748 my ($w, $h) = ($self->w, $self->h);
698 749
699 my $tex = $self->{texture} 750 my $tex = $self->{texture}
700 or return; 751 or return;
701 752
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 753 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 755 glColor 1, 1, 1, 1;
707 756
708 $tex->draw_quad (0, 0, $w, $h); 757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 758
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
712} 760}
713 761
714############################################################################# 762#############################################################################
715 763
… …
719 767
720sub size_request { 768sub size_request {
721 my ($self) = @_; 769 my ($self) = @_;
722 770
723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 771 @$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 772
726 @$self{qw(child_w child_h)} 773 @$self{qw(child_w child_h)}
727} 774}
728 775
729sub size_allocate { 776sub size_allocate {
730 my ($self, $w, $h) = @_; 777 my ($self, $w, $h) = @_;
731 778
779 my ($cw, $ch) = @$self{qw(child_w child_h)};
780# $w = $self->{w};
781 $self->child->configure (0, 0, $cw, $ch);
732 $self->update; 782 $self->update;
733} 783}
734 784
735sub set_offset { 785sub set_offset {
736 my ($self, $x, $y) = @_; 786 my ($self, $x, $y) = @_;
737 787
738 $self->{view_x} = int $x; 788 $self->{view_x} = int $x;
739 $self->{view_y} = int $y; 789 $self->{view_y} = int $y;
740 790
741 $self->update; 791 $self->update;
792}
793
794# hmm, this does not work for topleft of $self... but we should not ask for that
795sub coord2local {
796 my ($self, $x, $y) = @_;
797
798 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
799}
800
801sub coord2global {
802 my ($self, $x, $y) = @_;
803
804 $x = List::Util::min $self->{w}, $x - $self->{view_x};
805 $y = List::Util::min $self->{h}, $y - $self->{view_y};
806
807 $self->SUPER::coord2global ($x, $y)
808}
809
810sub find_widget {
811 my ($self, $x, $y) = @_;
812
813 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
814 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
815 ) {
816 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
817 } else {
818 $self->CFClient::UI::Base::find_widget ($x, $y)
819 }
742} 820}
743 821
744sub _render { 822sub _render {
745 my ($self) = @_; 823 my ($self) = @_;
746 824
… …
762 840
763 my $slider = new CFClient::UI::Slider 841 my $slider = new CFClient::UI::Slider
764 vertical => 1, 842 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix 843 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub { 844 connect_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 845 $self->{vp}->set_offset (0, $_[1]);
768 }, 846 },
769 ; 847 ;
770 848
771 $self = $class->SUPER::new ( 849 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort), 850 vp => (new CFClient::UI::ViewPort expand => 1),
773 slider => $slider, 851 slider => $slider,
774 @_, 852 @_,
775 ); 853 );
776 854
777 $self->{vp}->add ($self->{scrolled}); 855 $self->{vp}->add ($self->{scrolled});
… …
779 $self->add ($self->{slider}); 857 $self->add ($self->{slider});
780 858
781 $self 859 $self
782} 860}
783 861
862sub size_allocate {
863 my ($self, $w, $h) = @_;
864
865 $self->SUPER::size_allocate ($w, $h);
866
867 my $child = $self->{vp}->child;
868 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
869}
870
784#TODO# update range on size_allocate depeneing on child 871#TODO# update range on size_allocate depending on child
785# update viewport offset on scroll 872# update viewport offset on scroll
786 873
787############################################################################# 874#############################################################################
788 875
789package CFClient::UI::Frame; 876package CFClient::UI::Frame;
… …
793use CFClient::OpenGL; 880use CFClient::OpenGL;
794 881
795sub new { 882sub new {
796 my $class = shift; 883 my $class = shift;
797 884
798 my $self = $class->SUPER::new ( 885 $class->SUPER::new (
799 bg => [1, 1, 1, 1], 886 bg => undef,
800 border_bg => [1, 1, 1, 1],
801 border => 0.8,
802 @_ 887 @_,
803 ); 888 )
804
805 $self
806} 889}
807 890
808sub _draw { 891sub _draw {
809 my ($self) = @_; 892 my ($self) = @_;
810 893
811 my ($w, $h) = ($self->{w}, $self->{h}); 894 if ($self->{bg}) {
895 my ($w, $h) = @$self{qw(w h)};
812 896
813 glEnable GL_BLEND; 897 glEnable GL_BLEND;
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 898 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glEnable GL_TEXTURE_2D; 899 glColor @{ $self->{bg} };
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817 900
818# glBegin GL_QUADS; 901 glBegin GL_QUADS;
819# glColor 0, 0, 0, 0;
820# glVertex 0 , 0; 902 glVertex 0 , 0;
821# glVertex 0 , $h; 903 glVertex 0 , $h;
822# glVertex $w, $h; 904 glVertex $w, $h;
823# glVertex $w, 0; 905 glVertex $w, 0;
824# glEnd; 906 glEnd;
825 907
826
827 $self->child->draw;
828 glDisable GL_BLEND; 908 glDisable GL_BLEND;
829 glDisable GL_TEXTURE_2D; 909 }
910
911 $self->SUPER::_draw;
830} 912}
831 913
832############################################################################# 914#############################################################################
833 915
834package CFClient::UI::FancyFrame; 916package CFClient::UI::FancyFrame;
… …
845 my $class = shift; 927 my $class = shift;
846 928
847 # TODO: user_x, user_y, overwrite moveto? 929 # TODO: user_x, user_y, overwrite moveto?
848 930
849 my $self = $class->SUPER::new ( 931 my $self = $class->SUPER::new (
850 bg => [1, 1, 1, 1], 932 bg => [1, 1, 1, 1],
851 border_bg => [1, 1, 1, 1], 933 border_bg => [1, 1, 1, 1],
852 border => 0.6, 934 border => 0.6,
935 is_toplevel => 1,
853 can_events => 1, 936 can_events => 1,
854 @_ 937 @_
855 ); 938 );
856 939
857 $self->{title} &&= new CFClient::UI::Label 940 $self->{title} &&= new CFClient::UI::Label
858 align => 0, 941 align => 0,
… …
882 my ($self, $w, $h) = @_; 965 my ($self, $w, $h) = @_;
883 966
884 $h -= List::Util::max 0, $self->border * 2; 967 $h -= List::Util::max 0, $self->border * 2;
885 $w -= List::Util::max 0, $self->border * 2; 968 $w -= List::Util::max 0, $self->border * 2;
886 969
887 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
888 if $self->{title}; 971 if $self->{title};
889 972
890 $self->child->configure ($self->border, $self->border, $w, $h); 973 $self->child->configure ($self->border, $self->border, $w, $h);
891} 974}
892 975
… …
950 my ($self) = @_; 1033 my ($self) = @_;
951 1034
952 my ($w, $h ) = ($self->{w}, $self->{h}); 1035 my ($w, $h ) = ($self->{w}, $self->{h});
953 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954 1037
955 glEnable GL_BLEND;
956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957 glEnable GL_TEXTURE_2D; 1038 glEnable GL_TEXTURE_2D;
958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959 1040
960 my $border = $self->border; 1041 my $border = $self->border;
961 1042
962 glColor @{ $self->{border_bg} }; 1043 glColor @{ $self->{border_bg} };
963 $tex[1]->draw_quad (0, 0, $w, $border); 1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
964 $tex[3]->draw_quad (0, $border, $border, $ch); 1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
967 1048
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969 my $bg = $tex[0]; 1050 my $bg = $tex[0];
970 1051
971 # TODO: repeat texture not scale 1052 # TODO: repeat texture not scale
… …
975 glColor @{ $self->{bg} }; 1056 glColor @{ $self->{bg} };
976 1057
977 $bg->{s} = $rep_x; 1058 $bg->{s} = $rep_x;
978 $bg->{t} = $rep_y; 1059 $bg->{t} = $rep_y;
979 $bg->{wrap_mode} = 1; 1060 $bg->{wrap_mode} = 1;
980 $bg->draw_quad ($border, $border, $cw, $ch); 1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 }
981 1063
982 glDisable GL_TEXTURE_2D; 1064 glDisable GL_TEXTURE_2D;
983 glDisable GL_BLEND;
984 }
985 1065
986 $self->{title}->draw if $self->{title}; 1066 $self->{title}->draw if $self->{title};
987 1067
988 $self->child->draw; 1068 $self->child->draw;
989} 1069}
… …
1216} 1296}
1217 1297
1218sub size_allocate { 1298sub size_allocate {
1219 my ($self, $w, $h) = @_; 1299 my ($self, $w, $h) = @_;
1220 1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1221 my $children = $self->{children}; 1303 my $children = $self->{children};
1222 1304
1223 my @h = map $_->{req_h}, @$children; 1305 my @h = map $_->{req_h}, @$children;
1224 1306
1225 my $req_h = List::Util::sum @h; 1307 my $req_h = List::Util::sum @h;
… …
1254 1336
1255############################################################################# 1337#############################################################################
1256 1338
1257package CFClient::UI::Label; 1339package CFClient::UI::Label;
1258 1340
1259our @ISA = CFClient::UI::Base::; 1341our @ISA = CFClient::UI::DrawBG::;
1260 1342
1261use CFClient::OpenGL; 1343use CFClient::OpenGL;
1262 1344
1263sub new { 1345sub new {
1264 my ($class, %arg) = @_; 1346 my ($class, %arg) = @_;
1265 1347
1266 my $self = $class->SUPER::new ( 1348 my $self = $class->SUPER::new (
1267 fg => [1, 1, 1], 1349 fg => [1, 1, 1],
1350 #bg => none
1351 #active_bg => none
1268 #font => default_font 1352 #font => default_font
1353 #text => initial text
1354 #markup => initial narkup
1355 #max_w => maximum pixel width
1356 ellipsise => 3, # end
1357 layout => (new CFClient::Layout),
1269 fontsize => 1, 1358 fontsize => 1,
1270 text => "",
1271 align => -1, 1359 align => -1,
1272 valign => -1, 1360 valign => -1,
1273 padding => 2, 1361 padding => 2,
1274 layout => new CFClient::Layout,
1275 can_events => 0, 1362 can_events => 0,
1276 %arg 1363 %arg
1277 ); 1364 );
1278 1365
1279 if (exists $self->{template}) { 1366 if (exists $self->{template}) {
1280 my $layout = new CFClient::Layout; 1367 my $layout = new CFClient::Layout;
1281 $layout->set_text (delete $self->{template}); 1368 $layout->set_text (delete $self->{template});
1282 $self->{template} = $layout; 1369 $self->{template} = $layout;
1283 } 1370 }
1284 1371
1285 $self->set_text (delete $self->{text}) if exists $self->{text}; 1372 if (exists $self->{markup}) {
1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1373 $self->set_markup (delete $self->{markup});
1374 } else {
1375 $self->set_text (delete $self->{text});
1376 }
1287 1377
1288 $self 1378 $self
1289} 1379}
1290 1380
1291sub escape { 1381sub escape($) {
1292 local $_ = $_[1]; 1382 local $_ = $_[0];
1293 1383
1294 s/&/&amp;/g; 1384 s/&/&amp;/g;
1295 s/>/&gt;/g; 1385 s/>/&gt;/g;
1296 s/</&lt;/g; 1386 s/</&lt;/g;
1297 1387
1298 $_[1] 1388 $_
1299} 1389}
1300 1390
1301sub update { 1391sub update {
1302 my ($self) = @_; 1392 my ($self) = @_;
1303 1393
1304 delete $self->{texture}; 1394 delete $self->{texture};
1305 $self->SUPER::update; 1395 $self->SUPER::update;
1306} 1396}
1307 1397
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1314sub set_text { 1398sub set_text {
1315 my ($self, $text) = @_; 1399 my ($self, $text) = @_;
1316 1400
1317 return if $self->{text} eq "T$text"; 1401 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text"; 1402 $self->{text} = "T$text";
1319 1403
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320 $self->{layout}->set_text ($text); 1405 $self->{layout}->set_text ($text);
1321 1406
1322 delete $self->{texture};
1323 $self->update; 1407 $self->update;
1324 $self->check_size; 1408 $self->check_size;
1325} 1409}
1326 1410
1327sub set_markup { 1411sub set_markup {
1328 my ($self, $markup) = @_; 1412 my ($self, $markup) = @_;
1329 1413
1330 return if $self->{text} eq "M$markup"; 1414 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup"; 1415 $self->{text} = "M$markup";
1332 1416
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333 $self->{layout}->set_markup ($markup); 1420 $self->{layout}->set_markup ($markup);
1334 1421
1335 delete $self->{texture};
1336 $self->update; 1422 $self->update;
1337 $self->check_size; 1423 $self->check_size;
1338} 1424}
1339 1425
1340sub size_request { 1426sub size_request {
1341 my ($self) = @_; 1427 my ($self) = @_;
1342 1428
1343 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1429 $self->{layout}->set_font ($self->{font}) if $self->{font};
1344 $self->{layout}->set_width ($self->{max_w} || -1); 1430 $self->{layout}->set_width ($self->{max_w} || -1);
1431 $self->{layout}->set_ellipsise ($self->{ellipsise});
1432 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1345 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1433 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1346 1434
1347 my ($w, $h) = $self->{layout}->size; 1435 my ($w, $h) = $self->{layout}->size;
1348 1436
1349 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1371sub set_fontsize { 1459sub set_fontsize {
1372 my ($self, $fontsize) = @_; 1460 my ($self, $fontsize) = @_;
1373 1461
1374 $self->{fontsize} = $fontsize; 1462 $self->{fontsize} = $fontsize;
1375 delete $self->{texture}; 1463 delete $self->{texture};
1464
1465 $self->update;
1376 $self->check_size; 1466 $self->check_size;
1377 $self->update;
1378} 1467}
1379 1468
1380sub _draw { 1469sub _draw {
1381 my ($self) = @_; 1470 my ($self) = @_;
1382 1471
1472 $self->SUPER::_draw; # draw background, if applicable
1473
1383 my $tex = $self->{texture} ||= do { 1474 my $tex = $self->{texture} ||= do {
1475 $self->{layout}->set_foreground (@{$self->{fg}});
1384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1476 $self->{layout}->set_font ($self->{font}) if $self->{font};
1385 $self->{layout}->set_width ($self->{w}); 1477 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1386 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481
1387 new_from_layout CFClient::Texture $self->{layout} 1482 my $tex = new_from_layout CFClient::Texture $self->{layout};
1483
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1486 : ($self->{w} - $tex->{w}) * 0.5);
1487
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1490 : ($self->{h} - $tex->{h}) * 0.5);
1491
1492 $tex
1388 }; 1493 };
1389 1494
1390 glEnable GL_BLEND;
1391 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392 glEnable GL_TEXTURE_2D; 1495 glEnable GL_TEXTURE_2D;
1393 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394 1497
1498 if ($tex->{format} == GL_ALPHA) {
1395 glColor @{$self->{fg}}; 1499 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}); 1500 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1501 } else {
1502 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1503 }
1410 1504
1411 glDisable GL_TEXTURE_2D; 1505 glDisable GL_TEXTURE_2D;
1412 glDisable GL_BLEND;
1413} 1506}
1414 1507
1415############################################################################# 1508#############################################################################
1416 1509
1417package CFClient::UI::EntryBase; 1510package CFClient::UI::EntryBase;
… …
1430 active_fg => [0, 0, 0], 1523 active_fg => [0, 0, 0],
1431 can_hover => 1, 1524 can_hover => 1,
1432 can_focus => 1, 1525 can_focus => 1,
1433 valign => 0, 1526 valign => 0,
1434 can_events => 1, 1527 can_events => 1,
1528 #text => ...
1435 @_ 1529 @_
1436 ) 1530 )
1437} 1531}
1438 1532
1439sub _set_text { 1533sub _set_text {
… …
1449 $self->{text} = $text; 1543 $self->{text} = $text;
1450 1544
1451 $text =~ s/./*/g if $self->{hidden}; 1545 $text =~ s/./*/g if $self->{hidden};
1452 $self->{layout}->set_text ("$text "); 1546 $self->{layout}->set_text ("$text ");
1453 1547
1454 $self->emit (changed => $self->{text}); 1548 $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} 1549}
1474 1550
1475sub set_text { 1551sub set_text {
1476 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1477 1553
1478 $self->{cursor} = length $text; 1554 $self->{cursor} = length $text;
1479 $self->_set_text ($text); 1555 $self->_set_text ($text);
1480 $self->update; 1556 $self->update;
1557 $self->check_size;
1558}
1559
1560sub get_text {
1561 $_[0]{text}
1562}
1563
1564sub size_request {
1565 my ($self) = @_;
1566
1567 my ($w, $h) = $self->SUPER::size_request;
1568
1569 ($w + 1, $h) # add 1 for cursor
1481} 1570}
1482 1571
1483sub key_down { 1572sub key_down {
1484 my ($self, $ev) = @_; 1573 my ($self, $ev) = @_;
1485 1574
… …
1487 my $sym = $ev->{sym}; 1576 my $sym = $ev->{sym};
1488 my $uni = $ev->{unicode}; 1577 my $uni = $ev->{unicode};
1489 1578
1490 my $text = $self->get_text; 1579 my $text = $self->get_text;
1491 1580
1492 if ($sym == 8) { 1581 if ($uni == 8) {
1493 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1582 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494 } elsif ($sym == 127) { 1583 } elsif ($uni == 127) {
1495 substr $text, $self->{cursor}, 1, ""; 1584 substr $text, $self->{cursor}, 1, "";
1496 } elsif ($sym == CFClient::SDLK_LEFT) { 1585 } elsif ($sym == CFClient::SDLK_LEFT) {
1497 --$self->{cursor} if $self->{cursor}; 1586 --$self->{cursor} if $self->{cursor};
1498 } elsif ($sym == CFClient::SDLK_RIGHT) { 1587 } elsif ($sym == CFClient::SDLK_RIGHT) {
1499 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1588 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1500 } elsif ($sym == CFClient::SDLK_HOME) { 1589 } elsif ($sym == CFClient::SDLK_HOME) {
1501 $self->{cursor} = 0; 1590 $self->{cursor} = 0;
1502 } elsif ($sym == CFClient::SDLK_END) { 1591 } elsif ($sym == CFClient::SDLK_END) {
1503 $self->{cursor} = length $text; 1592 $self->{cursor} = length $text;
1504 } elsif ($sym == 27) { 1593 } elsif ($uni == 27) {
1505 $self->emit ('escape'); 1594 $self->_emit ('escape');
1506 } elsif ($uni) { 1595 } elsif ($uni) {
1507 substr $text, $self->{cursor}++, 0, chr $uni; 1596 substr $text, $self->{cursor}++, 0, chr $uni;
1508 } 1597 }
1509 1598
1510 $self->_set_text ($text); 1599 $self->_set_text ($text);
1511 $self->update; 1600 $self->update;
1601 $self->check_size;
1512} 1602}
1513 1603
1514sub focus_in { 1604sub focus_in {
1515 my ($self) = @_; 1605 my ($self) = @_;
1516 1606
… …
1596 if ($sym == 13) { 1686 if ($sym == 13) {
1597 unshift @{$self->{history}}, 1687 unshift @{$self->{history}},
1598 my $txt = $self->get_text; 1688 my $txt = $self->get_text;
1599 $self->{history_pointer} = -1; 1689 $self->{history_pointer} = -1;
1600 $self->{history_saveback} = ''; 1690 $self->{history_saveback} = '';
1601 $self->emit (activate => $txt); 1691 $self->_emit (activate => $txt);
1602 $self->update; 1692 $self->update;
1603 1693
1604 } elsif ($sym == CFClient::SDLK_UP) { 1694 } elsif ($sym == CFClient::SDLK_UP) {
1605 if ($self->{history_pointer} < 0) { 1695 if ($self->{history_pointer} < 0) {
1606 $self->{history_saveback} = $self->get_text; 1696 $self->{history_saveback} = $self->get_text;
… …
1645 my $class = shift; 1735 my $class = shift;
1646 1736
1647 $class->SUPER::new ( 1737 $class->SUPER::new (
1648 padding => 4, 1738 padding => 4,
1649 fg => [1, 1, 1], 1739 fg => [1, 1, 1],
1650 bg => [1, 1, 1, 0.2],
1651 active_fg => [0, 0, 1], 1740 active_fg => [0, 0, 1],
1652 can_hover => 1, 1741 can_hover => 1,
1653 align => 0, 1742 align => 0,
1654 valign => 0, 1743 valign => 0,
1655 can_events => 1, 1744 can_events => 1,
1656 @_ 1745 @_
1657 ) 1746 )
1658} 1747}
1659 1748
1749sub activate { }
1750
1660sub button_up { 1751sub button_up {
1661 my ($self, $ev, $x, $y) = @_; 1752 my ($self, $ev, $x, $y) = @_;
1662 1753
1754 $self->emit ("activate")
1663 if ($x >= 0 && $x < $self->{w} 1755 if $x >= 0 && $x < $self->{w}
1664 && $y >= 0 && $y < $self->{h}) { 1756 && $y >= 0 && $y < $self->{h};
1665 $self->emit ("activate");
1666 }
1667} 1757}
1668 1758
1669sub _draw { 1759sub _draw {
1670 my ($self) = @_; 1760 my ($self) = @_;
1671 1761
… …
1673 1763
1674 if ($GRAB == $self) { 1764 if ($GRAB == $self) {
1675 $self->{fg} = $self->{active_fg}; 1765 $self->{fg} = $self->{active_fg};
1676 } 1766 }
1677 1767
1678 glEnable GL_BLEND;
1679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680 glEnable GL_TEXTURE_2D; 1768 glEnable GL_TEXTURE_2D;
1681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682 glColor 0, 0, 0, 1; 1770 glColor 0, 0, 0, 1;
1683 1771
1684 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1772 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685 1773
1686 glDisable GL_TEXTURE_2D; 1774 glDisable GL_TEXTURE_2D;
1687 glDisable GL_BLEND;
1688 1775
1689 $self->SUPER::_draw; 1776 $self->SUPER::_draw;
1690} 1777}
1691 1778
1692############################################################################# 1779#############################################################################
… …
1706 1793
1707 $class->SUPER::new ( 1794 $class->SUPER::new (
1708 padding => 2, 1795 padding => 2,
1709 fg => [1, 1, 1], 1796 fg => [1, 1, 1],
1710 active_fg => [1, 1, 0], 1797 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5],
1711 state => 0, 1800 state => 0,
1712 can_hover => 1, 1801 can_hover => 1,
1713 @_ 1802 @_
1714 ) 1803 )
1715} 1804}
… …
1724 my ($self, $ev, $x, $y) = @_; 1813 my ($self, $ev, $x, $y) = @_;
1725 1814
1726 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1727 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1728 $self->{state} = !$self->{state}; 1817 $self->{state} = !$self->{state};
1729 $self->emit (changed => $self->{state}); 1818 $self->_emit (changed => $self->{state});
1730 } 1819 }
1731} 1820}
1732 1821
1733sub _draw { 1822sub _draw {
1734 my ($self) = @_; 1823 my ($self) = @_;
… …
1739 1828
1740 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1741 1830
1742 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743 1832
1744 glEnable GL_BLEND; 1833 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834
1745 glEnable GL_TEXTURE_2D; 1835 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); 1836 $tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752 glDisable GL_TEXTURE_2D; 1837 glDisable GL_TEXTURE_2D;
1753 glDisable GL_BLEND;
1754} 1838}
1755 1839
1756############################################################################# 1840#############################################################################
1757 1841
1758package CFClient::UI::Image; 1842package CFClient::UI::Image;
… …
1801 glTranslate 0, -$self->{w}, 0; 1885 glTranslate 0, -$self->{w}, 0;
1802 1886
1803 ($w, $h) = ($h, $w); 1887 ($w, $h) = ($h, $w);
1804 } 1888 }
1805 1889
1806 glEnable GL_BLEND;
1807 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808 glEnable GL_TEXTURE_2D; 1890 glEnable GL_TEXTURE_2D;
1809 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1891 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810 1892
1811 $tex->draw_quad (0, 0, $w, $h); 1893 $tex->draw_quad_alpha (0, 0, $w, $h);
1812 1894
1813 glDisable GL_BLEND;
1814 glDisable GL_TEXTURE_2D; 1895 glDisable GL_TEXTURE_2D;
1815} 1896}
1816 1897
1817############################################################################# 1898#############################################################################
1818 1899
… …
2007 qw(s1_slider.png s1_slider_bg.png); 2088 qw(s1_slider.png s1_slider_bg.png);
2008 2089
2009sub new { 2090sub new {
2010 my $class = shift; 2091 my $class = shift;
2011 2092
2012 # range [value, low, high, page] 2093 # range [value, low, high, page, unit]
2013 2094
2014 # TODO: 0-width page 2095 # TODO: 0-width page
2015 # TODO: req_w/h are wrong with vertical 2096 # TODO: req_w/h are wrong with vertical
2016 # TODO: calculations are off 2097 # TODO: calculations are off
2017 my $self = $class->SUPER::new ( 2098 my $self = $class->SUPER::new (
2018 fg => [1, 1, 1], 2099 fg => [1, 1, 1],
2019 active_fg => [0, 0, 0], 2100 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5],
2020 range => [0, 0, 100, 10], 2103 range => [0, 0, 100, 10, 0],
2021 req_w => $::WIDTH / 80, 2104 req_w => $::WIDTH / 80,
2022 req_h => $::WIDTH / 80, 2105 req_h => $::WIDTH / 80,
2023 vertical => 0, 2106 vertical => 0,
2024 can_hover => 1, 2107 can_hover => 1,
2025 inner_pad => 5, 2108 inner_pad => 0.02,
2026 @_ 2109 @_
2027 ); 2110 );
2028 2111
2112 $self->set_value ($self->{range}[0]);
2113 $self->update;
2114
2029 $self 2115 $self
2116}
2117
2118sub set_range {
2119 my ($self, $range) = @_;
2120
2121 $self->{range} = $range;
2122
2123 $self->update;
2124}
2125
2126sub set_value {
2127 my ($self, $value) = @_;
2128
2129 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2130
2131 $hi = $lo + 1 if $hi <= $lo;
2132
2133 $page = $hi - $lo if $page > $hi - $lo;
2134
2135 $value = $lo if $value < $lo;
2136 $value = $hi - $page if $value > $hi - $page;
2137
2138 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2139 if $unit;
2140
2141 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2142
2143 if ($value != $old_value) {
2144 $self->_emit (changed => $value);
2145 $self->update;
2146 }
2030} 2147}
2031 2148
2032sub size_request { 2149sub size_request {
2033 my ($self) = @_; 2150 my ($self) = @_;
2034 2151
… …
2040 2157
2041sub button_down { 2158sub button_down {
2042 my ($self, $ev, $x, $y) = @_; 2159 my ($self, $ev, $x, $y) = @_;
2043 2160
2044 $self->SUPER::button_down ($ev, $x, $y); 2161 $self->SUPER::button_down ($ev, $x, $y);
2162
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164
2045 $self->mouse_motion ($ev, $x, $y); 2165 $self->mouse_motion ($ev, $x, $y);
2046} 2166}
2047 2167
2048sub mouse_motion { 2168sub mouse_motion {
2049 my ($self, $ev, $x, $y) = @_; 2169 my ($self, $ev, $x, $y) = @_;
2050 2170
2051 if ($GRAB == $self) { 2171 if ($GRAB == $self) {
2172 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2173
2174 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177
2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2179 }
2180}
2181
2182sub update {
2183 my ($self) = @_;
2184
2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2186 $self->set_value ($self->{range}[0]);
2187
2052 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2188 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100;
2053 2190
2054 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2191 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2055 2192
2056 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2193 $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 2194 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2058 2195
2059 $x -= $inner_pad_px; # substract the padding 2196 $value = ($value - $lo) / $range;
2060 $x = $x * ($hi - $lo) / $inner_w + $lo; 2197 $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 2198
2065 $self->emit (changed => $x); 2199 $self->{knob_x} = $value - $knob_w * 0.5;
2066 $self->update; 2200 $self->{knob_w} = $knob_w;
2067 } 2201 });
2068}
2069 2202
2070# the inner_* stuff is for generating a padding for the slider handle, 2203 $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} 2204}
2077 2205
2078sub _draw { 2206sub _draw {
2079 my ($self) = @_; 2207 my ($self) = @_;
2080 2208
2081 $self->SUPER::_draw (); 2209 $self->SUPER::_draw ();
2082 2210
2083 my ($w, $h) = @$self{qw(w h)}; 2211 glScale $self->{w}, $self->{h};
2084 2212
2085 if ($self->{vertical}) { 2213 if ($self->{vertical}) {
2086 # draw a vertical slider like a rotated horizontal slider 2214 # draw a vertical slider like a rotated horizontal slider
2087 2215
2216 glTranslate 1, 0, 0;
2088 glRotate 90, 0, 0, 1; 2217 glRotate 90, 0, 0, 1;
2089 glTranslate 0, -$self->{w}, 0;
2090
2091 ($w, $h) = ($h, $w);
2092 } 2218 }
2093 2219
2094 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2220 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2221 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096 2222
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; 2223 glEnable GL_TEXTURE_2D;
2118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119 2225
2120 # draw background 2226 # draw background
2121 $tex[1]->draw_quad (0, 0, $w, $h); 2227 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122 2228
2123 # draw handle 2229 # draw handle
2124 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2230 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2125 2231
2126 glDisable GL_BLEND;
2127 glDisable GL_TEXTURE_2D; 2232 glDisable GL_TEXTURE_2D;
2128} 2233}
2234
2235#############################################################################
2236
2237package CFClient::UI::ValSlider;
2238
2239our @ISA = CFClient::UI::HBox::;
2240
2241sub new {
2242 my ($class, %arg) = @_;
2243
2244 my $range = delete $arg{range};
2245
2246 my $self = $class->SUPER::new (
2247 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2248 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2249 to_value => sub { shift },
2250 from_value => sub { shift },
2251 %arg,
2252 );
2253
2254 $self->{slider}->connect (changed => sub {
2255 my ($self, $value) = @_;
2256 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2257 $self->{parent}->emit (changed => $value);
2258 });
2259
2260# $self->{entry}->connect (changed => sub {
2261# my ($self, $value) = @_;
2262# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2263# $self->{parent}->emit (changed => $value);
2264# });
2265
2266 $self->add ($self->{slider}, $self->{entry});
2267
2268 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2269
2270 $self
2271}
2272
2273sub set_range { shift->{slider}->set_range (@_) }
2274sub set_value { shift->{slider}->set_value (@_) }
2129 2275
2130############################################################################# 2276#############################################################################
2131 2277
2132package CFClient::UI::TextView; 2278package CFClient::UI::TextView;
2133 2279
… …
2142 fontsize => 1, 2288 fontsize => 1,
2143 can_events => 0, 2289 can_events => 0,
2144 #font => default_font 2290 #font => default_font
2145 @_, 2291 @_,
2146 2292
2147 layout => (new CFClient::Layout), 2293 layout => (new CFClient::Layout 1),
2148 par => [], 2294 par => [],
2149 height => 0, 2295 height => 0,
2150 children => [ 2296 children => [
2151 (new CFClient::UI::Empty expand => 1), 2297 (new CFClient::UI::Empty expand => 1),
2152 (new CFClient::UI::Slider vertical => 1), 2298 (new CFClient::UI::Slider vertical => 1),
… …
2163 2309
2164 $self->{fontsize} = $fontsize; 2310 $self->{fontsize} = $fontsize;
2165 $self->reflow; 2311 $self->reflow;
2166} 2312}
2167 2313
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 { 2314sub size_allocate {
2188 my ($self, $w, $h) = @_; 2315 my ($self, $w, $h) = @_;
2189 2316
2190 $self->SUPER::size_allocate ($w, $h); 2317 $self->SUPER::size_allocate ($w, $h);
2191 2318
… …
2194 $self->{layout}->set_width ($self->{children}[0]{w}); 2321 $self->{layout}->set_width ($self->{children}[0]{w});
2195 2322
2196 $self->reflow; 2323 $self->reflow;
2197} 2324}
2198 2325
2326sub text_size {
2327 my ($self, $text, $indent) = @_;
2328
2329 my $layout = $self->{layout};
2330
2331 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2332 $layout->set_width ($self->{children}[0]{w} - $indent);
2333 $layout->set_markup ($text);
2334
2335 $layout->size
2336}
2337
2338sub reflow {
2339 my ($self) = @_;
2340
2341 $self->{need_reflow}++;
2342 $self->update;
2343}
2344
2345sub set_offset {
2346 my ($self, $offset) = @_;
2347
2348 # todo: base offset on lines or so, not on pixels
2349 $self->{children}[1]->set_value ($offset);
2350}
2351
2352sub clear {
2353 my ($self) = @_;
2354
2355 $self->{par} = [];
2356 $self->{height} = 0;
2357 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2358}
2359
2199sub add_paragraph { 2360sub add_paragraph {
2200 my ($self, $color, $text) = @_; 2361 my ($self, $color, $text, $indent) = @_;
2201 2362
2202 #TODO: intelligently "reformat" paragraph 2363 for my $line (split /\n/, $text) {
2203 2364 my ($w, $h) = $self->text_size ($line);
2204 my $height = $self->text_height ($text);
2205
2206 $self->{height} += $height; 2365 $self->{height} += $h;
2366 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2367 }
2207 2368
2208 push @{$self->{par}}, [$height, $color, $text];
2209
2210 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2369 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2211 $self->{children}[1]->update;
2212} 2370}
2213 2371
2214sub update { 2372sub update {
2215 my ($self) = @_; 2373 my ($self) = @_;
2216 2374
… …
2218 2376
2219 return unless $self->{h} > 0; 2377 return unless $self->{h} > 0;
2220 2378
2221 delete $self->{texture}; 2379 delete $self->{texture};
2222 2380
2223 $ROOT->on_refresh ($self, sub { 2381 $ROOT->on_post_alloc ($self, sub {
2382 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2383
2224 if (delete $self->{need_reflow}) { 2384 if (delete $self->{need_reflow}) {
2225 my $height = 0; 2385 my $height = 0;
2226 2386
2227 $height += $_->[0] = $self->text_height ($_->[2]) 2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390
2228 for @{$self->{par}}; 2391 for (@{$self->{par}}) {
2392 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2393 $layout->set_width ($W - $_->[3]);
2394 $layout->set_markup ($_->[4]);
2395 my ($w, $h) = $layout->size;
2396 $_->[0] = $w + $_->[3];
2397 $_->[1] = $h;
2398 }
2399
2400 $height += $_->[1];
2401 }
2229 2402
2230 $self->{height} = $height; 2403 $self->{height} = $height;
2231 2404
2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2405 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2233 2406
2234 delete $self->{texture}; 2407 delete $self->{texture};
2235 } 2408 }
2236 2409
2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2410 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2238 glClearColor 0, 0, 0, 0; 2411 glClearColor 0.5, 0.5, 0.5, 0;
2239 glClear GL_COLOR_BUFFER_BIT; 2412 glClear GL_COLOR_BUFFER_BIT;
2240 2413
2414 my $top = int $self->{children}[1]{range}[0];
2415
2416 my $y0 = $top;
2417 my $y1 = $top + $H;
2418
2419 my $y = 0;
2420
2421 my $layout = $self->{layout};
2422
2423 $layout->set_font ($self->{font}) if $self->{font};
2424
2241 glEnable GL_BLEND; 2425 glEnable GL_BLEND;
2426 #TODO# not correct in windows where rgba is forced off
2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2427 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 2428
2257 for my $par (@{$self->{par}}) { 2429 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2430 my $h = $par->[1];
2259 2431
2260 if ($y0 < $y + $h && $y < $y1) { 2432 if ($y0 < $y + $h && $y < $y1) {
2433 $layout->set_foreground (@{ $par->[2] });
2434 $layout->set_width ($W - $par->[3]);
2261 $layout->set_text ($par->[2]); 2435 $layout->set_markup ($par->[4]);
2262 2436
2263 glColor @{ $par->[1] }; 2437 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 my ($W, $H) = $layout->size; 2438
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2439 glRasterPos $par->[3], $y - $y0;
2440 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266 } 2441 }
2267 2442
2268 $y += $h; 2443 $y += $h;
2269 } 2444 }
2270 2445
2271 glDisable GL_TEXTURE_2D;
2272 glDisable GL_BLEND; 2446 glDisable GL_BLEND;
2273 }; 2447 };
2274 }); 2448 });
2275} 2449}
2276 2450
2277sub _draw { 2451sub _draw {
2278 my ($self) = @_; 2452 my ($self) = @_;
2279 2453
2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282 glEnable GL_TEXTURE_2D; 2454 glEnable GL_TEXTURE_2D;
2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1; 2456 glColor 1, 1, 1, 1;
2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2457 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286 glDisable GL_TEXTURE_2D; 2458 glDisable GL_TEXTURE_2D;
2287 glDisable GL_BLEND;
2288 2459
2289 $self->{children}[1]->draw; 2460 $self->{children}[1]->draw;
2290 2461
2291} 2462}
2292 2463
… …
2360 2531
2361 # TODO: use animation 2532 # TODO: use animation
2362 if ($self->{state} = !$self->{state}) { 2533 if ($self->{state} = !$self->{state}) {
2363 $CFClient::UI::ROOT->add ($self->{other}); 2534 $CFClient::UI::ROOT->add ($self->{other});
2364 $self->{other}->move ($self->coord2global (0, $self->{h})); 2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2365 $self->emit ("open"); 2536 $self->_emit ("open");
2366 } else { 2537 } else {
2367 $CFClient::UI::ROOT->remove ($self->{other}); 2538 $CFClient::UI::ROOT->remove ($self->{other});
2368 $self->emit ("close"); 2539 $self->_emit ("close");
2369 } 2540 }
2370 2541
2371 $self->emit (changed => $self->{state}); 2542 $self->_emit (changed => $self->{state});
2372} 2543}
2373 2544
2374############################################################################# 2545#############################################################################
2375 2546
2376package CFClient::UI::Tooltip; 2547package CFClient::UI::Tooltip;
… …
2386 @_, 2557 @_,
2387 can_events => 0, 2558 can_events => 0,
2388 ) 2559 )
2389} 2560}
2390 2561
2391sub set_markup { 2562sub set_tooltip_from {
2392 my ($self, $text) = @_; 2563 my ($self, $widget) = @_;
2393 2564
2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2565 $self->add (new CFClient::UI::Label
2395 $self->{label}->set_markup ($text); 2566 markup => $widget->{tooltip},
2396 $self->add ($self->{label}); 2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568 fontsize => 0.8,
2569 fg => [0, 0, 0, 1],
2570 ellipsise => 0,
2571 font => ($widget->{tooltip_font} || $::FONT_PROP),
2572 );
2397} 2573}
2398 2574
2399sub size_request { 2575sub size_request {
2400 my ($self) = @_; 2576 my ($self) = @_;
2401
2402 $self->child->set_max_size ($::WIDTH * 0.3);
2403 2577
2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2578 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405 2579
2406 ($w + 4, $h + 4) 2580 ($w + 4, $h + 4)
2407} 2581}
… …
2413} 2587}
2414 2588
2415sub _draw { 2589sub _draw {
2416 my ($self) = @_; 2590 my ($self) = @_;
2417 2591
2418 glPushMatrix;
2419 glTranslate 0.375, 0.375; 2592 glTranslate 0.375, 0.375;
2420 2593
2421 my ($w, $h) = @$self{qw(w h)}; 2594 my ($w, $h) = @$self{qw(w h)};
2422 2595
2423 glColor 1, 0.8, 0.4; 2596 glColor 1, 0.8, 0.4;
… …
2434 glVertex 0 , $h; 2607 glVertex 0 , $h;
2435 glVertex $w, $h; 2608 glVertex $w, $h;
2436 glVertex $w, 0; 2609 glVertex $w, 0;
2437 glEnd; 2610 glEnd;
2438 2611
2439 glPopMatrix; 2612 glTranslate 2 - 0.375, 2 - 0.375;
2440
2441 glTranslate 2, 2;
2442 $self->SUPER::_draw; 2613 $self->SUPER::_draw;
2443} 2614}
2444 2615
2445############################################################################# 2616#############################################################################
2446 2617
… …
2451use CFClient::OpenGL; 2622use CFClient::OpenGL;
2452 2623
2453sub new { 2624sub new {
2454 my $class = shift; 2625 my $class = shift;
2455 2626
2456 $class->SUPER::new ( 2627 my $self = $class->SUPER::new (
2457 aspect => 1, 2628 aspect => 1,
2458 @_, 2629 @_,
2459 ) 2630 );
2631
2632 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self);
2634
2635 $self->{timer} = Event->timer (
2636 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2637 hard => 1,
2638 interval => $self->{animspeed},
2639 cb => sub {
2640 ++$widget->{frame};
2641 $widget->update;
2642 },
2643 );
2644 }
2645
2646 $self
2460} 2647}
2461 2648
2462sub size_request { 2649sub size_request {
2463 (32, 8) 2650 (32, 8)
2464} 2651}
2465 2652
2653sub update {
2654 my ($self) = @_;
2655
2656 return unless $self->{visible};
2657
2658 $self->SUPER::update;
2659}
2660
2466sub _draw { 2661sub _draw {
2467 my ($self) = @_; 2662 my ($self) = @_;
2468 2663
2664 return unless $::CONN;
2665
2666 my $face;
2667
2668 if ($self->{frame}) {
2669 my $anim = $::CONN->{anim}[$self->{anim}];
2670
2671 $face = $anim->[ $self->{frame} % @$anim ]
2672 if $anim && @$anim;
2673 }
2674
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2675 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2676
2471 # TODO animation
2472 if ($tex) { 2677 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2678 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2680 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2681 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2682 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2683 }
2684}
2685
2686sub DESTROY {
2687 my ($self) = @_;
2688
2689 $self->{timer}->cancel
2690 if $self->{timer};
2691
2692 $self->SUPER::DESTROY;
2693}
2694
2695#############################################################################
2696
2697package CFClient::UI::InventoryItem;
2698
2699our @ISA = CFClient::UI::HBox::;
2700
2701sub _item_to_desc {
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726
2727sub new {
2728 my $class = shift;
2729
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table),
2818 @_,
2819 );
2820
2821 $self
2822}
2823
2824sub set_items {
2825 my ($self, $items) = @_;
2826
2827 $self->{scrolled}->clear;
2828 return unless $items;
2829
2830 my @items = sort {
2831 ($a->{type} <=> $b->{type})
2832 or ($a->{name} cmp $b->{name})
2833 } @$items;
2834
2835 $self->{real_items} = \@items;
2836
2837 for my $item (@items) {
2838 $item->{item} = $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842
2843 my $i = 0;
2844 for (@items) {
2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2851}
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2482} 2856}
2483 2857
2484############################################################################# 2858#############################################################################
2485 2859
2486package CFClient::UI::Menu; 2860package CFClient::UI::Menu;
… …
2521 2895
2522# popup given the event (must be a mouse button down event currently) 2896# popup given the event (must be a mouse button down event currently)
2523sub popup { 2897sub popup {
2524 my ($self, $ev) = @_; 2898 my ($self, $ev) = @_;
2525 2899
2526 $self->emit ("popdown"); 2900 $self->_emit ("popdown");
2527 2901
2528 # maybe save $GRAB? must be careful about events... 2902 # maybe save $GRAB? must be careful about events...
2529 $GRAB = $self; 2903 $GRAB = $self;
2530 $self->{button} = $ev->{button}; 2904 $self->{button} = $ev->{button};
2531 2905
… …
2546 2920
2547 if ($ev->{button} == $self->{button}) { 2921 if ($ev->{button} == $self->{button}) {
2548 undef $GRAB; 2922 undef $GRAB;
2549 $self->hide; 2923 $self->hide;
2550 2924
2551 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2552 $self->{hover}[1]->() if $self->{hover}; 2926 $self->{hover}[1]->() if $self->{hover};
2553 } 2927 }
2554} 2928}
2555 2929
2556############################################################################# 2930#############################################################################
2557 2931
2932package CFClient::UI::Statusbox;
2933
2934our @ISA = CFClient::UI::VBox::;
2935
2936sub new {
2937 my $class = shift;
2938
2939 $class->SUPER::new (
2940 fontsize => 0.8,
2941 @_,
2942 )
2943}
2944
2945sub reorder {
2946 my ($self) = @_;
2947 my $NOW = time;
2948
2949 while (my ($k, $v) = each %{ $self->{item} }) {
2950 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2951 }
2952
2953 my @widgets;
2954
2955 my @items = sort {
2956 $a->{pri} <=> $b->{pri}
2957 or $b->{id} <=> $a->{id}
2958 } values %{ $self->{item} };
2959
2960 my $count = 10 + 1;
2961 for my $item (@items) {
2962 last unless --$count;
2963
2964 push @widgets, $item->{label} ||= do {
2965 # TODO: doesn't handle markup well (read as: at all)
2966 my $short = $item->{count} > 1
2967 ? "<b>$item->{count} ×</b> $item->{text}"
2968 : $item->{text};
2969
2970 for ($short) {
2971 s/^\s+//;
2972 s/\s+/ /g;
2973 }
2974
2975 new CFClient::UI::Label
2976 markup => $short,
2977 tooltip => $item->{tooltip},
2978 tooltip_font => $::FONT_PROP,
2979 tooltip_width => 0.67,
2980 fontsize => $item->{fontsize} || $self->{fontsize},
2981 max_w => $::WIDTH * 0.44,
2982 fg => $item->{fg},
2983 can_events => 1,
2984 can_hover => 1
2985 };
2986 }
2987
2988 $self->clear;
2989 $self->SUPER::add (reverse @widgets);
2990}
2991
2992sub add {
2993 my ($self, $text, %arg) = @_;
2994
2995 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//;
2997
2998 my $timeout = time + ((delete $arg{timeout}) || 60);
2999
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001
3002 if (my $item = $self->{item}{$group}) {
3003 if ($item->{text} eq $text) {
3004 $item->{count}++;
3005 } else {
3006 $item->{count} = 1;
3007 $item->{text} = $item->{tooltip} = $text;
3008 }
3009 $item->{id} = ++$self->{id};
3010 $item->{timeout} = $timeout;
3011 delete $item->{label};
3012 } else {
3013 $self->{item}{$group} = {
3014 id => ++$self->{id},
3015 text => $text,
3016 timeout => $timeout,
3017 tooltip => $text,
3018 fg => [0.8, 0.8, 0.8, 0.8],
3019 pri => 0,
3020 count => 1,
3021 %arg,
3022 };
3023 }
3024
3025 $self->reorder;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 delete $_->{label}
3032 for values %{ $self->{item} || {} };
3033
3034 $self->reorder;
3035 $self->SUPER::reconfigure;
3036}
3037
3038#############################################################################
3039
2558package CFClient::UI::Root; 3040package CFClient::UI::Root;
2559 3041
2560our @ISA = CFClient::UI::Container::; 3042our @ISA = CFClient::UI::Container::;
2561 3043
2562use CFClient::OpenGL; 3044use CFClient::OpenGL;
2563 3045
2564sub check_size { 3046sub new {
2565 my ($self) = @_; 3047 my $class = shift;
2566 3048
2567 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3049 $class->SUPER::new (
2568} 3050 @_,
2569 3051 )
2570sub size_request {
2571 ($::WIDTH, $::HEIGHT)
2572} 3052}
2573 3053
2574sub configure { 3054sub configure {
2575 my ($self, $x, $y, $w, $h) = @_; 3055 my ($self, $x, $y, $w, $h) = @_;
2576 3056
2577 $self->SUPER::configure ($x, $y, $w, $h); 3057 $self->{w} = $w;
3058 $self->{h} = $h;
3059}
2578 3060
3061sub check_size {
3062 my ($self) = @_;
3063
3064 $self->size_allocate ($self->{w}, $self->{h})
3065 if $self->{w};
3066}
3067
3068sub size_request {
3069 my ($self) = @_;
3070
3071 ($self->{w}, $self->{h})
3072}
3073
3074sub size_allocate {
3075 my ($self, $w, $h) = @_;
3076
2579 for my $child (@{$self->{children}}) { 3077 for my $child ($self->children) {
2580 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581 3079
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3081 if exists $child->{req_x};
3082
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3084 if exists $child->{req_y};
3085
2582 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3086 $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; 3087 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088
2584 $child->configure ($X, $Y, $W,$H); 3089 $child->configure ($X, $Y, $W, $H);
2585 } 3090 }
2586} 3091}
2587 3092
2588sub _topleft { 3093sub coord2local {
2589 my ($self, $x, $y) = @_; 3094 my ($self, $x, $y) = @_;
2590 3095
2591 ($x, $y) 3096 ($x, $y)
2592} 3097}
2593 3098
3099sub coord2global {
3100 my ($self, $x, $y) = @_;
3101
3102 ($x, $y)
3103}
3104
2594sub update { 3105sub update {
2595 my ($self) = @_; 3106 my ($self) = @_;
2596 3107
2597 $self->check_size; 3108 $self->check_size;
2598 ::refresh (); 3109 $::WANT_REFRESH++;
2599} 3110}
2600 3111
2601sub add { 3112sub add {
2602 my ($self, $child) = @_; 3113 my ($self, @children) = @_;
2603 3114
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120
3121 for my $child (@children) {
3122 $child->{is_toplevel} = 1;
3123
2604 # integerize window positions 3124 # integerise window positions
2605 $child->{x} = int $child->{x}; 3125 $child->{x} = int $child->{x};
2606 $child->{y} = int $child->{y}; 3126 $child->{y} = int $child->{y};
3127 }
2607 3128
2608 $self->SUPER::add ($child); 3129 $self->SUPER::add (@children);
3130}
3131
3132sub remove {
3133 my ($self, @children) = @_;
3134
3135 $self->SUPER::remove (@children);
3136
3137 while (@children) {
3138 my $w = pop @children;
3139 push @children, $w->children;
3140 $w->set_invisible;
3141 }
2609} 3142}
2610 3143
2611sub on_refresh { 3144sub on_refresh {
2612 my ($self, $id, $cb) = @_; 3145 my ($self, $id, $cb) = @_;
2613 3146
2614 $self->{refresh_hook}{$id} = $cb; 3147 $self->{refresh_hook}{$id} = $cb;
2615} 3148}
2616 3149
3150sub on_post_alloc {
3151 my ($self, $id, $cb) = @_;
3152
3153 $self->{post_alloc_hook}{$id} = $cb;
3154}
3155
2617sub draw { 3156sub draw {
2618 my ($self) = @_; 3157 my ($self) = @_;
2619 3158
2620 while (my $rcb = delete $self->{refresh_hook}) { 3159 while ($self->{refresh_hook}) {
2621 $_->() for values %$rcb; 3160 $_->()
3161 for values %{delete $self->{refresh_hook}};
3162 }
3163
3164 if ($self->{check_size}) {
3165 my @queue = ([], []);
3166
3167 for (;;) {
3168 if ($self->{check_size}) {
3169 # heuristic: check containers last
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3171 for values %{delete $self->{check_size}}
3172 }
3173
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3175
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3177 ? @$widget{qw(user_w user_h)}
3178 : $widget->size_request;
3179
3180 if (delete $widget->{force_alloc}
3181 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3183
3184 $widget->{req_w} = $w;
3185 $widget->{req_h} = $h;
3186
3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3188
3189 $widget->{parent}->check_size
3190 if $widget->{parent};
3191 }
3192 }
3193 }
3194
3195 while ($self->{size_alloc}) {
3196 for (values %{delete $self->{size_alloc}}) {
3197 my ($widget, $w, $h) = @$_;
3198
3199 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0;
3201
3202 $widget->{w} = $w;
3203 $widget->{h} = $h;
3204 $widget->emit (size_allocate => $w, $h);
3205 }
3206 }
3207
3208 while ($self->{post_alloc_hook}) {
3209 $_->()
3210 for values %{delete $self->{post_alloc_hook}};
2622 } 3211 }
2623 3212
2624 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3213 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626 glClear GL_COLOR_BUFFER_BIT; 3215 glClear GL_COLOR_BUFFER_BIT;
2627 3216
2628 glMatrixMode GL_PROJECTION; 3217 glMatrixMode GL_PROJECTION;
2629 glLoadIdentity; 3218 glLoadIdentity;
2630 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2631 glMatrixMode GL_MODELVIEW; 3220 glMatrixMode GL_MODELVIEW;
2632 glLoadIdentity; 3221 glLoadIdentity;
2633 3222
2634 $self->_draw; 3223 $self->_draw;
2635} 3224}
2636 3225
2637############################################################################# 3226#############################################################################
2638 3227
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; 3228package CFClient::UI;
2693 3229
2694$ROOT = new CFClient::UI::Root; 3230$ROOT = new CFClient::UI::Root;
2695$TOOLTIP = new CFClient::UI::Tooltip; 3231$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2696 3232
26971 32331
2698 3234

Diff Legend

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