ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.231 by root, Thu May 25 00:26:19 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 $self->focus_out;
239}
240
241sub hide {
242 my ($self) = @_;
243
244 $self->set_invisible;
186 245
187 $self->{parent}->remove ($self) 246 $self->{parent}->remove ($self)
188 if $self->{parent}; 247 if $self->{parent};
189} 248}
190 249
… …
232 $self->{y} = $y; 291 $self->{y} = $y;
233 $self->update; 292 $self->update;
234 } 293 }
235 294
236 if ($self->{w} != $w || $self->{h} != $h) { 295 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 296 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 297 }
243} 298}
244 299
245sub size_allocate { 300sub size_allocate {
246 # nothing to be done 301 # nothing to be done
247} 302}
248 303
304sub reconfigure {
305 my ($self) = @_;
306
307 $self->check_size (1);
308 $self->update;
309}
310
249sub children { 311sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 312}
261 313
262sub set_max_size { 314sub set_max_size {
263 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
264 316
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 317 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 318 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 319}
268 320
269# return top left coordinates 321sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 322 my ($self, $tooltip) = @_;
272 323
273 $self->{parent} 324 $self->{tooltip} = $tooltip;
274 or Carp::confess "no parent widget in _topleft\n";#d#
275 325
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 326 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner};
328 CFClient::UI::check_tooltip;
329 }
277} 330}
278 331
279# translate global coordinates to local coordinate system 332# translate global coordinates to local coordinate system
280sub coord2local { 333sub coord2local {
281 my ($self, $x, $y) = @_; 334 my ($self, $x, $y) = @_;
282 335
283 my ($X, $Y) = $self->_topleft; 336 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 337}
286 338
287# translate local coordinates to global coordinate system 339# translate local coordinates to global coordinate system
288sub coord2global { 340sub coord2global {
289 my ($self, $x, $y) = @_; 341 my ($self, $x, $y) = @_;
290 342
291 my ($X, $Y) = $self->_topleft; 343 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 344}
294 345
295sub focus_in { 346sub focus_in {
296 my ($self) = @_; 347 my ($self) = @_;
297 348
298 return if $FOCUS == $self; 349 return if $FOCUS == $self;
299 return unless $self->{can_focus}; 350 return unless $self->{can_focus};
300 351
301 my $focus = $FOCUS; $FOCUS = $self; 352 my $focus = $FOCUS; $FOCUS = $self;
302 353
303 $self->emit (focus_in => $focus); 354 $self->_emit (focus_in => $focus);
304 355
305 $focus->update if $focus; 356 $focus->update if $focus;
306 $FOCUS->update; 357 $FOCUS->update;
307} 358}
308 359
… …
311 362
312 return unless $FOCUS == $self; 363 return unless $FOCUS == $self;
313 364
314 my $focus = $FOCUS; undef $FOCUS; 365 my $focus = $FOCUS; undef $FOCUS;
315 366
316 $self->emit (focus_out => $focus); 367 $self->_emit (focus_out => $focus);
317 368
318 $focus->update if $focus; #? 369 $focus->update if $focus; #?
370
371 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
372 unless $FOCUS;
319} 373}
320 374
321sub mouse_motion { } 375sub mouse_motion { }
322sub button_up { } 376sub button_up { }
323sub key_down { } 377sub key_down { }
324sub key_up { } 378sub key_up { }
325 379
326sub button_down { 380sub button_down {
327 my ($self, $ev, $x, $y) = @_; 381 my ($self, $ev, $x, $y) = @_;
328 382
329 $self->focus_in; 383 $self->focus_in;
… …
369 glVertex $self->{w}, 0; 423 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h}; 424 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h}; 425 glVertex 0 , $self->{h};
372 glEnd; 426 glEnd;
373 glPopMatrix; 427 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 428 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 } 429 }
376} 430}
377 431
378sub _draw { 432sub _draw {
379 my ($self) = @_; 433 my ($self) = @_;
… …
395 449
396sub set_parent { 450sub set_parent {
397 my ($self, $parent) = @_; 451 my ($self, $parent) = @_;
398 452
399 Scalar::Util::weaken ($self->{parent} = $parent); 453 Scalar::Util::weaken ($self->{parent} = $parent);
454
455 # TODO: req_w _does_change after ->reconfigure
456 $self->check_size
457 unless exists $self->{req_w};
458
459 $self->show;
400} 460}
401 461
402sub check_size { 462sub check_size {
403 my ($self) = @_; 463 my ($self, $forced) = @_;
404 464
405 $self->{parent} 465 $self->{force_alloc} = 1 if $forced;
406 or return 1; 466 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 467}
427 468
428sub update { 469sub update {
429 my ($self) = @_; 470 my ($self) = @_;
430 471
… …
436 my ($self, $signal, $cb) = @_; 477 my ($self, $signal, $cb) = @_;
437 478
438 push @{ $self->{signal_cb}{$signal} }, $cb; 479 push @{ $self->{signal_cb}{$signal} }, $cb;
439} 480}
440 481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
441sub emit { 488sub emit {
442 my ($self, $signal, @args) = @_; 489 my ($self, $signal, @args) = @_;
443 490
444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
445} 493}
446 494
447sub DESTROY { 495sub DESTROY {
448 my ($self) = @_; 496 my ($self) = @_;
449 497
498 delete $WIDGET{$self+0};
450 #$self->deactivate; 499 #$self->deactivate;
451} 500}
452 501
453############################################################################# 502#############################################################################
454 503
… …
463 my $class = shift; 512 my $class = shift;
464 513
465 # range [value, low, high, page] 514 # range [value, low, high, page]
466 515
467 $class->SUPER::new ( 516 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 517 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 518 #active_bg => [1, 1, 1, 0.5],
470 @_ 519 @_
471 ) 520 )
472} 521}
473 522
474sub _draw { 523sub _draw {
475 my ($self) = @_; 524 my ($self) = @_;
476 525
526 my $color = $FOCUS == $self && $self->{active_bg}
527 ? $self->{active_bg}
528 : $self->{bg};
529
530 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 531 my ($w, $h) = @$self{qw(w h)};
478 532
479 glEnable GL_BLEND; 533 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 535 glColor @$color;
482 536
483 glBegin GL_QUADS; 537 glBegin GL_QUADS;
484 glVertex 0 , 0; 538 glVertex 0 , 0;
485 glVertex 0 , $h; 539 glVertex 0 , $h;
486 glVertex $w, $h; 540 glVertex $w, $h;
487 glVertex $w, 0; 541 glVertex $w, 0;
488 glEnd; 542 glEnd;
489 543
490 glDisable GL_BLEND; 544 glDisable GL_BLEND;
545 }
491} 546}
492 547
493############################################################################# 548#############################################################################
494 549
495package CFClient::UI::Empty; 550package CFClient::UI::Empty;
… …
527 582
528 $self 583 $self
529} 584}
530 585
531sub add { 586sub add {
532 my ($self, $child) = @_; 587 my ($self, @widgets) = @_;
533 588
534 $child->set_parent ($self); 589 $_->set_parent ($self)
590 for @widgets;
535 591
536 use sort 'stable'; 592 use sort 'stable';
537 593
538 $self->{children} = [ 594 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 595 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 596 @{$self->{children}}, @widgets
541 ]; 597 ];
542 598
543 $child->check_size; 599 $self->check_size (1);
600 $self->update;
544} 601}
545 602
546sub children { 603sub children {
547 @{ $_[0]{children} } 604 @{ $_[0]{children} }
548} 605}
… …
567 624
568 for (@$children) { 625 for (@$children) {
569 delete $_->{parent}; 626 delete $_->{parent};
570 $_->hide; 627 $_->hide;
571 } 628 }
629
630 $self->check_size;
631 $self->update;
572} 632}
573 633
574sub find_widget { 634sub find_widget {
575 my ($self, $x, $y) = @_; 635 my ($self, $x, $y) = @_;
576 636
… …
651} 711}
652 712
653sub update { 713sub update {
654 my ($self) = @_; 714 my ($self) = @_;
655 715
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 716 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 717 $self->SUPER::update;
658} 718}
659 719
660sub size_allocate { 720sub size_allocate {
661 my ($self, $w, $h) = @_; 721 my ($self, $w, $h) = @_;
662 722
663 $self->SUPER::size_allocate ($w, $h); 723 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 724 $self->update;
725}
726
727sub _render {
728 $_[0]{children}[0]->draw;
665} 729}
666 730
667sub render_child { 731sub render_child {
668 my ($self) = @_; 732 my ($self) = @_;
669 733
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 734 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 735 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 736 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 737
674# glColorMask 1, 1, 1, 0; 738 $self->_render;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
681 }; 739 };
682} 740}
683 741
684sub _draw { 742sub _draw {
685 my ($self) = @_; 743 my ($self) = @_;
… …
687 my ($w, $h) = ($self->w, $self->h); 745 my ($w, $h) = ($self->w, $self->h);
688 746
689 my $tex = $self->{texture} 747 my $tex = $self->{texture}
690 or return; 748 or return;
691 749
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 750 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 752 glColor 1, 1, 1, 1;
697 753
698 $tex->draw_quad (0, 0, $w, $h); 754 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 755
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 756 glDisable GL_TEXTURE_2D;
702} 757}
703 758
704############################################################################# 759#############################################################################
705 760
706package CFClient::UI::ViewPort; 761package CFClient::UI::ViewPort;
707 762
708our @ISA = CFClient::UI::Window::; 763our @ISA = CFClient::UI::Window::;
709 764
710sub new { die }
711
712sub size_request { 765sub size_request {
713 my ($self) = @_; 766 my ($self) = @_;
714 767
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717 769
718 @$self{qw(child_w child_h)} 770 @$self{qw(child_w child_h)}
719} 771}
720 772
721sub _draw { 773sub size_allocate {
722 my ($self) = @_; 774 my ($self, $w, $h) = @_;
723 775
724 $self->{children}[1]->draw; 776 my ($cw, $ch) = @$self{qw(child_w child_h)};
777# $w = $self->{w};
778 $self->child->configure (0, 0, $cw, $ch);
779 $self->update;
725} 780}
726 781
782sub set_offset {
783 my ($self, $x, $y) = @_;
784
785 $self->{view_x} = int $x;
786 $self->{view_y} = int $y;
787
788 $self->update;
789}
790
791# hmm, this does not work for topleft of $self... but we should not ask for that
792sub coord2local {
793 my ($self, $x, $y) = @_;
794
795 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
796}
797
798sub coord2global {
799 my ($self, $x, $y) = @_;
800
801 $x = List::Util::min $self->{w}, $x - $self->{view_x};
802 $y = List::Util::min $self->{h}, $y - $self->{view_y};
803
804 $self->SUPER::coord2global ($x, $y)
805}
806
807sub find_widget {
808 my ($self, $x, $y) = @_;
809
810 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
811 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
812 ) {
813 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
814 } else {
815 $self->CFClient::UI::Base::find_widget ($x, $y)
816 }
817}
818
819sub _render {
820 my ($self) = @_;
821
822 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
823
824 $self->SUPER::_render;
825}
727 826
728############################################################################# 827#############################################################################
729 828
730package CFClient::UI::Frame; 829package CFClient::UI::ScrolledWindow;
731 830
732our @ISA = CFClient::UI::Bin::; 831our @ISA = CFClient::UI::HBox::;
733
734use CFClient::OpenGL;
735 832
736sub new { 833sub new {
737 my $class = shift; 834 my $class = shift;
738 835
836 my $self;
837
838 my $slider = new CFClient::UI::Slider
839 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]);
843 },
844 ;
845
739 my $self = $class->SUPER::new ( 846 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 847 vp => (new CFClient::UI::ViewPort expand => 1),
741 border_bg => [1, 1, 1, 1], 848 slider => $slider,
742 border => 0.8,
743 @_ 849 @_,
744 ); 850 );
745 851
852 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp});
854 $self->add ($self->{slider});
855
746 $self 856 $self
747} 857}
748 858
859sub size_allocate {
860 my ($self, $w, $h) = @_;
861
862 $self->SUPER::size_allocate ($w, $h);
863
864 my $child = $self->{vp}->child;
865 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
866}
867
868#TODO# update range on size_allocate depending on child
869# update viewport offset on scroll
870
871#############################################################################
872
873package CFClient::UI::Frame;
874
875our @ISA = CFClient::UI::Bin::;
876
877use CFClient::OpenGL;
878
879sub new {
880 my $class = shift;
881
882 $class->SUPER::new (
883 bg => undef,
884 @_,
885 )
886}
887
749sub _draw { 888sub _draw {
750 my ($self) = @_; 889 my ($self) = @_;
751 890
752 my ($w, $h) = ($self->{w}, $self->{h}); 891 if ($self->{bg}) {
892 my ($w, $h) = @$self{qw(w h)};
753 893
754 glEnable GL_BLEND; 894 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 896 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 897
759# glBegin GL_QUADS; 898 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 899 glVertex 0 , 0;
762# glVertex 0 , $h; 900 glVertex 0 , $h;
763# glVertex $w, $h; 901 glVertex $w, $h;
764# glVertex $w, 0; 902 glVertex $w, 0;
765# glEnd; 903 glEnd;
766 904
767
768 $self->child->draw;
769 glDisable GL_BLEND; 905 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 906 }
907
908 $self->SUPER::_draw;
771} 909}
772 910
773############################################################################# 911#############################################################################
774 912
775package CFClient::UI::FancyFrame; 913package CFClient::UI::FancyFrame;
… …
786 my $class = shift; 924 my $class = shift;
787 925
788 # TODO: user_x, user_y, overwrite moveto? 926 # TODO: user_x, user_y, overwrite moveto?
789 927
790 my $self = $class->SUPER::new ( 928 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 929 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 930 border_bg => [1, 1, 1, 1],
793 border => 0.6, 931 border => 0.6,
932 is_toplevel => 1,
794 can_events => 1, 933 can_events => 1,
795 @_ 934 @_
796 ); 935 );
797 936
798 $self->{title} &&= new CFClient::UI::Label 937 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 938 align => 0,
… …
823 my ($self, $w, $h) = @_; 962 my ($self, $w, $h) = @_;
824 963
825 $h -= List::Util::max 0, $self->border * 2; 964 $h -= List::Util::max 0, $self->border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 965 $w -= List::Util::max 0, $self->border * 2;
827 966
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 967 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
829 if $self->{title}; 968 if $self->{title};
830 969
831 $self->child->configure ($self->border, $self->border, $w, $h); 970 $self->child->configure ($self->border, $self->border, $w, $h);
832} 971}
833 972
… …
891 my ($self) = @_; 1030 my ($self) = @_;
892 1031
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1032 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1033 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 1034
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1035 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1037
901 my $border = $self->border; 1038 my $border = $self->border;
902 1039
903 glColor @{ $self->{border_bg} }; 1040 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1041 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1042 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1043 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1044 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1045
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1046 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1047 my $bg = $tex[0];
911 1048
912 # TODO: repeat texture not scale 1049 # TODO: repeat texture not scale
… …
916 glColor @{ $self->{bg} }; 1053 glColor @{ $self->{bg} };
917 1054
918 $bg->{s} = $rep_x; 1055 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y; 1056 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1; 1057 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 1058 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059 }
922 1060
923 glDisable GL_TEXTURE_2D; 1061 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1062
927 $self->{title}->draw if $self->{title}; 1063 $self->{title}->draw if $self->{title};
928 1064
929 $self->child->draw; 1065 $self->child->draw;
930} 1066}
… …
1157} 1293}
1158 1294
1159sub size_allocate { 1295sub size_allocate {
1160 my ($self, $w, $h) = @_; 1296 my ($self, $w, $h) = @_;
1161 1297
1298 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1162 my $children = $self->{children}; 1300 my $children = $self->{children};
1163 1301
1164 my @h = map $_->{req_h}, @$children; 1302 my @h = map $_->{req_h}, @$children;
1165 1303
1166 my $req_h = List::Util::sum @h; 1304 my $req_h = List::Util::sum @h;
… …
1195 1333
1196############################################################################# 1334#############################################################################
1197 1335
1198package CFClient::UI::Label; 1336package CFClient::UI::Label;
1199 1337
1200our @ISA = CFClient::UI::Base::; 1338our @ISA = CFClient::UI::DrawBG::;
1201 1339
1202use CFClient::OpenGL; 1340use CFClient::OpenGL;
1203 1341
1204sub new { 1342sub new {
1205 my ($class, %arg) = @_; 1343 my ($class, %arg) = @_;
1206 1344
1207 my $self = $class->SUPER::new ( 1345 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1346 fg => [1, 1, 1],
1347 #bg => none
1348 #active_bg => none
1209 #font => default_font 1349 #font => default_font
1350 #text => initial text
1351 #markup => initial narkup
1352 #max_w => maximum pixel width
1353 ellipsise => 3, # end
1354 layout => (new CFClient::Layout),
1210 fontsize => 1, 1355 fontsize => 1,
1211 text => "",
1212 align => -1, 1356 align => -1,
1213 valign => -1, 1357 valign => -1,
1214 padding => 2, 1358 padding => 2,
1215 layout => new CFClient::Layout,
1216 can_events => 0, 1359 can_events => 0,
1217 %arg 1360 %arg
1218 ); 1361 );
1219 1362
1220 if (exists $self->{template}) { 1363 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1364 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1365 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1366 $self->{template} = $layout;
1224 } 1367 }
1225 1368
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1369 if (exists $self->{markup}) {
1227 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1370 $self->set_markup (delete $self->{markup});
1371 } else {
1372 $self->set_text (delete $self->{text});
1373 }
1228 1374
1229 $self 1375 $self
1230} 1376}
1231 1377
1232sub escape { 1378sub escape($) {
1233 local $_ = $_[1]; 1379 local $_ = $_[0];
1234 1380
1235 s/&/&amp;/g; 1381 s/&/&amp;/g;
1236 s/>/&gt;/g; 1382 s/>/&gt;/g;
1237 s/</&lt;/g; 1383 s/</&lt;/g;
1238 1384
1239 $_[1] 1385 $_
1240} 1386}
1241 1387
1242sub update { 1388sub update {
1243 my ($self) = @_; 1389 my ($self) = @_;
1244 1390
1245 delete $self->{texture}; 1391 delete $self->{texture};
1246 $self->SUPER::update; 1392 $self->SUPER::update;
1247} 1393}
1248 1394
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1395sub set_text {
1256 my ($self, $text) = @_; 1396 my ($self, $text) = @_;
1257 1397
1258 return if $self->{text} eq "T$text"; 1398 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1399 $self->{text} = "T$text";
1260 1400
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1402 $self->{layout}->set_text ($text);
1262 1403
1263 delete $self->{texture};
1264 $self->update; 1404 $self->update;
1265 $self->check_size; 1405 $self->check_size;
1266} 1406}
1267 1407
1268sub set_markup { 1408sub set_markup {
1269 my ($self, $markup) = @_; 1409 my ($self, $markup) = @_;
1270 1410
1271 return if $self->{text} eq "M$markup"; 1411 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1412 $self->{text} = "M$markup";
1273 1413
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415
1416 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1417 $self->{layout}->set_markup ($markup);
1275 1418
1276 delete $self->{texture};
1277 $self->update; 1419 $self->update;
1278 $self->check_size; 1420 $self->check_size;
1279} 1421}
1280 1422
1281sub size_request { 1423sub size_request {
1282 my ($self) = @_; 1424 my ($self) = @_;
1283 1425
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $self->{layout}->set_width ($self->{max_w} || -1); 1427 $self->{layout}->set_width ($self->{max_w} || -1);
1428 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1431
1288 my ($w, $h) = $self->{layout}->size; 1432 my ($w, $h) = $self->{layout}->size;
1289 1433
1290 if (exists $self->{template}) { 1434 if (exists $self->{template}) {
… …
1312sub set_fontsize { 1456sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1457 my ($self, $fontsize) = @_;
1314 1458
1315 $self->{fontsize} = $fontsize; 1459 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1460 delete $self->{texture};
1461
1462 $self->update;
1317 $self->check_size; 1463 $self->check_size;
1318 $self->update;
1319} 1464}
1320 1465
1321sub _draw { 1466sub _draw {
1322 my ($self) = @_; 1467 my ($self) = @_;
1323 1468
1469 $self->SUPER::_draw; # draw background, if applicable
1470
1324 my $tex = $self->{texture} ||= do { 1471 my $tex = $self->{texture} ||= do {
1472 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1473 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $self->{layout}->set_width ($self->{w}); 1474 $self->{layout}->set_width ($self->{w});
1475 $self->{layout}->set_ellipsise ($self->{ellipsise});
1476 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478
1328 new_from_layout CFClient::Texture $self->{layout} 1479 my $tex = new_from_layout CFClient::Texture $self->{layout};
1480
1481 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1482 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1483 : ($self->{w} - $tex->{w}) * 0.5);
1484
1485 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1486 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1487 : ($self->{h} - $tex->{h}) * 0.5);
1488
1489 $tex
1329 }; 1490 };
1330 1491
1331 glEnable GL_BLEND;
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333 glEnable GL_TEXTURE_2D; 1492 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1494
1495 if ($tex->{format} == GL_ALPHA) {
1336 glColor @{$self->{fg}}; 1496 glColor @{$self->{fg}};
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $tex->draw_quad ($self->{ox}, $self->{oy}); 1497 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1498 } else {
1499 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1500 }
1351 1501
1352 glDisable GL_TEXTURE_2D; 1502 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1503}
1355 1504
1356############################################################################# 1505#############################################################################
1357 1506
1358package CFClient::UI::EntryBase; 1507package CFClient::UI::EntryBase;
… …
1371 active_fg => [0, 0, 0], 1520 active_fg => [0, 0, 0],
1372 can_hover => 1, 1521 can_hover => 1,
1373 can_focus => 1, 1522 can_focus => 1,
1374 valign => 0, 1523 valign => 0,
1375 can_events => 1, 1524 can_events => 1,
1525 #text => ...
1376 @_ 1526 @_
1377 ) 1527 )
1378} 1528}
1379 1529
1380sub _set_text { 1530sub _set_text {
… …
1390 $self->{text} = $text; 1540 $self->{text} = $text;
1391 1541
1392 $text =~ s/./*/g if $self->{hidden}; 1542 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 1543 $self->{layout}->set_text ("$text ");
1394 1544
1395 $self->emit (changed => $self->{text}); 1545 $self->_emit (changed => $self->{text});
1396}
1397
1398sub get_text {
1399 $_[0]{text}
1400}
1401
1402sub size_request {
1403 my ($self) = @_;
1404
1405 my ($w, $h) = $self->SUPER::size_request;
1406
1407 ($w + 1, $h) # add 1 for cursor
1408}
1409
1410sub size_allocate {
1411 my ($self, $w, $h) = @_;
1412
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414} 1546}
1415 1547
1416sub set_text { 1548sub set_text {
1417 my ($self, $text) = @_; 1549 my ($self, $text) = @_;
1418 1550
1419 $self->{cursor} = length $text; 1551 $self->{cursor} = length $text;
1420 $self->_set_text ($text); 1552 $self->_set_text ($text);
1421 $self->update; 1553 $self->update;
1554 $self->check_size;
1555}
1556
1557sub get_text {
1558 $_[0]{text}
1559}
1560
1561sub size_request {
1562 my ($self) = @_;
1563
1564 my ($w, $h) = $self->SUPER::size_request;
1565
1566 ($w + 1, $h) # add 1 for cursor
1567}
1568
1569sub size_allocate {
1570 my ($self, $w, $h) = @_;
1571
1572 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1422} 1573}
1423 1574
1424sub key_down { 1575sub key_down {
1425 my ($self, $ev) = @_; 1576 my ($self, $ev) = @_;
1426 1577
… …
1428 my $sym = $ev->{sym}; 1579 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1580 my $uni = $ev->{unicode};
1430 1581
1431 my $text = $self->get_text; 1582 my $text = $self->get_text;
1432 1583
1433 if ($sym == 8) { 1584 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1585 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1586 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1587 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1588 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1589 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1590 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1591 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1592 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1593 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1594 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1595 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1596 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1597 $self->_emit ('escape');
1447 } elsif ($uni) { 1598 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1599 substr $text, $self->{cursor}++, 0, chr $uni;
1449 } 1600 }
1450 1601
1451 $self->_set_text ($text); 1602 $self->_set_text ($text);
1452 $self->update; 1603 $self->update;
1604 $self->check_size;
1453} 1605}
1454 1606
1455sub focus_in { 1607sub focus_in {
1456 my ($self) = @_; 1608 my ($self) = @_;
1457 1609
… …
1537 if ($sym == 13) { 1689 if ($sym == 13) {
1538 unshift @{$self->{history}}, 1690 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 1691 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1; 1692 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 1693 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 1694 $self->_emit (activate => $txt);
1543 $self->update; 1695 $self->update;
1544 1696
1545 } elsif ($sym == CFClient::SDLK_UP) { 1697 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 1698 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 1699 $self->{history_saveback} = $self->get_text;
… …
1586 my $class = shift; 1738 my $class = shift;
1587 1739
1588 $class->SUPER::new ( 1740 $class->SUPER::new (
1589 padding => 4, 1741 padding => 4,
1590 fg => [1, 1, 1], 1742 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 1743 active_fg => [0, 0, 1],
1593 can_hover => 1, 1744 can_hover => 1,
1594 align => 0, 1745 align => 0,
1595 valign => 0, 1746 valign => 0,
1596 can_events => 1, 1747 can_events => 1,
1597 @_ 1748 @_
1598 ) 1749 )
1599} 1750}
1600 1751
1752sub activate { }
1753
1601sub button_up { 1754sub button_up {
1602 my ($self, $ev, $x, $y) = @_; 1755 my ($self, $ev, $x, $y) = @_;
1603 1756
1757 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 1758 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 1759 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate");
1607 }
1608} 1760}
1609 1761
1610sub _draw { 1762sub _draw {
1611 my ($self) = @_; 1763 my ($self) = @_;
1612 1764
… …
1614 1766
1615 if ($GRAB == $self) { 1767 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg}; 1768 $self->{fg} = $self->{active_fg};
1617 } 1769 }
1618 1770
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1771 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1773 glColor 0, 0, 0, 1;
1624 1774
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1775 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1776
1627 glDisable GL_TEXTURE_2D; 1777 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1778
1630 $self->SUPER::_draw; 1779 $self->SUPER::_draw;
1631} 1780}
1632 1781
1633############################################################################# 1782#############################################################################
… …
1647 1796
1648 $class->SUPER::new ( 1797 $class->SUPER::new (
1649 padding => 2, 1798 padding => 2,
1650 fg => [1, 1, 1], 1799 fg => [1, 1, 1],
1651 active_fg => [1, 1, 0], 1800 active_fg => [1, 1, 0],
1801 bg => [0, 0, 0, 0.2],
1802 active_bg => [1, 1, 1, 0.5],
1652 state => 0, 1803 state => 0,
1653 can_hover => 1, 1804 can_hover => 1,
1654 @_ 1805 @_
1655 ) 1806 )
1656} 1807}
… …
1665 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1666 1817
1667 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1668 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1669 $self->{state} = !$self->{state}; 1820 $self->{state} = !$self->{state};
1670 $self->emit (changed => $self->{state}); 1821 $self->_emit (changed => $self->{state});
1671 } 1822 }
1672} 1823}
1673 1824
1674sub _draw { 1825sub _draw {
1675 my ($self) = @_; 1826 my ($self) = @_;
… …
1680 1831
1681 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1832 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1682 1833
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1834 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1835
1685 glEnable GL_BLEND; 1836 my $tex = $self->{state} ? $tex[1] : $tex[0];
1837
1686 glEnable GL_TEXTURE_2D; 1838 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1839 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1841}
1696 1842
1697############################################################################# 1843#############################################################################
1698 1844
1699package CFClient::UI::Image; 1845package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 1888 glTranslate 0, -$self->{w}, 0;
1743 1889
1744 ($w, $h) = ($h, $w); 1890 ($w, $h) = ($h, $w);
1745 } 1891 }
1746 1892
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 1893 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 1895
1752 $tex->draw_quad (0, 0, $w, $h); 1896 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 1897
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 1898 glDisable GL_TEXTURE_2D;
1756} 1899}
1757 1900
1758############################################################################# 1901#############################################################################
1759 1902
… …
1948 qw(s1_slider.png s1_slider_bg.png); 2091 qw(s1_slider.png s1_slider_bg.png);
1949 2092
1950sub new { 2093sub new {
1951 my $class = shift; 2094 my $class = shift;
1952 2095
1953 # range [value, low, high, page] 2096 # range [value, low, high, page, unit]
1954 2097
1955 # TODO: 0-width page 2098 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2099 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2100 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2101 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2102 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
2104 bg => [0, 0, 0, 0.2],
2105 active_bg => [1, 1, 1, 0.5],
1961 range => [0, 0, 100, 10], 2106 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2107 req_w => $::WIDTH / 80,
1963 req_h => 20, 2108 req_h => $::WIDTH / 80,
1964 vertical => 0, 2109 vertical => 0,
1965 can_hover => 1, 2110 can_hover => 1,
1966 inner_pad => 5, 2111 inner_pad => 0.02,
1967 @_ 2112 @_
1968 ); 2113 );
1969 2114
2115 $self->set_value ($self->{range}[0]);
2116 $self->update;
2117
1970 $self 2118 $self
2119}
2120
2121sub set_range {
2122 my ($self, $range) = @_;
2123
2124 $self->{range} = $range;
2125
2126 $self->update;
2127}
2128
2129sub set_value {
2130 my ($self, $value) = @_;
2131
2132 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2133
2134 $hi = $lo + 1 if $hi <= $lo;
2135
2136 $page = $hi - $lo if $page > $hi - $lo;
2137
2138 $value = $lo if $value < $lo;
2139 $value = $hi - $page if $value > $hi - $page;
2140
2141 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2142 if $unit;
2143
2144 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2145
2146 if ($value != $old_value) {
2147 $self->_emit (changed => $value);
2148 $self->update;
2149 }
1971} 2150}
1972 2151
1973sub size_request { 2152sub size_request {
1974 my ($self) = @_; 2153 my ($self) = @_;
1975 2154
… …
1981 2160
1982sub button_down { 2161sub button_down {
1983 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
1984 2163
1985 $self->SUPER::button_down ($ev, $x, $y); 2164 $self->SUPER::button_down ($ev, $x, $y);
2165
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167
1986 $self->mouse_motion ($ev, $x, $y); 2168 $self->mouse_motion ($ev, $x, $y);
1987} 2169}
1988 2170
1989sub mouse_motion { 2171sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2172 my ($self, $ev, $x, $y) = @_;
1991 2173
1992 if ($GRAB == $self) { 2174 if ($GRAB == $self) {
2175 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2176
2177 my (undef, $lo, $hi, $page) = @{$self->{range}};
2178
2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2180
2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2182 }
2183}
2184
2185sub update {
2186 my ($self) = @_;
2187
2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2189 $self->set_value ($self->{range}[0]);
2190
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2191 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100;
1994 2193
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2194 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2195
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2196 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2197 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2198
2000 $x -= $inner_pad_px; # substract the padding 2199 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2200 $value = $value * $self->{scale} + $self->{offset};
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2201
2006 $self->emit (changed => $x); 2202 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2203 $self->{knob_w} = $knob_w;
2008 } 2204 });
2009}
2010 2205
2011# the inner_* stuff is for generating a padding for the slider handle, 2206 $self->SUPER::update;
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017} 2207}
2018 2208
2019sub _draw { 2209sub _draw {
2020 my ($self) = @_; 2210 my ($self) = @_;
2021 2211
2022 $self->SUPER::_draw (); 2212 $self->SUPER::_draw ();
2023 2213
2024 my ($w, $h) = @$self{qw(w h)}; 2214 glScale $self->{w}, $self->{h};
2025 2215
2026 if ($self->{vertical}) { 2216 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2217 # draw a vertical slider like a rotated horizontal slider
2028 2218
2219 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2220 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2221 }
2034 2222
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2223 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2224 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2225
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2226 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2227 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2228
2061 # draw background 2229 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2230 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2231
2064 # draw handle 2232 # draw handle
2065 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2233 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2066 2234
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2235 glDisable GL_TEXTURE_2D;
2069} 2236}
2237
2238#############################################################################
2239
2240package CFClient::UI::ValSlider;
2241
2242our @ISA = CFClient::UI::HBox::;
2243
2244sub new {
2245 my ($class, %arg) = @_;
2246
2247 my $range = delete $arg{range};
2248
2249 my $self = $class->SUPER::new (
2250 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2251 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2252 to_value => sub { shift },
2253 from_value => sub { shift },
2254 %arg,
2255 );
2256
2257 $self->{slider}->connect (changed => sub {
2258 my ($self, $value) = @_;
2259 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2260 $self->{parent}->emit (changed => $value);
2261 });
2262
2263# $self->{entry}->connect (changed => sub {
2264# my ($self, $value) = @_;
2265# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2266# $self->{parent}->emit (changed => $value);
2267# });
2268
2269 $self->add ($self->{slider}, $self->{entry});
2270
2271 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2272
2273 $self
2274}
2275
2276sub set_range { shift->{slider}->set_range (@_) }
2277sub set_value { shift->{slider}->set_value (@_) }
2070 2278
2071############################################################################# 2279#############################################################################
2072 2280
2073package CFClient::UI::TextView; 2281package CFClient::UI::TextView;
2074 2282
… …
2083 fontsize => 1, 2291 fontsize => 1,
2084 can_events => 0, 2292 can_events => 0,
2085 #font => default_font 2293 #font => default_font
2086 @_, 2294 @_,
2087 2295
2088 layout => (new CFClient::Layout), 2296 layout => (new CFClient::Layout 1),
2089 par => [], 2297 par => [],
2090 height => 0, 2298 height => 0,
2091 children => [ 2299 children => [
2092 (new CFClient::UI::Empty expand => 1), 2300 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2301 (new CFClient::UI::Slider vertical => 1),
… …
2104 2312
2105 $self->{fontsize} = $fontsize; 2313 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2314 $self->reflow;
2107} 2315}
2108 2316
2109sub text_height {
2110 my ($self, $text) = @_;
2111
2112 my $layout = $self->{layout};
2113
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text);
2117
2118 ($layout->size)[1]
2119}
2120
2121sub reflow {
2122 my ($self) = @_;
2123
2124 $self->{need_reflow}++;
2125 $self->update;
2126}
2127
2128sub size_allocate { 2317sub size_allocate {
2129 my ($self, $w, $h) = @_; 2318 my ($self, $w, $h) = @_;
2130 2319
2131 $self->SUPER::size_allocate ($w, $h); 2320 $self->SUPER::size_allocate ($w, $h);
2132 2321
… …
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 2324 $self->{layout}->set_width ($self->{children}[0]{w});
2136 2325
2137 $self->reflow; 2326 $self->reflow;
2138} 2327}
2139 2328
2329sub text_size {
2330 my ($self, $text, $indent) = @_;
2331
2332 my $layout = $self->{layout};
2333
2334 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2335 $layout->set_width ($self->{children}[0]{w} - $indent);
2336 $layout->set_markup ($text);
2337
2338 $layout->size
2339}
2340
2341sub reflow {
2342 my ($self) = @_;
2343
2344 $self->{need_reflow}++;
2345 $self->update;
2346}
2347
2348sub set_offset {
2349 my ($self, $offset) = @_;
2350
2351 # todo: base offset on lines or so, not on pixels
2352 $self->{children}[1]->set_value ($offset);
2353}
2354
2355sub clear {
2356 my ($self) = @_;
2357
2358 $self->{par} = [];
2359 $self->{height} = 0;
2360 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2361}
2362
2140sub add_paragraph { 2363sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2364 my ($self, $color, $text, $indent) = @_;
2142 2365
2143 #TODO: intelligently "reformat" paragraph 2366 for my $line (split /\n/, $text) {
2144 2367 my ($w, $h) = $self->text_size ($line);
2145 my $height = $self->text_height ($text);
2146
2147 $self->{height} += $height; 2368 $self->{height} += $h;
2369 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2370 }
2148 2371
2149 push @{$self->{par}}, [$height, $color, $text];
2150
2151 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2372 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2152 $self->{children}[1]->update;
2153} 2373}
2154 2374
2155sub update { 2375sub update {
2156 my ($self) = @_; 2376 my ($self) = @_;
2157 2377
… …
2159 2379
2160 return unless $self->{h} > 0; 2380 return unless $self->{h} > 0;
2161 2381
2162 delete $self->{texture}; 2382 delete $self->{texture};
2163 2383
2164 $ROOT->on_refresh ($self, sub { 2384 $ROOT->on_post_alloc ($self, sub {
2385 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2386
2165 if (delete $self->{need_reflow}) { 2387 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2388 my $height = 0;
2167 2389
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2390 my $layout = $self->{layout};
2391
2392 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2393
2169 for @{$self->{par}}; 2394 for (@{$self->{par}}) {
2395 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2396 $layout->set_width ($W - $_->[3]);
2397 $layout->set_markup ($_->[4]);
2398 my ($w, $h) = $layout->size;
2399 $_->[0] = $w + $_->[3];
2400 $_->[1] = $h;
2401 }
2402
2403 $height += $_->[1];
2404 }
2170 2405
2171 $self->{height} = $height; 2406 $self->{height} = $height;
2172 2407
2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2408 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174 2409
2175 delete $self->{texture}; 2410 delete $self->{texture};
2176 } 2411 }
2177 2412
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2413 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2179 glClearColor 0, 0, 0, 0; 2414 glClearColor 0.5, 0.5, 0.5, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2415 glClear GL_COLOR_BUFFER_BIT;
2181 2416
2417 my $top = int $self->{children}[1]{range}[0];
2418
2419 my $y0 = $top;
2420 my $y1 = $top + $H;
2421
2422 my $y = 0;
2423
2424 my $layout = $self->{layout};
2425
2426 $layout->set_font ($self->{font}) if $self->{font};
2427
2182 glEnable GL_BLEND; 2428 glEnable GL_BLEND;
2429 #TODO# not correct in windows where rgba is forced off
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2430 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187 my $top = int $self->{children}[1]{range}[0];
2188
2189 my $y0 = $top;
2190 my $y1 = $top + $self->{h};
2191
2192 my $y = 0;
2193
2194 my $layout = $self->{layout};
2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197 2431
2198 for my $par (@{$self->{par}}) { 2432 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2433 my $h = $par->[1];
2200 2434
2201 if ($y0 < $y + $h && $y < $y1) { 2435 if ($y0 < $y + $h && $y < $y1) {
2436 $layout->set_foreground (@{ $par->[2] });
2437 $layout->set_width ($W - $par->[3]);
2202 $layout->set_text ($par->[2]); 2438 $layout->set_markup ($par->[4]);
2203 2439
2204 glColor @{ $par->[1] }; 2440 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205 my ($W, $H) = $layout->size; 2441
2206 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2442 glRasterPos $par->[3], $y - $y0;
2443 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2207 } 2444 }
2208 2445
2209 $y += $h; 2446 $y += $h;
2210 } 2447 }
2211 2448
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND; 2449 glDisable GL_BLEND;
2214 }; 2450 };
2215 }); 2451 });
2216} 2452}
2217 2453
2218sub _draw { 2454sub _draw {
2219 my ($self) = @_; 2455 my ($self) = @_;
2220 2456
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2457 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2459 glColor 1, 1, 1, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2460 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2461 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2462
2230 $self->{children}[1]->draw; 2463 $self->{children}[1]->draw;
2231 2464
2232} 2465}
2233 2466
… …
2301 2534
2302 # TODO: use animation 2535 # TODO: use animation
2303 if ($self->{state} = !$self->{state}) { 2536 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other}); 2537 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h})); 2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open"); 2539 $self->_emit ("open");
2307 } else { 2540 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other}); 2541 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close"); 2542 $self->_emit ("close");
2310 } 2543 }
2311 2544
2312 $self->emit (changed => $self->{state}); 2545 $self->_emit (changed => $self->{state});
2313} 2546}
2314 2547
2315############################################################################# 2548#############################################################################
2316 2549
2317package CFClient::UI::Tooltip; 2550package CFClient::UI::Tooltip;
… …
2327 @_, 2560 @_,
2328 can_events => 0, 2561 can_events => 0,
2329 ) 2562 )
2330} 2563}
2331 2564
2332sub set_markup { 2565sub set_tooltip_from {
2333 my ($self, $text) = @_; 2566 my ($self, $widget) = @_;
2334 2567
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2568 $self->add (new CFClient::UI::Label
2336 $self->{label}->set_markup ($text); 2569 markup => $widget->{tooltip},
2337 $self->add ($self->{label}); 2570 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571 fontsize => 0.8,
2572 fg => [0, 0, 0, 1],
2573 ellipsise => 0,
2574 font => ($widget->{tooltip_font} || $::FONT_PROP),
2575 );
2338} 2576}
2339 2577
2340sub size_request { 2578sub size_request {
2341 my ($self) = @_; 2579 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2580
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2581 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2582
2347 ($w + 4, $h + 4) 2583 ($w + 4, $h + 4)
2348} 2584}
… …
2354} 2590}
2355 2591
2356sub _draw { 2592sub _draw {
2357 my ($self) = @_; 2593 my ($self) = @_;
2358 2594
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2595 glTranslate 0.375, 0.375;
2361 2596
2362 my ($w, $h) = @$self{qw(w h)}; 2597 my ($w, $h) = @$self{qw(w h)};
2363 2598
2364 glColor 1, 0.8, 0.4; 2599 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2610 glVertex 0 , $h;
2376 glVertex $w, $h; 2611 glVertex $w, $h;
2377 glVertex $w, 0; 2612 glVertex $w, 0;
2378 glEnd; 2613 glEnd;
2379 2614
2380 glPopMatrix; 2615 glTranslate 2 - 0.375, 2 - 0.375;
2381
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2616 $self->SUPER::_draw;
2384} 2617}
2385 2618
2386############################################################################# 2619#############################################################################
2387 2620
… …
2392use CFClient::OpenGL; 2625use CFClient::OpenGL;
2393 2626
2394sub new { 2627sub new {
2395 my $class = shift; 2628 my $class = shift;
2396 2629
2397 $class->SUPER::new ( 2630 my $self = $class->SUPER::new (
2398 aspect => 1, 2631 aspect => 1,
2399 @_, 2632 @_,
2400 ) 2633 );
2634
2635 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self);
2637
2638 $self->{timer} = Event->timer (
2639 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2640 hard => 1,
2641 interval => $self->{animspeed},
2642 cb => sub {
2643 ++$widget->{frame};
2644 $widget->update;
2645 },
2646 );
2647 }
2648
2649 $self
2401} 2650}
2402 2651
2403sub size_request { 2652sub size_request {
2404 (32, 8) 2653 (32, 8)
2405} 2654}
2406 2655
2656sub update {
2657 my ($self) = @_;
2658
2659 return unless $self->{visible};
2660
2661 $self->SUPER::update;
2662}
2663
2407sub _draw { 2664sub _draw {
2408 my ($self) = @_; 2665 my ($self) = @_;
2409 2666
2667 return unless $::CONN;
2668
2669 my $face;
2670
2671 if ($self->{frame}) {
2672 my $anim = $::CONN->{anim}[$self->{anim}];
2673
2674 $face = $anim->[ $self->{frame} % @$anim ]
2675 if $anim && @$anim;
2676 }
2677
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2678 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2679
2412 # TODO animation
2413 if ($tex) { 2680 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2681 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2683 glColor 1, 1, 1, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2684 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2685 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 } 2686 }
2687}
2688
2689sub DESTROY {
2690 my ($self) = @_;
2691
2692 $self->{timer}->cancel
2693 if $self->{timer};
2694
2695 $self->SUPER::DESTROY;
2696}
2697
2698#############################################################################
2699
2700package CFClient::UI::InventoryItem;
2701
2702our @ISA = CFClient::UI::HBox::;
2703
2704sub _item_to_desc {
2705 my ($item) = @_;
2706
2707 my $desc =
2708 $item->{nrof} < 2
2709 ? $item->{name}
2710 : "$item->{nrof} × $item->{name_pl}";
2711
2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2713 and $desc .= " (open)";
2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2715 and $desc .= " (applied)";
2716 $item->{flags} & Crossfire::Protocol::F_UNPAID
2717 and $desc .= " (unpaid)";
2718 $item->{flags} & Crossfire::Protocol::F_MAGIC
2719 and $desc .= " (magic)";
2720 $item->{flags} & Crossfire::Protocol::F_CURSED
2721 and $desc .= " (cursed)";
2722 $item->{flags} & Crossfire::Protocol::F_DAMNED
2723 and $desc .= " (damned)";
2724 $item->{flags} & Crossfire::Protocol::F_LOCKED
2725 and $desc .= " *";
2726
2727 $desc
2728}
2729
2730sub new {
2731 my $class = shift;
2732
2733 my %args = @_;
2734
2735 my $item = delete $args{item};
2736
2737 my $desc = _item_to_desc ($item);
2738
2739 my $self = $class->SUPER::new (
2740 can_hover => 1,
2741 can_events => 1,
2742 tooltip => ((CFClient::UI::Label::escape $desc)
2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744 connect_button_down => sub {
2745 my ($self, $ev, $x, $y) = @_;
2746
2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749 my $targ = $::CONN->{player}{tag};
2750
2751 if ($item->{container} == $::CONN->{player}{tag}) {
2752 $targ = $main::OPENCONT;
2753 }
2754
2755 $::CONN->send ("move $targ $item->{tag} 0");
2756 } elsif ($ev->{button} == 1) {
2757 $::CONN->send ("examine $item->{tag}");
2758 } elsif ($ev->{button} == 2) {
2759 $::CONN->send ("apply $item->{tag}");
2760 } elsif ($ev->{button} == 3) {
2761 my @menu_items = (
2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773 )
2774 ),
2775 );
2776
2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778 }
2779
2780 1
2781 },
2782 %args
2783 );
2784
2785
2786 $self->add (new CFClient::UI::Face
2787 can_events => 0,
2788 face => $item->{face},
2789 anim => $item->{anim},
2790 animspeed => $item->{animspeed},
2791 );
2792
2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795 $self->{item} = $item;
2796
2797 $self->update_item;
2798
2799 $self
2800}
2801
2802sub update_item {
2803 my ($self) = @_;
2804
2805 my $desc = _item_to_desc ($self->{item});
2806
2807 $self->{name_lbl}->set_text ($desc);
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Inventory;
2813
2814our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816sub new {
2817 my $class = shift;
2818
2819 my $self = $class->SUPER::new (
2820 scrolled => (new CFClient::UI::Table),
2821 @_,
2822 );
2823
2824 $self
2825}
2826
2827sub set_items {
2828 my ($self, $items) = @_;
2829
2830 $self->{scrolled}->clear;
2831 return unless $items;
2832
2833 my @items = sort {
2834 ($a->{type} <=> $b->{type})
2835 or ($a->{name} cmp $b->{name})
2836 } @$items;
2837
2838 $self->{real_items} = \@items;
2839
2840 for my $item (@items) {
2841 $item->{item} = $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845
2846 my $i = 0;
2847 for (@items) {
2848 $self->{scrolled}->add (0, $i, $_);
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851 }
2852
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2854}
2855
2856sub size_request {
2857 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h});
2423} 2859}
2424 2860
2425############################################################################# 2861#############################################################################
2426 2862
2427package CFClient::UI::Menu; 2863package CFClient::UI::Menu;
… …
2462 2898
2463# popup given the event (must be a mouse button down event currently) 2899# popup given the event (must be a mouse button down event currently)
2464sub popup { 2900sub popup {
2465 my ($self, $ev) = @_; 2901 my ($self, $ev) = @_;
2466 2902
2467 $self->emit ("popdown"); 2903 $self->_emit ("popdown");
2468 2904
2469 # maybe save $GRAB? must be careful about events... 2905 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self; 2906 $GRAB = $self;
2471 $self->{button} = $ev->{button}; 2907 $self->{button} = $ev->{button};
2472 2908
… …
2475} 2911}
2476 2912
2477sub mouse_motion { 2913sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2914 my ($self, $ev, $x, $y) = @_;
2479 2915
2480 # TODO: should use vbox->fdind_widget or so 2916 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2917 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2918 $self->{hover} = $self->{item}{$HOVER};
2483} 2919}
2484 2920
2485sub button_up { 2921sub button_up {
… …
2487 2923
2488 if ($ev->{button} == $self->{button}) { 2924 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB; 2925 undef $GRAB;
2490 $self->hide; 2926 $self->hide;
2491 2927
2492 $self->emit ("popdown"); 2928 $self->_emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover}; 2929 $self->{hover}[1]->() if $self->{hover};
2494 } 2930 }
2495} 2931}
2496 2932
2497############################################################################# 2933#############################################################################
2498 2934
2935package CFClient::UI::Statusbox;
2936
2937our @ISA = CFClient::UI::VBox::;
2938
2939sub new {
2940 my $class = shift;
2941
2942 $class->SUPER::new (
2943 fontsize => 0.8,
2944 @_,
2945 )
2946}
2947
2948sub reorder {
2949 my ($self) = @_;
2950 my $NOW = time;
2951
2952 while (my ($k, $v) = each %{ $self->{item} }) {
2953 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2954 }
2955
2956 my @widgets;
2957
2958 my @items = sort {
2959 $a->{pri} <=> $b->{pri}
2960 or $b->{id} <=> $a->{id}
2961 } values %{ $self->{item} };
2962
2963 my $count = 10 + 1;
2964 for my $item (@items) {
2965 last unless --$count;
2966
2967 push @widgets, $item->{label} ||= do {
2968 # TODO: doesn't handle markup well (read as: at all)
2969 my $short = $item->{count} > 1
2970 ? "<b>$item->{count} ×</b> $item->{text}"
2971 : $item->{text};
2972
2973 for ($short) {
2974 s/^\s+//;
2975 s/\s+/ /g;
2976 }
2977
2978 new CFClient::UI::Label
2979 markup => $short,
2980 tooltip => $item->{tooltip},
2981 tooltip_font => $::FONT_PROP,
2982 tooltip_width => 0.67,
2983 fontsize => $item->{fontsize} || $self->{fontsize},
2984 max_w => $::WIDTH * 0.44,
2985 fg => $item->{fg},
2986 can_events => 1,
2987 can_hover => 1
2988 };
2989 }
2990
2991 $self->clear;
2992 $self->SUPER::add (reverse @widgets);
2993}
2994
2995sub add {
2996 my ($self, $text, %arg) = @_;
2997
2998 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//;
3000
3001 my $timeout = time + ((delete $arg{timeout}) || 60);
3002
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004
3005 if (my $item = $self->{item}{$group}) {
3006 if ($item->{text} eq $text) {
3007 $item->{count}++;
3008 } else {
3009 $item->{count} = 1;
3010 $item->{text} = $item->{tooltip} = $text;
3011 }
3012 $item->{id} = ++$self->{id};
3013 $item->{timeout} = $timeout;
3014 delete $item->{label};
3015 } else {
3016 $self->{item}{$group} = {
3017 id => ++$self->{id},
3018 text => $text,
3019 timeout => $timeout,
3020 tooltip => $text,
3021 fg => [0.8, 0.8, 0.8, 0.8],
3022 pri => 0,
3023 count => 1,
3024 %arg,
3025 };
3026 }
3027
3028 $self->reorder;
3029}
3030
3031sub reconfigure {
3032 my ($self) = @_;
3033
3034 delete $_->{label}
3035 for values %{ $self->{item} || {} };
3036
3037 $self->reorder;
3038 $self->SUPER::reconfigure;
3039}
3040
3041#############################################################################
3042
2499package CFClient::UI::Root; 3043package CFClient::UI::Root;
2500 3044
2501our @ISA = CFClient::UI::Container::; 3045our @ISA = CFClient::UI::Container::;
2502 3046
2503use CFClient::OpenGL; 3047use CFClient::OpenGL;
2504 3048
2505sub check_size { 3049sub new {
2506 my ($self) = @_; 3050 my $class = shift;
2507 3051
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3052 $class->SUPER::new (
2509} 3053 @_,
2510 3054 )
2511sub size_request {
2512 ($::WIDTH, $::HEIGHT)
2513} 3055}
2514 3056
2515sub configure { 3057sub configure {
2516 my ($self, $x, $y, $w, $h) = @_; 3058 my ($self, $x, $y, $w, $h) = @_;
2517 3059
2518 $self->SUPER::configure ($x, $y, $w, $h); 3060 $self->{w} = $w;
3061 $self->{h} = $h;
3062}
2519 3063
3064sub check_size {
3065 my ($self) = @_;
3066
3067 $self->size_allocate ($self->{w}, $self->{h})
3068 if $self->{w};
3069}
3070
3071sub size_request {
3072 my ($self) = @_;
3073
3074 ($self->{w}, $self->{h})
3075}
3076
3077sub size_allocate {
3078 my ($self, $w, $h) = @_;
3079
2520 for my $child (@{$self->{children}}) { 3080 for my $child ($self->children) {
2521 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522 3082
3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3084 if exists $child->{req_x};
3085
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3087 if exists $child->{req_y};
3088
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3089 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2524 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3090 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3091
2525 $child->configure ($X, $Y, $W,$H); 3092 $child->configure ($X, $Y, $W, $H);
2526 } 3093 }
2527} 3094}
2528 3095
2529sub _topleft { 3096sub coord2local {
2530 my ($self, $x, $y) = @_; 3097 my ($self, $x, $y) = @_;
2531 3098
2532 ($x, $y) 3099 ($x, $y)
2533} 3100}
2534 3101
3102sub coord2global {
3103 my ($self, $x, $y) = @_;
3104
3105 ($x, $y)
3106}
3107
2535sub update { 3108sub update {
2536 my ($self) = @_; 3109 my ($self) = @_;
2537 3110
2538 $self->check_size; 3111 $self->check_size;
2539 ::refresh (); 3112 $::WANT_REFRESH++;
2540} 3113}
2541 3114
2542sub add { 3115sub add {
2543 my ($self, $child) = @_; 3116 my ($self, @children) = @_;
2544 3117
3118 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children;
3120 $w->{root} = $self;
3121 $w->{visible} = 1;
3122 }
3123
3124 for my $child (@children) {
3125 $child->{is_toplevel} = 1;
3126
2545 # integerize window positions 3127 # integerise window positions
2546 $child->{x} = int $child->{x}; 3128 $child->{x} = int $child->{x};
2547 $child->{y} = int $child->{y}; 3129 $child->{y} = int $child->{y};
3130 }
2548 3131
2549 $self->SUPER::add ($child); 3132 $self->SUPER::add (@children);
3133}
3134
3135sub remove {
3136 my ($self, @children) = @_;
3137
3138 $self->SUPER::remove (@children);
3139
3140 while (@children) {
3141 my $w = pop @children;
3142 push @children, $w->children;
3143 $w->set_invisible;
3144 }
2550} 3145}
2551 3146
2552sub on_refresh { 3147sub on_refresh {
2553 my ($self, $id, $cb) = @_; 3148 my ($self, $id, $cb) = @_;
2554 3149
2555 $self->{refresh_hook}{$id} = $cb; 3150 $self->{refresh_hook}{$id} = $cb;
2556} 3151}
2557 3152
3153sub on_post_alloc {
3154 my ($self, $id, $cb) = @_;
3155
3156 $self->{post_alloc_hook}{$id} = $cb;
3157}
3158
2558sub draw { 3159sub draw {
2559 my ($self) = @_; 3160 my ($self) = @_;
2560 3161
2561 while (my $rcb = delete $self->{refresh_hook}) { 3162 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 3163 $_->()
3164 for values %{delete $self->{refresh_hook}};
3165 }
3166
3167 if ($self->{check_size}) {
3168 my @queue = ([], []);
3169
3170 for (;;) {
3171 if ($self->{check_size}) {
3172 # heuristic: check containers last
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3174 for values %{delete $self->{check_size}}
3175 }
3176
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3178
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3180 ? @$widget{qw(user_w user_h)}
3181 : $widget->size_request;
3182
3183 if (delete $widget->{force_alloc}
3184 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3185 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3186
3187 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h;
3189
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3191
3192 $widget->{parent}->check_size
3193 if $widget->{parent};
3194 }
3195 }
3196 }
3197
3198 while ($self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) {
3200 my ($widget, $w, $h) = @$_;
3201
3202 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0;
3204
3205 $widget->{w} = $w;
3206 $widget->{h} = $h;
3207 $widget->emit (size_allocate => $w, $h);
3208 }
3209 }
3210
3211 while ($self->{post_alloc_hook}) {
3212 $_->()
3213 for values %{delete $self->{post_alloc_hook}};
2563 } 3214 }
2564 3215
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3216 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 3218 glClear GL_COLOR_BUFFER_BIT;
2568 3219
2569 glMatrixMode GL_PROJECTION; 3220 glMatrixMode GL_PROJECTION;
2570 glLoadIdentity; 3221 glLoadIdentity;
2571 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572 glMatrixMode GL_MODELVIEW; 3223 glMatrixMode GL_MODELVIEW;
2573 glLoadIdentity; 3224 glLoadIdentity;
2574 3225
2575 $self->_draw; 3226 $self->_draw;
2576} 3227}
2577 3228
2578############################################################################# 3229#############################################################################
2579 3230
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 }
2682}
2683
2684
2685#############################################################################
2686
2687package CFClient::UI; 3231package CFClient::UI;
2688 3232
2689$ROOT = new CFClient::UI::Root; 3233$ROOT = new CFClient::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 3234$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2691 3235
26921 32361
2693 3237

Diff Legend

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