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.234 by root, Thu May 25 16:24:44 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 $tooltip =~ s/^\s+//;
275 or Carp::confess "no parent widget in _topleft\n";#d# 328 $tooltip =~ s/\s+$//;
276 329
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 330 return if $self->{tooltip} eq $tooltip;
331
332 $self->{tooltip} = $tooltip;
333
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip;
337 }
278} 338}
279 339
280# translate global coordinates to local coordinate system 340# translate global coordinates to local coordinate system
281sub coord2local { 341sub coord2local {
282 my ($self, $x, $y) = @_; 342 my ($self, $x, $y) = @_;
283 343
284 my ($X, $Y) = $self->_topleft; 344 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 345}
287 346
288# translate local coordinates to global coordinate system 347# translate local coordinates to global coordinate system
289sub coord2global { 348sub coord2global {
290 my ($self, $x, $y) = @_; 349 my ($self, $x, $y) = @_;
291 350
292 my ($X, $Y) = $self->_topleft; 351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 352}
295 353
296sub focus_in { 354sub focus_in {
297 my ($self) = @_; 355 my ($self) = @_;
298 356
299 return if $FOCUS == $self; 357 return if $FOCUS == $self;
300 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
301 359
302 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
303 361
304 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
305 363
306 $focus->update if $focus; 364 $focus->update if $focus;
307 $FOCUS->update; 365 $FOCUS->update;
308} 366}
309 367
… …
312 370
313 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
314 372
315 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
316 374
317 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
318 376
319 $focus->update if $focus; #? 377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS;
320} 381}
321 382
322sub mouse_motion { } 383sub mouse_motion { }
323sub button_up { } 384sub button_up { }
324sub key_down { } 385sub key_down { }
325sub key_up { } 386sub key_up { }
326 387
327sub button_down { 388sub button_down {
328 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
329 390
330 $self->focus_in; 391 $self->focus_in;
… …
364 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
365 glPushMatrix; 426 glPushMatrix;
366 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
367 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
369 glVertex 0 , 0; 430 glVertex 0 , 0;
370 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
371 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
372 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
373 glEnd; 434 glEnd;
374 glPopMatrix; 435 glPopMatrix;
375 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376 } 437 }
377} 438}
378 439
379sub _draw { 440sub _draw {
380 my ($self) = @_; 441 my ($self) = @_;
… …
396 457
397sub set_parent { 458sub set_parent {
398 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
399 460
400 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
401} 468}
402 469
403sub check_size { 470sub check_size {
404 my ($self) = @_; 471 my ($self, $forced) = @_;
405 472
406 $self->{parent} 473 $self->{force_alloc} = 1 if $forced;
407 or return 1; 474 $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} 475}
428 476
429sub update { 477sub update {
430 my ($self) = @_; 478 my ($self) = @_;
431 479
… …
437 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
438 486
439 push @{ $self->{signal_cb}{$signal} }, $cb; 487 push @{ $self->{signal_cb}{$signal} }, $cb;
440} 488}
441 489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
442sub emit { 496sub emit {
443 my ($self, $signal, @args) = @_; 497 my ($self, $signal, @args) = @_;
444 498
445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
446} 501}
447 502
448sub DESTROY { 503sub DESTROY {
449 my ($self) = @_; 504 my ($self) = @_;
450 505
506 delete $WIDGET{$self+0};
451 #$self->deactivate; 507 #$self->deactivate;
452} 508}
453 509
454############################################################################# 510#############################################################################
455 511
… …
464 my $class = shift; 520 my $class = shift;
465 521
466 # range [value, low, high, page] 522 # range [value, low, high, page]
467 523
468 $class->SUPER::new ( 524 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 525 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 526 #active_bg => [1, 1, 1, 0.5],
471 @_ 527 @_
472 ) 528 )
473} 529}
474 530
475sub _draw { 531sub _draw {
476 my ($self) = @_; 532 my ($self) = @_;
477 533
534 my $color = $FOCUS == $self && $self->{active_bg}
535 ? $self->{active_bg}
536 : $self->{bg};
537
538 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 539 my ($w, $h) = @$self{qw(w h)};
479 540
480 glEnable GL_BLEND; 541 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 543 glColor @$color;
483 544
484 glBegin GL_QUADS; 545 glBegin GL_QUADS;
485 glVertex 0 , 0; 546 glVertex 0 , 0;
486 glVertex 0 , $h; 547 glVertex 0 , $h;
487 glVertex $w, $h; 548 glVertex $w, $h;
488 glVertex $w, 0; 549 glVertex $w, 0;
489 glEnd; 550 glEnd;
490 551
491 glDisable GL_BLEND; 552 glDisable GL_BLEND;
553 }
492} 554}
493 555
494############################################################################# 556#############################################################################
495 557
496package CFClient::UI::Empty; 558package CFClient::UI::Empty;
… …
528 590
529 $self 591 $self
530} 592}
531 593
532sub add { 594sub add {
533 my ($self, $child) = @_; 595 my ($self, @widgets) = @_;
534 596
535 $child->set_parent ($self); 597 $_->set_parent ($self)
598 for @widgets;
536 599
537 use sort 'stable'; 600 use sort 'stable';
538 601
539 $self->{children} = [ 602 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 603 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 604 @{$self->{children}}, @widgets
542 ]; 605 ];
543 606
544 $child->check_size; 607 $self->check_size (1);
545 $self->update; 608 $self->update;
546} 609}
547 610
548sub children { 611sub children {
549 @{ $_[0]{children} } 612 @{ $_[0]{children} }
… …
656} 719}
657 720
658sub update { 721sub update {
659 my ($self) = @_; 722 my ($self) = @_;
660 723
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 724 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 725 $self->SUPER::update;
663} 726}
664 727
665sub size_allocate { 728sub size_allocate {
666 my ($self, $w, $h) = @_; 729 my ($self, $w, $h) = @_;
… …
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 742 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0; 743 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT; 744 glClear GL_COLOR_BUFFER_BIT;
682 745
683 $self->_render; 746 $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 }; 747 };
692} 748}
693 749
694sub _draw { 750sub _draw {
695 my ($self) = @_; 751 my ($self) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 753 my ($w, $h) = ($self->w, $self->h);
698 754
699 my $tex = $self->{texture} 755 my $tex = $self->{texture}
700 or return; 756 or return;
701 757
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 758 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 760 glColor 1, 1, 1, 1;
707 761
708 $tex->draw_quad (0, 0, $w, $h); 762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 763
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 764 glDisable GL_TEXTURE_2D;
712} 765}
713 766
714############################################################################# 767#############################################################################
715 768
716package CFClient::UI::ViewPort; 769package CFClient::UI::ViewPort;
717 770
718our @ISA = CFClient::UI::Window::; 771our @ISA = CFClient::UI::Window::;
719 772
773sub new {
774 my $class = shift;
775
776 $class->SUPER::new (
777 scroll_x => 0,
778 scroll_y => 1,
779 @_,
780 )
781}
782
720sub size_request { 783sub size_request {
721 my ($self) = @_; 784 my ($self) = @_;
722 785
723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 786 @$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 787
726 @$self{qw(child_w child_h)} 788 @$self{qw(child_w child_h)}
727} 789}
728 790
729sub size_allocate { 791sub size_allocate {
730 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
731 793
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796
797 $self->child->configure (0, 0, $w, $h);
732 $self->update; 798 $self->update;
733} 799}
734 800
735sub set_offset { 801sub set_offset {
736 my ($self, $x, $y) = @_; 802 my ($self, $x, $y) = @_;
737 803
738 $self->{view_x} = int $x; 804 $self->{view_x} = int $x;
739 $self->{view_y} = int $y; 805 $self->{view_y} = int $y;
740 806
741 $self->update; 807 $self->update;
808}
809
810# hmm, this does not work for topleft of $self... but we should not ask for that
811sub coord2local {
812 my ($self, $x, $y) = @_;
813
814 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
815}
816
817sub coord2global {
818 my ($self, $x, $y) = @_;
819
820 $x = List::Util::min $self->{w}, $x - $self->{view_x};
821 $y = List::Util::min $self->{h}, $y - $self->{view_y};
822
823 $self->SUPER::coord2global ($x, $y)
824}
825
826sub find_widget {
827 my ($self, $x, $y) = @_;
828
829 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
830 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
831 ) {
832 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
833 } else {
834 $self->CFClient::UI::Base::find_widget ($x, $y)
835 }
742} 836}
743 837
744sub _render { 838sub _render {
745 my ($self) = @_; 839 my ($self) = @_;
746 840
… …
762 856
763 my $slider = new CFClient::UI::Slider 857 my $slider = new CFClient::UI::Slider
764 vertical => 1, 858 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix 859 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub { 860 connect_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 861 $self->{vp}->set_offset (0, $_[1]);
768 }, 862 },
769 ; 863 ;
770 864
771 $self = $class->SUPER::new ( 865 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort), 866 vp => (new CFClient::UI::ViewPort expand => 1),
773 slider => $slider, 867 slider => $slider,
774 @_, 868 @_,
775 ); 869 );
776 870
777 $self->{vp}->add ($self->{scrolled}); 871 $self->{vp}->add ($self->{scrolled});
… …
779 $self->add ($self->{slider}); 873 $self->add ($self->{slider});
780 874
781 $self 875 $self
782} 876}
783 877
878sub size_allocate {
879 my ($self, $w, $h) = @_;
880
881 $self->SUPER::size_allocate ($w, $h);
882
883 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
885}
886
784#TODO# update range on size_allocate depeneing on child 887#TODO# update range on size_allocate depending on child
785# update viewport offset on scroll 888# update viewport offset on scroll
786 889
787############################################################################# 890#############################################################################
788 891
789package CFClient::UI::Frame; 892package CFClient::UI::Frame;
… …
793use CFClient::OpenGL; 896use CFClient::OpenGL;
794 897
795sub new { 898sub new {
796 my $class = shift; 899 my $class = shift;
797 900
798 my $self = $class->SUPER::new ( 901 $class->SUPER::new (
799 bg => [1, 1, 1, 1], 902 bg => undef,
800 border_bg => [1, 1, 1, 1],
801 border => 0.8,
802 @_ 903 @_,
803 ); 904 )
804
805 $self
806} 905}
807 906
808sub _draw { 907sub _draw {
809 my ($self) = @_; 908 my ($self) = @_;
810 909
811 my ($w, $h) = ($self->{w}, $self->{h}); 910 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)};
812 912
813 glEnable GL_BLEND; 913 glEnable GL_BLEND;
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glEnable GL_TEXTURE_2D; 915 glColor @{ $self->{bg} };
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817 916
818# glBegin GL_QUADS; 917 glBegin GL_QUADS;
819# glColor 0, 0, 0, 0;
820# glVertex 0 , 0; 918 glVertex 0 , 0;
821# glVertex 0 , $h; 919 glVertex 0 , $h;
822# glVertex $w, $h; 920 glVertex $w, $h;
823# glVertex $w, 0; 921 glVertex $w, 0;
824# glEnd; 922 glEnd;
825 923
826
827 $self->child->draw;
828 glDisable GL_BLEND; 924 glDisable GL_BLEND;
829 glDisable GL_TEXTURE_2D; 925 }
926
927 $self->SUPER::_draw;
830} 928}
831 929
832############################################################################# 930#############################################################################
833 931
834package CFClient::UI::FancyFrame; 932package CFClient::UI::FancyFrame;
… …
845 my $class = shift; 943 my $class = shift;
846 944
847 # TODO: user_x, user_y, overwrite moveto? 945 # TODO: user_x, user_y, overwrite moveto?
848 946
849 my $self = $class->SUPER::new ( 947 my $self = $class->SUPER::new (
850 bg => [1, 1, 1, 1], 948 bg => [1, 1, 1, 1],
851 border_bg => [1, 1, 1, 1], 949 border_bg => [1, 1, 1, 1],
852 border => 0.6, 950 border => 0.6,
951 is_toplevel => 1,
853 can_events => 1, 952 can_events => 1,
854 @_ 953 @_
855 ); 954 );
856 955
857 $self->{title} &&= new CFClient::UI::Label 956 $self->{title} &&= new CFClient::UI::Label
858 align => 0, 957 align => 0,
… …
882 my ($self, $w, $h) = @_; 981 my ($self, $w, $h) = @_;
883 982
884 $h -= List::Util::max 0, $self->border * 2; 983 $h -= List::Util::max 0, $self->border * 2;
885 $w -= List::Util::max 0, $self->border * 2; 984 $w -= List::Util::max 0, $self->border * 2;
886 985
887 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
888 if $self->{title}; 987 if $self->{title};
889 988
890 $self->child->configure ($self->border, $self->border, $w, $h); 989 $self->child->configure ($self->border, $self->border, $w, $h);
891} 990}
892 991
… …
950 my ($self) = @_; 1049 my ($self) = @_;
951 1050
952 my ($w, $h ) = ($self->{w}, $self->{h}); 1051 my ($w, $h ) = ($self->{w}, $self->{h});
953 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954 1053
955 glEnable GL_BLEND;
956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957 glEnable GL_TEXTURE_2D; 1054 glEnable GL_TEXTURE_2D;
958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959 1056
960 my $border = $self->border; 1057 my $border = $self->border;
961 1058
962 glColor @{ $self->{border_bg} }; 1059 glColor @{ $self->{border_bg} };
963 $tex[1]->draw_quad (0, 0, $w, $border); 1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
964 $tex[3]->draw_quad (0, $border, $border, $ch); 1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
967 1064
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969 my $bg = $tex[0]; 1066 my $bg = $tex[0];
970 1067
971 # TODO: repeat texture not scale 1068 # TODO: repeat texture not scale
… …
975 glColor @{ $self->{bg} }; 1072 glColor @{ $self->{bg} };
976 1073
977 $bg->{s} = $rep_x; 1074 $bg->{s} = $rep_x;
978 $bg->{t} = $rep_y; 1075 $bg->{t} = $rep_y;
979 $bg->{wrap_mode} = 1; 1076 $bg->{wrap_mode} = 1;
980 $bg->draw_quad ($border, $border, $cw, $ch); 1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 }
981 1079
982 glDisable GL_TEXTURE_2D; 1080 glDisable GL_TEXTURE_2D;
983 glDisable GL_BLEND;
984 }
985 1081
986 $self->{title}->draw if $self->{title}; 1082 $self->{title}->draw if $self->{title};
987 1083
988 $self->child->draw; 1084 $self->child->draw;
989} 1085}
… …
1001sub new { 1097sub new {
1002 my $class = shift; 1098 my $class = shift;
1003 1099
1004 $class->SUPER::new ( 1100 $class->SUPER::new (
1005 col_expand => [], 1101 col_expand => [],
1006 @_ 1102 @_,
1007 ) 1103 )
1008} 1104}
1009 1105
1010sub add { 1106sub add {
1011 my ($self, $x, $y, $child) = @_; 1107 my ($self, $x, $y, $child) = @_;
… …
1216} 1312}
1217 1313
1218sub size_allocate { 1314sub size_allocate {
1219 my ($self, $w, $h) = @_; 1315 my ($self, $w, $h) = @_;
1220 1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1221 my $children = $self->{children}; 1319 my $children = $self->{children};
1222 1320
1223 my @h = map $_->{req_h}, @$children; 1321 my @h = map $_->{req_h}, @$children;
1224 1322
1225 my $req_h = List::Util::sum @h; 1323 my $req_h = List::Util::sum @h;
… …
1254 1352
1255############################################################################# 1353#############################################################################
1256 1354
1257package CFClient::UI::Label; 1355package CFClient::UI::Label;
1258 1356
1259our @ISA = CFClient::UI::Base::; 1357our @ISA = CFClient::UI::DrawBG::;
1260 1358
1261use CFClient::OpenGL; 1359use CFClient::OpenGL;
1262 1360
1263sub new { 1361sub new {
1264 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1265 1363
1266 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1267 fg => [1, 1, 1], 1365 fg => [1, 1, 1],
1366 #bg => none
1367 #active_bg => none
1268 #font => default_font 1368 #font => default_font
1369 #text => initial text
1370 #markup => initial narkup
1371 #max_w => maximum pixel width
1372 ellipsise => 3, # end
1373 layout => (new CFClient::Layout),
1269 fontsize => 1, 1374 fontsize => 1,
1270 text => "",
1271 align => -1, 1375 align => -1,
1272 valign => -1, 1376 valign => -1,
1273 padding => 2, 1377 padding => 2,
1274 layout => new CFClient::Layout,
1275 can_events => 0, 1378 can_events => 0,
1276 %arg 1379 %arg
1277 ); 1380 );
1278 1381
1279 if (exists $self->{template}) { 1382 if (exists $self->{template}) {
1280 my $layout = new CFClient::Layout; 1383 my $layout = new CFClient::Layout;
1281 $layout->set_text (delete $self->{template}); 1384 $layout->set_text (delete $self->{template});
1282 $self->{template} = $layout; 1385 $self->{template} = $layout;
1283 } 1386 }
1284 1387
1285 $self->set_text (delete $self->{text}) if exists $self->{text}; 1388 if (exists $self->{markup}) {
1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1389 $self->set_markup (delete $self->{markup});
1390 } else {
1391 $self->set_text (delete $self->{text});
1392 }
1287 1393
1288 $self 1394 $self
1289} 1395}
1290 1396
1291sub escape { 1397sub escape($) {
1292 local $_ = $_[1]; 1398 local $_ = $_[0];
1293 1399
1294 s/&/&amp;/g; 1400 s/&/&amp;/g;
1295 s/>/&gt;/g; 1401 s/>/&gt;/g;
1296 s/</&lt;/g; 1402 s/</&lt;/g;
1297 1403
1298 $_[1] 1404 $_
1299} 1405}
1300 1406
1301sub update { 1407sub update {
1302 my ($self) = @_; 1408 my ($self) = @_;
1303 1409
1304 delete $self->{texture}; 1410 delete $self->{texture};
1305 $self->SUPER::update; 1411 $self->SUPER::update;
1306} 1412}
1307 1413
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1314sub set_text { 1414sub set_text {
1315 my ($self, $text) = @_; 1415 my ($self, $text) = @_;
1316 1416
1317 return if $self->{text} eq "T$text"; 1417 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text"; 1418 $self->{text} = "T$text";
1319 1419
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320 $self->{layout}->set_text ($text); 1421 $self->{layout}->set_text ($text);
1321 1422
1322 delete $self->{texture};
1323 $self->update; 1423 $self->update;
1324 $self->check_size; 1424 $self->check_size;
1325} 1425}
1326 1426
1327sub set_markup { 1427sub set_markup {
1328 my ($self, $markup) = @_; 1428 my ($self, $markup) = @_;
1329 1429
1330 return if $self->{text} eq "M$markup"; 1430 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup"; 1431 $self->{text} = "M$markup";
1332 1432
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333 $self->{layout}->set_markup ($markup); 1436 $self->{layout}->set_markup ($markup);
1334 1437
1335 delete $self->{texture};
1336 $self->update; 1438 $self->update;
1337 $self->check_size; 1439 $self->check_size;
1338} 1440}
1339 1441
1340sub size_request { 1442sub size_request {
1341 my ($self) = @_; 1443 my ($self) = @_;
1342 1444
1343 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1445 $self->{layout}->set_font ($self->{font}) if $self->{font};
1344 $self->{layout}->set_width ($self->{max_w} || -1); 1446 $self->{layout}->set_width ($self->{max_w} || -1);
1447 $self->{layout}->set_ellipsise ($self->{ellipsise});
1448 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1345 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1449 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1346 1450
1347 my ($w, $h) = $self->{layout}->size; 1451 my ($w, $h) = $self->{layout}->size;
1348 1452
1349 if (exists $self->{template}) { 1453 if (exists $self->{template}) {
… …
1371sub set_fontsize { 1475sub set_fontsize {
1372 my ($self, $fontsize) = @_; 1476 my ($self, $fontsize) = @_;
1373 1477
1374 $self->{fontsize} = $fontsize; 1478 $self->{fontsize} = $fontsize;
1375 delete $self->{texture}; 1479 delete $self->{texture};
1480
1481 $self->update;
1376 $self->check_size; 1482 $self->check_size;
1377 $self->update;
1378} 1483}
1379 1484
1380sub _draw { 1485sub _draw {
1381 my ($self) = @_; 1486 my ($self) = @_;
1382 1487
1488 $self->SUPER::_draw; # draw background, if applicable
1489
1383 my $tex = $self->{texture} ||= do { 1490 my $tex = $self->{texture} ||= do {
1491 $self->{layout}->set_foreground (@{$self->{fg}});
1384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1492 $self->{layout}->set_font ($self->{font}) if $self->{font};
1385 $self->{layout}->set_width ($self->{w}); 1493 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1386 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497
1387 new_from_layout CFClient::Texture $self->{layout} 1498 my $tex = new_from_layout CFClient::Texture $self->{layout};
1499
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1502 : ($self->{w} - $tex->{w}) * 0.5);
1503
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1506 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1388 }; 1509 };
1389 1510
1390 glEnable GL_BLEND;
1391 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392 glEnable GL_TEXTURE_2D; 1511 glEnable GL_TEXTURE_2D;
1393 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394 1513
1514 if ($tex->{format} == GL_ALPHA) {
1395 glColor @{$self->{fg}}; 1515 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}); 1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1517 } else {
1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1519 }
1410 1520
1411 glDisable GL_TEXTURE_2D; 1521 glDisable GL_TEXTURE_2D;
1412 glDisable GL_BLEND;
1413} 1522}
1414 1523
1415############################################################################# 1524#############################################################################
1416 1525
1417package CFClient::UI::EntryBase; 1526package CFClient::UI::EntryBase;
… …
1430 active_fg => [0, 0, 0], 1539 active_fg => [0, 0, 0],
1431 can_hover => 1, 1540 can_hover => 1,
1432 can_focus => 1, 1541 can_focus => 1,
1433 valign => 0, 1542 valign => 0,
1434 can_events => 1, 1543 can_events => 1,
1544 #text => ...
1435 @_ 1545 @_
1436 ) 1546 )
1437} 1547}
1438 1548
1439sub _set_text { 1549sub _set_text {
… …
1449 $self->{text} = $text; 1559 $self->{text} = $text;
1450 1560
1451 $text =~ s/./*/g if $self->{hidden}; 1561 $text =~ s/./*/g if $self->{hidden};
1452 $self->{layout}->set_text ("$text "); 1562 $self->{layout}->set_text ("$text ");
1453 1563
1454 $self->emit (changed => $self->{text}); 1564 $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} 1565}
1474 1566
1475sub set_text { 1567sub set_text {
1476 my ($self, $text) = @_; 1568 my ($self, $text) = @_;
1477 1569
1478 $self->{cursor} = length $text; 1570 $self->{cursor} = length $text;
1479 $self->_set_text ($text); 1571 $self->_set_text ($text);
1480 $self->update; 1572 $self->update;
1573 $self->check_size;
1574}
1575
1576sub get_text {
1577 $_[0]{text}
1578}
1579
1580sub size_request {
1581 my ($self) = @_;
1582
1583 my ($w, $h) = $self->SUPER::size_request;
1584
1585 ($w + 1, $h) # add 1 for cursor
1481} 1586}
1482 1587
1483sub key_down { 1588sub key_down {
1484 my ($self, $ev) = @_; 1589 my ($self, $ev) = @_;
1485 1590
… …
1487 my $sym = $ev->{sym}; 1592 my $sym = $ev->{sym};
1488 my $uni = $ev->{unicode}; 1593 my $uni = $ev->{unicode};
1489 1594
1490 my $text = $self->get_text; 1595 my $text = $self->get_text;
1491 1596
1492 if ($sym == 8) { 1597 if ($uni == 8) {
1493 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1598 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494 } elsif ($sym == 127) { 1599 } elsif ($uni == 127) {
1495 substr $text, $self->{cursor}, 1, ""; 1600 substr $text, $self->{cursor}, 1, "";
1496 } elsif ($sym == CFClient::SDLK_LEFT) { 1601 } elsif ($sym == CFClient::SDLK_LEFT) {
1497 --$self->{cursor} if $self->{cursor}; 1602 --$self->{cursor} if $self->{cursor};
1498 } elsif ($sym == CFClient::SDLK_RIGHT) { 1603 } elsif ($sym == CFClient::SDLK_RIGHT) {
1499 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1604 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1500 } elsif ($sym == CFClient::SDLK_HOME) { 1605 } elsif ($sym == CFClient::SDLK_HOME) {
1501 $self->{cursor} = 0; 1606 $self->{cursor} = 0;
1502 } elsif ($sym == CFClient::SDLK_END) { 1607 } elsif ($sym == CFClient::SDLK_END) {
1503 $self->{cursor} = length $text; 1608 $self->{cursor} = length $text;
1504 } elsif ($sym == 27) { 1609 } elsif ($uni == 27) {
1505 $self->emit ('escape'); 1610 $self->_emit ('escape');
1506 } elsif ($uni) { 1611 } elsif ($uni) {
1507 substr $text, $self->{cursor}++, 0, chr $uni; 1612 substr $text, $self->{cursor}++, 0, chr $uni;
1508 } 1613 }
1509 1614
1510 $self->_set_text ($text); 1615 $self->_set_text ($text);
1511 $self->update; 1616 $self->update;
1617 $self->check_size;
1512} 1618}
1513 1619
1514sub focus_in { 1620sub focus_in {
1515 my ($self) = @_; 1621 my ($self) = @_;
1516 1622
… …
1596 if ($sym == 13) { 1702 if ($sym == 13) {
1597 unshift @{$self->{history}}, 1703 unshift @{$self->{history}},
1598 my $txt = $self->get_text; 1704 my $txt = $self->get_text;
1599 $self->{history_pointer} = -1; 1705 $self->{history_pointer} = -1;
1600 $self->{history_saveback} = ''; 1706 $self->{history_saveback} = '';
1601 $self->emit (activate => $txt); 1707 $self->_emit (activate => $txt);
1602 $self->update; 1708 $self->update;
1603 1709
1604 } elsif ($sym == CFClient::SDLK_UP) { 1710 } elsif ($sym == CFClient::SDLK_UP) {
1605 if ($self->{history_pointer} < 0) { 1711 if ($self->{history_pointer} < 0) {
1606 $self->{history_saveback} = $self->get_text; 1712 $self->{history_saveback} = $self->get_text;
… …
1645 my $class = shift; 1751 my $class = shift;
1646 1752
1647 $class->SUPER::new ( 1753 $class->SUPER::new (
1648 padding => 4, 1754 padding => 4,
1649 fg => [1, 1, 1], 1755 fg => [1, 1, 1],
1650 bg => [1, 1, 1, 0.2],
1651 active_fg => [0, 0, 1], 1756 active_fg => [0, 0, 1],
1652 can_hover => 1, 1757 can_hover => 1,
1653 align => 0, 1758 align => 0,
1654 valign => 0, 1759 valign => 0,
1655 can_events => 1, 1760 can_events => 1,
1656 @_ 1761 @_
1657 ) 1762 )
1658} 1763}
1659 1764
1765sub activate { }
1766
1660sub button_up { 1767sub button_up {
1661 my ($self, $ev, $x, $y) = @_; 1768 my ($self, $ev, $x, $y) = @_;
1662 1769
1770 $self->emit ("activate")
1663 if ($x >= 0 && $x < $self->{w} 1771 if $x >= 0 && $x < $self->{w}
1664 && $y >= 0 && $y < $self->{h}) { 1772 && $y >= 0 && $y < $self->{h};
1665 $self->emit ("activate");
1666 }
1667} 1773}
1668 1774
1669sub _draw { 1775sub _draw {
1670 my ($self) = @_; 1776 my ($self) = @_;
1671 1777
… …
1673 1779
1674 if ($GRAB == $self) { 1780 if ($GRAB == $self) {
1675 $self->{fg} = $self->{active_fg}; 1781 $self->{fg} = $self->{active_fg};
1676 } 1782 }
1677 1783
1678 glEnable GL_BLEND;
1679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680 glEnable GL_TEXTURE_2D; 1784 glEnable GL_TEXTURE_2D;
1681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682 glColor 0, 0, 0, 1; 1786 glColor 0, 0, 0, 1;
1683 1787
1684 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1788 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685 1789
1686 glDisable GL_TEXTURE_2D; 1790 glDisable GL_TEXTURE_2D;
1687 glDisable GL_BLEND;
1688 1791
1689 $self->SUPER::_draw; 1792 $self->SUPER::_draw;
1690} 1793}
1691 1794
1692############################################################################# 1795#############################################################################
… …
1706 1809
1707 $class->SUPER::new ( 1810 $class->SUPER::new (
1708 padding => 2, 1811 padding => 2,
1709 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1710 active_fg => [1, 1, 0], 1813 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5],
1711 state => 0, 1816 state => 0,
1712 can_hover => 1, 1817 can_hover => 1,
1713 @_ 1818 @_
1714 ) 1819 )
1715} 1820}
… …
1724 my ($self, $ev, $x, $y) = @_; 1829 my ($self, $ev, $x, $y) = @_;
1725 1830
1726 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1727 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1728 $self->{state} = !$self->{state}; 1833 $self->{state} = !$self->{state};
1729 $self->emit (changed => $self->{state}); 1834 $self->_emit (changed => $self->{state});
1730 } 1835 }
1731} 1836}
1732 1837
1733sub _draw { 1838sub _draw {
1734 my ($self) = @_; 1839 my ($self) = @_;
… …
1739 1844
1740 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1845 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1741 1846
1742 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743 1848
1744 glEnable GL_BLEND; 1849 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850
1745 glEnable GL_TEXTURE_2D; 1851 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); 1852 $tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752 glDisable GL_TEXTURE_2D; 1853 glDisable GL_TEXTURE_2D;
1753 glDisable GL_BLEND;
1754} 1854}
1755 1855
1756############################################################################# 1856#############################################################################
1757 1857
1758package CFClient::UI::Image; 1858package CFClient::UI::Image;
… …
1801 glTranslate 0, -$self->{w}, 0; 1901 glTranslate 0, -$self->{w}, 0;
1802 1902
1803 ($w, $h) = ($h, $w); 1903 ($w, $h) = ($h, $w);
1804 } 1904 }
1805 1905
1806 glEnable GL_BLEND;
1807 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808 glEnable GL_TEXTURE_2D; 1906 glEnable GL_TEXTURE_2D;
1809 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1907 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810 1908
1811 $tex->draw_quad (0, 0, $w, $h); 1909 $tex->draw_quad_alpha (0, 0, $w, $h);
1812 1910
1813 glDisable GL_BLEND;
1814 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1815} 1912}
1816 1913
1817############################################################################# 1914#############################################################################
1818 1915
… …
2007 qw(s1_slider.png s1_slider_bg.png); 2104 qw(s1_slider.png s1_slider_bg.png);
2008 2105
2009sub new { 2106sub new {
2010 my $class = shift; 2107 my $class = shift;
2011 2108
2012 # range [value, low, high, page] 2109 # range [value, low, high, page, unit]
2013 2110
2014 # TODO: 0-width page 2111 # TODO: 0-width page
2015 # TODO: req_w/h are wrong with vertical 2112 # TODO: req_w/h are wrong with vertical
2016 # TODO: calculations are off 2113 # TODO: calculations are off
2017 my $self = $class->SUPER::new ( 2114 my $self = $class->SUPER::new (
2018 fg => [1, 1, 1], 2115 fg => [1, 1, 1],
2019 active_fg => [0, 0, 0], 2116 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5],
2020 range => [0, 0, 100, 10], 2119 range => [0, 0, 100, 10, 0],
2021 req_w => $::WIDTH / 80, 2120 req_w => $::WIDTH / 80,
2022 req_h => $::WIDTH / 80, 2121 req_h => $::WIDTH / 80,
2023 vertical => 0, 2122 vertical => 0,
2024 can_hover => 1, 2123 can_hover => 1,
2025 inner_pad => 5, 2124 inner_pad => 0.02,
2026 @_ 2125 @_
2027 ); 2126 );
2028 2127
2128 $self->set_value ($self->{range}[0]);
2129 $self->update;
2130
2029 $self 2131 $self
2132}
2133
2134sub set_range {
2135 my ($self, $range) = @_;
2136
2137 $self->{range} = $range;
2138
2139 $self->update;
2140}
2141
2142sub set_value {
2143 my ($self, $value) = @_;
2144
2145 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2146
2147 $hi = $lo + 1 if $hi <= $lo;
2148
2149 $page = $hi - $lo if $page > $hi - $lo;
2150
2151 $value = $lo if $value < $lo;
2152 $value = $hi - $page if $value > $hi - $page;
2153
2154 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2155 if $unit;
2156
2157 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2158
2159 if ($value != $old_value) {
2160 $self->_emit (changed => $value);
2161 $self->update;
2162 }
2030} 2163}
2031 2164
2032sub size_request { 2165sub size_request {
2033 my ($self) = @_; 2166 my ($self) = @_;
2034 2167
… …
2040 2173
2041sub button_down { 2174sub button_down {
2042 my ($self, $ev, $x, $y) = @_; 2175 my ($self, $ev, $x, $y) = @_;
2043 2176
2044 $self->SUPER::button_down ($ev, $x, $y); 2177 $self->SUPER::button_down ($ev, $x, $y);
2178
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180
2045 $self->mouse_motion ($ev, $x, $y); 2181 $self->mouse_motion ($ev, $x, $y);
2046} 2182}
2047 2183
2048sub mouse_motion { 2184sub mouse_motion {
2049 my ($self, $ev, $x, $y) = @_; 2185 my ($self, $ev, $x, $y) = @_;
2050 2186
2051 if ($GRAB == $self) { 2187 if ($GRAB == $self) {
2188 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2189
2190 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193
2194 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2195 }
2196}
2197
2198sub update {
2199 my ($self) = @_;
2200
2201 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2202 $self->set_value ($self->{range}[0]);
2203
2052 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2204 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100;
2053 2206
2054 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2207 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2055 2208
2056 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2209 $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 2210 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2058 2211
2059 $x -= $inner_pad_px; # substract the padding 2212 $value = ($value - $lo) / $range;
2060 $x = $x * ($hi - $lo) / $inner_w + $lo; 2213 $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 2214
2065 $self->emit (changed => $x); 2215 $self->{knob_x} = $value - $knob_w * 0.5;
2066 $self->update; 2216 $self->{knob_w} = $knob_w;
2067 } 2217 });
2068}
2069 2218
2070# the inner_* stuff is for generating a padding for the slider handle, 2219 $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} 2220}
2077 2221
2078sub _draw { 2222sub _draw {
2079 my ($self) = @_; 2223 my ($self) = @_;
2080 2224
2081 $self->SUPER::_draw (); 2225 $self->SUPER::_draw ();
2082 2226
2083 my ($w, $h) = @$self{qw(w h)}; 2227 glScale $self->{w}, $self->{h};
2084 2228
2085 if ($self->{vertical}) { 2229 if ($self->{vertical}) {
2086 # draw a vertical slider like a rotated horizontal slider 2230 # draw a vertical slider like a rotated horizontal slider
2087 2231
2232 glTranslate 1, 0, 0;
2088 glRotate 90, 0, 0, 1; 2233 glRotate 90, 0, 0, 1;
2089 glTranslate 0, -$self->{w}, 0;
2090
2091 ($w, $h) = ($h, $w);
2092 } 2234 }
2093 2235
2094 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2236 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2237 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096 2238
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; 2239 glEnable GL_TEXTURE_2D;
2118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2240 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119 2241
2120 # draw background 2242 # draw background
2121 $tex[1]->draw_quad (0, 0, $w, $h); 2243 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122 2244
2123 # draw handle 2245 # draw handle
2124 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2246 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2125 2247
2126 glDisable GL_BLEND;
2127 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2128} 2249}
2250
2251#############################################################################
2252
2253package CFClient::UI::ValSlider;
2254
2255our @ISA = CFClient::UI::HBox::;
2256
2257sub new {
2258 my ($class, %arg) = @_;
2259
2260 my $range = delete $arg{range};
2261
2262 my $self = $class->SUPER::new (
2263 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2264 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2265 to_value => sub { shift },
2266 from_value => sub { shift },
2267 %arg,
2268 );
2269
2270 $self->{slider}->connect (changed => sub {
2271 my ($self, $value) = @_;
2272 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2273 $self->{parent}->emit (changed => $value);
2274 });
2275
2276# $self->{entry}->connect (changed => sub {
2277# my ($self, $value) = @_;
2278# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2279# $self->{parent}->emit (changed => $value);
2280# });
2281
2282 $self->add ($self->{slider}, $self->{entry});
2283
2284 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2285
2286 $self
2287}
2288
2289sub set_range { shift->{slider}->set_range (@_) }
2290sub set_value { shift->{slider}->set_value (@_) }
2129 2291
2130############################################################################# 2292#############################################################################
2131 2293
2132package CFClient::UI::TextView; 2294package CFClient::UI::TextView;
2133 2295
… …
2142 fontsize => 1, 2304 fontsize => 1,
2143 can_events => 0, 2305 can_events => 0,
2144 #font => default_font 2306 #font => default_font
2145 @_, 2307 @_,
2146 2308
2147 layout => (new CFClient::Layout), 2309 layout => (new CFClient::Layout 1),
2148 par => [], 2310 par => [],
2149 height => 0, 2311 height => 0,
2150 children => [ 2312 children => [
2151 (new CFClient::UI::Empty expand => 1), 2313 (new CFClient::UI::Empty expand => 1),
2152 (new CFClient::UI::Slider vertical => 1), 2314 (new CFClient::UI::Slider vertical => 1),
… …
2163 2325
2164 $self->{fontsize} = $fontsize; 2326 $self->{fontsize} = $fontsize;
2165 $self->reflow; 2327 $self->reflow;
2166} 2328}
2167 2329
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 { 2330sub size_allocate {
2188 my ($self, $w, $h) = @_; 2331 my ($self, $w, $h) = @_;
2189 2332
2190 $self->SUPER::size_allocate ($w, $h); 2333 $self->SUPER::size_allocate ($w, $h);
2191 2334
… …
2194 $self->{layout}->set_width ($self->{children}[0]{w}); 2337 $self->{layout}->set_width ($self->{children}[0]{w});
2195 2338
2196 $self->reflow; 2339 $self->reflow;
2197} 2340}
2198 2341
2342sub text_size {
2343 my ($self, $text, $indent) = @_;
2344
2345 my $layout = $self->{layout};
2346
2347 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2348 $layout->set_width ($self->{children}[0]{w} - $indent);
2349 $layout->set_markup ($text);
2350
2351 $layout->size
2352}
2353
2354sub reflow {
2355 my ($self) = @_;
2356
2357 $self->{need_reflow}++;
2358 $self->update;
2359}
2360
2361sub set_offset {
2362 my ($self, $offset) = @_;
2363
2364 # todo: base offset on lines or so, not on pixels
2365 $self->{children}[1]->set_value ($offset);
2366}
2367
2368sub clear {
2369 my ($self) = @_;
2370
2371 $self->{par} = [];
2372 $self->{height} = 0;
2373 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2374}
2375
2199sub add_paragraph { 2376sub add_paragraph {
2200 my ($self, $color, $text) = @_; 2377 my ($self, $color, $text, $indent) = @_;
2201 2378
2202 #TODO: intelligently "reformat" paragraph 2379 for my $line (split /\n/, $text) {
2203 2380 my ($w, $h) = $self->text_size ($line);
2204 my $height = $self->text_height ($text);
2205
2206 $self->{height} += $height; 2381 $self->{height} += $h;
2382 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2383 }
2207 2384
2208 push @{$self->{par}}, [$height, $color, $text];
2209
2210 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2385 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2211 $self->{children}[1]->update;
2212} 2386}
2213 2387
2214sub update { 2388sub update {
2215 my ($self) = @_; 2389 my ($self) = @_;
2216 2390
… …
2218 2392
2219 return unless $self->{h} > 0; 2393 return unless $self->{h} > 0;
2220 2394
2221 delete $self->{texture}; 2395 delete $self->{texture};
2222 2396
2223 $ROOT->on_refresh ($self, sub { 2397 $ROOT->on_post_alloc ($self, sub {
2398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399
2224 if (delete $self->{need_reflow}) { 2400 if (delete $self->{need_reflow}) {
2225 my $height = 0; 2401 my $height = 0;
2226 2402
2227 $height += $_->[0] = $self->text_height ($_->[2]) 2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406
2228 for @{$self->{par}}; 2407 for (@{$self->{par}}) {
2408 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2409 $layout->set_width ($W - $_->[3]);
2410 $layout->set_markup ($_->[4]);
2411 my ($w, $h) = $layout->size;
2412 $_->[0] = $w + $_->[3];
2413 $_->[1] = $h;
2414 }
2415
2416 $height += $_->[1];
2417 }
2229 2418
2230 $self->{height} = $height; 2419 $self->{height} = $height;
2231 2420
2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2421 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2233 2422
2234 delete $self->{texture}; 2423 delete $self->{texture};
2235 } 2424 }
2236 2425
2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2238 glClearColor 0, 0, 0, 0; 2427 glClearColor 0.5, 0.5, 0.5, 0;
2239 glClear GL_COLOR_BUFFER_BIT; 2428 glClear GL_COLOR_BUFFER_BIT;
2240 2429
2430 my $top = int $self->{children}[1]{range}[0];
2431
2432 my $y0 = $top;
2433 my $y1 = $top + $H;
2434
2435 my $y = 0;
2436
2437 my $layout = $self->{layout};
2438
2439 $layout->set_font ($self->{font}) if $self->{font};
2440
2241 glEnable GL_BLEND; 2441 glEnable GL_BLEND;
2442 #TODO# not correct in windows where rgba is forced off
2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2443 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 2444
2257 for my $par (@{$self->{par}}) { 2445 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2446 my $h = $par->[1];
2259 2447
2260 if ($y0 < $y + $h && $y < $y1) { 2448 if ($y0 < $y + $h && $y < $y1) {
2449 $layout->set_foreground (@{ $par->[2] });
2450 $layout->set_width ($W - $par->[3]);
2261 $layout->set_text ($par->[2]); 2451 $layout->set_markup ($par->[4]);
2262 2452
2263 glColor @{ $par->[1] }; 2453 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 my ($W, $H) = $layout->size; 2454
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2455 glRasterPos $par->[3], $y - $y0;
2456 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266 } 2457 }
2267 2458
2268 $y += $h; 2459 $y += $h;
2269 } 2460 }
2270 2461
2271 glDisable GL_TEXTURE_2D;
2272 glDisable GL_BLEND; 2462 glDisable GL_BLEND;
2273 }; 2463 };
2274 }); 2464 });
2275} 2465}
2276 2466
2277sub _draw { 2467sub _draw {
2278 my ($self) = @_; 2468 my ($self) = @_;
2279 2469
2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282 glEnable GL_TEXTURE_2D; 2470 glEnable GL_TEXTURE_2D;
2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1; 2472 glColor 1, 1, 1, 1;
2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2473 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286 glDisable GL_TEXTURE_2D; 2474 glDisable GL_TEXTURE_2D;
2287 glDisable GL_BLEND;
2288 2475
2289 $self->{children}[1]->draw; 2476 $self->{children}[1]->draw;
2290 2477
2291} 2478}
2292 2479
… …
2360 2547
2361 # TODO: use animation 2548 # TODO: use animation
2362 if ($self->{state} = !$self->{state}) { 2549 if ($self->{state} = !$self->{state}) {
2363 $CFClient::UI::ROOT->add ($self->{other}); 2550 $CFClient::UI::ROOT->add ($self->{other});
2364 $self->{other}->move ($self->coord2global (0, $self->{h})); 2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2365 $self->emit ("open"); 2552 $self->_emit ("open");
2366 } else { 2553 } else {
2367 $CFClient::UI::ROOT->remove ($self->{other}); 2554 $CFClient::UI::ROOT->remove ($self->{other});
2368 $self->emit ("close"); 2555 $self->_emit ("close");
2369 } 2556 }
2370 2557
2371 $self->emit (changed => $self->{state}); 2558 $self->_emit (changed => $self->{state});
2372} 2559}
2373 2560
2374############################################################################# 2561#############################################################################
2375 2562
2376package CFClient::UI::Tooltip; 2563package CFClient::UI::Tooltip;
… …
2386 @_, 2573 @_,
2387 can_events => 0, 2574 can_events => 0,
2388 ) 2575 )
2389} 2576}
2390 2577
2391sub set_markup { 2578sub set_tooltip_from {
2392 my ($self, $text) = @_; 2579 my ($self, $widget) = @_;
2393 2580
2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2581 $self->add (new CFClient::UI::Label
2395 $self->{label}->set_markup ($text); 2582 markup => $widget->{tooltip},
2396 $self->add ($self->{label}); 2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8,
2585 fg => [0, 0, 0, 1],
2586 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP),
2588 );
2397} 2589}
2398 2590
2399sub size_request { 2591sub size_request {
2400 my ($self) = @_; 2592 my ($self) = @_;
2401
2402 $self->child->set_max_size ($::WIDTH * 0.3);
2403 2593
2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2594 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405 2595
2406 ($w + 4, $h + 4) 2596 ($w + 4, $h + 4)
2407} 2597}
… …
2413} 2603}
2414 2604
2415sub _draw { 2605sub _draw {
2416 my ($self) = @_; 2606 my ($self) = @_;
2417 2607
2418 glPushMatrix;
2419 glTranslate 0.375, 0.375; 2608 glTranslate 0.375, 0.375;
2420 2609
2421 my ($w, $h) = @$self{qw(w h)}; 2610 my ($w, $h) = @$self{qw(w h)};
2422 2611
2423 glColor 1, 0.8, 0.4; 2612 glColor 1, 0.8, 0.4;
… …
2434 glVertex 0 , $h; 2623 glVertex 0 , $h;
2435 glVertex $w, $h; 2624 glVertex $w, $h;
2436 glVertex $w, 0; 2625 glVertex $w, 0;
2437 glEnd; 2626 glEnd;
2438 2627
2439 glPopMatrix; 2628 glTranslate 2 - 0.375, 2 - 0.375;
2440
2441 glTranslate 2, 2;
2442 $self->SUPER::_draw; 2629 $self->SUPER::_draw;
2443} 2630}
2444 2631
2445############################################################################# 2632#############################################################################
2446 2633
… …
2451use CFClient::OpenGL; 2638use CFClient::OpenGL;
2452 2639
2453sub new { 2640sub new {
2454 my $class = shift; 2641 my $class = shift;
2455 2642
2456 $class->SUPER::new ( 2643 my $self = $class->SUPER::new (
2457 aspect => 1, 2644 aspect => 1,
2645 can_events => 0,
2458 @_, 2646 @_,
2459 ) 2647 );
2648
2649 if ($self->{anim} && $self->{animspeed}) {
2650 Scalar::Util::weaken (my $widget = $self);
2651
2652 $self->{timer} = Event->timer (
2653 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2654 hard => 1,
2655 interval => $self->{animspeed},
2656 cb => sub {
2657 ++$widget->{frame};
2658 $widget->update;
2659 },
2660 );
2661 }
2662
2663 $self
2460} 2664}
2461 2665
2462sub size_request { 2666sub size_request {
2463 (32, 8) 2667 (32, 8)
2464} 2668}
2465 2669
2670sub update {
2671 my ($self) = @_;
2672
2673 return unless $self->{visible};
2674
2675 $self->SUPER::update;
2676}
2677
2466sub _draw { 2678sub _draw {
2467 my ($self) = @_; 2679 my ($self) = @_;
2468 2680
2681 return unless $::CONN;
2682
2683 my $face;
2684
2685 if ($self->{frame}) {
2686 my $anim = $::CONN->{anim}[$self->{anim}];
2687
2688 $face = $anim->[ $self->{frame} % @$anim ]
2689 if $anim && @$anim;
2690 }
2691
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2693
2471 # TODO animation
2472 if ($tex) { 2694 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2695 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2697 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2699 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2700 }
2701}
2702
2703sub DESTROY {
2704 my ($self) = @_;
2705
2706 $self->{timer}->cancel
2707 if $self->{timer};
2708
2709 $self->SUPER::DESTROY;
2710}
2711
2712#############################################################################
2713
2714package CFClient::UI::InventoryItem;
2715
2716our @ISA = CFClient::UI::HBox::;
2717
2718sub new {
2719 my $class = shift;
2720
2721 my %args = @_;
2722
2723 my $item = delete $args{item};
2724
2725 my $desc = CFClient::Item::desc_string $item;
2726
2727 my $self = $class->SUPER::new (
2728 can_hover => 1,
2729 can_events => 1,
2730 tooltip => ((CFClient::UI::Label::escape $desc)
2731 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732 connect_button_down => sub {
2733 my ($self, $ev, $x, $y) = @_;
2734
2735 # todo: maybe put examine on 1? but should just be a tooltip :(
2736 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737 my $targ = $::CONN->{player}{tag};
2738
2739 if ($item->{container} == $::CONN->{player}{tag}) {
2740 $targ = $main::OPENCONT;
2741 }
2742
2743 $::CONN->send ("move $targ $item->{tag} 0");
2744 } elsif ($ev->{button} == 1) {
2745 $::CONN->send ("examine $item->{tag}");
2746 } elsif ($ev->{button} == 2) {
2747 $::CONN->send ("apply $item->{tag}");
2748 } elsif ($ev->{button} == 3) {
2749 my @menu_items = (
2750 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753 (
2754 $item->{flags} & Crossfire::Protocol::F_LOCKED
2755 ? (
2756 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757 )
2758 : (
2759 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761 )
2762 ),
2763 );
2764
2765 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766 }
2767
2768 1
2769 },
2770 %args
2771 );
2772
2773
2774 $self->add (new CFClient::UI::Face
2775 can_events => 0,
2776 face => $item->{face},
2777 anim => $item->{anim},
2778 animspeed => $item->{animspeed},
2779 );
2780
2781 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783 $self->{item} = $item;
2784
2785 $self->update_item;
2786
2787 $self
2788}
2789
2790sub update_item {
2791 my ($self) = @_;
2792
2793 my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795 $self->{name_lbl}->set_text ($desc);
2796}
2797
2798#############################################################################
2799
2800package CFClient::UI::Inventory;
2801
2802our @ISA = CFClient::UI::ScrolledWindow::;
2803
2804sub new {
2805 my $class = shift;
2806
2807 my $self = $class->SUPER::new (
2808 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2809 @_,
2810 );
2811
2812 $self
2813}
2814
2815sub set_items {
2816 my ($self, $items) = @_;
2817
2818 $self->{scrolled}->clear;
2819 return unless $items;
2820
2821 my @items = sort {
2822 ($a->{type} <=> $b->{type})
2823 or ($a->{name} cmp $b->{name})
2824 } @$items;
2825
2826 $self->{real_items} = \@items;
2827
2828 my $row = 0;
2829 for my $item (@items) {
2830 CFClient::Item::update_widgets $item;
2831
2832 $self->{scrolled}->add (0, $row, $item->{face_widget});
2833 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2834 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2835
2836 $row++;
2837 }
2838
2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840}
2841
2842sub size_request {
2843 my ($self) = @_;
2844 ($self->{req_w}, $self->{req_h});
2482} 2845}
2483 2846
2484############################################################################# 2847#############################################################################
2485 2848
2486package CFClient::UI::Menu; 2849package CFClient::UI::Menu;
… …
2521 2884
2522# popup given the event (must be a mouse button down event currently) 2885# popup given the event (must be a mouse button down event currently)
2523sub popup { 2886sub popup {
2524 my ($self, $ev) = @_; 2887 my ($self, $ev) = @_;
2525 2888
2526 $self->emit ("popdown"); 2889 $self->_emit ("popdown");
2527 2890
2528 # maybe save $GRAB? must be careful about events... 2891 # maybe save $GRAB? must be careful about events...
2529 $GRAB = $self; 2892 $GRAB = $self;
2530 $self->{button} = $ev->{button}; 2893 $self->{button} = $ev->{button};
2531 2894
… …
2546 2909
2547 if ($ev->{button} == $self->{button}) { 2910 if ($ev->{button} == $self->{button}) {
2548 undef $GRAB; 2911 undef $GRAB;
2549 $self->hide; 2912 $self->hide;
2550 2913
2551 $self->emit ("popdown"); 2914 $self->_emit ("popdown");
2552 $self->{hover}[1]->() if $self->{hover}; 2915 $self->{hover}[1]->() if $self->{hover};
2553 } 2916 }
2554} 2917}
2555 2918
2556############################################################################# 2919#############################################################################
2557 2920
2921package CFClient::UI::Statusbox;
2922
2923our @ISA = CFClient::UI::VBox::;
2924
2925sub new {
2926 my $class = shift;
2927
2928 $class->SUPER::new (
2929 fontsize => 0.8,
2930 @_,
2931 )
2932}
2933
2934sub reorder {
2935 my ($self) = @_;
2936 my $NOW = time;
2937
2938 while (my ($k, $v) = each %{ $self->{item} }) {
2939 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2940 }
2941
2942 my @widgets;
2943
2944 my @items = sort {
2945 $a->{pri} <=> $b->{pri}
2946 or $b->{id} <=> $a->{id}
2947 } values %{ $self->{item} };
2948
2949 my $count = 10 + 1;
2950 for my $item (@items) {
2951 last unless --$count;
2952
2953 push @widgets, $item->{label} ||= do {
2954 # TODO: doesn't handle markup well (read as: at all)
2955 my $short = $item->{count} > 1
2956 ? "<b>$item->{count} ×</b> $item->{text}"
2957 : $item->{text};
2958
2959 for ($short) {
2960 s/^\s+//;
2961 s/\s+/ /g;
2962 }
2963
2964 new CFClient::UI::Label
2965 markup => $short,
2966 tooltip => $item->{tooltip},
2967 tooltip_font => $::FONT_PROP,
2968 tooltip_width => 0.67,
2969 fontsize => $item->{fontsize} || $self->{fontsize},
2970 max_w => $::WIDTH * 0.44,
2971 fg => $item->{fg},
2972 can_events => 1,
2973 can_hover => 1
2974 };
2975 }
2976
2977 $self->clear;
2978 $self->SUPER::add (reverse @widgets);
2979}
2980
2981sub add {
2982 my ($self, $text, %arg) = @_;
2983
2984 $text =~ s/^\s+//;
2985 $text =~ s/\s+$//;
2986
2987 return unless $text;
2988
2989 my $timeout = time + ((delete $arg{timeout}) || 60);
2990
2991 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2992
2993 if (my $item = $self->{item}{$group}) {
2994 if ($item->{text} eq $text) {
2995 $item->{count}++;
2996 } else {
2997 $item->{count} = 1;
2998 $item->{text} = $item->{tooltip} = $text;
2999 }
3000 $item->{id} = ++$self->{id};
3001 $item->{timeout} = $timeout;
3002 delete $item->{label};
3003 } else {
3004 $self->{item}{$group} = {
3005 id => ++$self->{id},
3006 text => $text,
3007 timeout => $timeout,
3008 tooltip => $text,
3009 fg => [0.8, 0.8, 0.8, 0.8],
3010 pri => 0,
3011 count => 1,
3012 %arg,
3013 };
3014 }
3015
3016 $self->reorder;
3017}
3018
3019sub reconfigure {
3020 my ($self) = @_;
3021
3022 delete $_->{label}
3023 for values %{ $self->{item} || {} };
3024
3025 $self->reorder;
3026 $self->SUPER::reconfigure;
3027}
3028
3029#############################################################################
3030
2558package CFClient::UI::Root; 3031package CFClient::UI::Root;
2559 3032
2560our @ISA = CFClient::UI::Container::; 3033our @ISA = CFClient::UI::Container::;
2561 3034
2562use CFClient::OpenGL; 3035use CFClient::OpenGL;
2563 3036
2564sub check_size { 3037sub new {
2565 my ($self) = @_; 3038 my $class = shift;
2566 3039
2567 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3040 $class->SUPER::new (
2568} 3041 @_,
2569 3042 )
2570sub size_request {
2571 ($::WIDTH, $::HEIGHT)
2572} 3043}
2573 3044
2574sub configure { 3045sub configure {
2575 my ($self, $x, $y, $w, $h) = @_; 3046 my ($self, $x, $y, $w, $h) = @_;
2576 3047
2577 $self->SUPER::configure ($x, $y, $w, $h); 3048 $self->{w} = $w;
3049 $self->{h} = $h;
3050}
2578 3051
3052sub check_size {
3053 my ($self) = @_;
3054
3055 $self->size_allocate ($self->{w}, $self->{h})
3056 if $self->{w};
3057}
3058
3059sub size_request {
3060 my ($self) = @_;
3061
3062 ($self->{w}, $self->{h})
3063}
3064
3065sub size_allocate {
3066 my ($self, $w, $h) = @_;
3067
2579 for my $child (@{$self->{children}}) { 3068 for my $child ($self->children) {
2580 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3069 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581 3070
3071 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3072 if exists $child->{req_x};
3073
3074 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3075 if exists $child->{req_y};
3076
2582 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3077 $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; 3078 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079
2584 $child->configure ($X, $Y, $W,$H); 3080 $child->configure ($X, $Y, $W, $H);
2585 } 3081 }
2586} 3082}
2587 3083
2588sub _topleft { 3084sub coord2local {
2589 my ($self, $x, $y) = @_; 3085 my ($self, $x, $y) = @_;
2590 3086
2591 ($x, $y) 3087 ($x, $y)
2592} 3088}
2593 3089
3090sub coord2global {
3091 my ($self, $x, $y) = @_;
3092
3093 ($x, $y)
3094}
3095
2594sub update { 3096sub update {
2595 my ($self) = @_; 3097 my ($self) = @_;
2596 3098
2597 $self->check_size; 3099 $self->check_size;
2598 ::refresh (); 3100 $::WANT_REFRESH++;
2599} 3101}
2600 3102
2601sub add { 3103sub add {
2602 my ($self, $child) = @_; 3104 my ($self, @children) = @_;
2603 3105
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111
3112 for my $child (@children) {
3113 $child->{is_toplevel} = 1;
3114
2604 # integerize window positions 3115 # integerise window positions
2605 $child->{x} = int $child->{x}; 3116 $child->{x} = int $child->{x};
2606 $child->{y} = int $child->{y}; 3117 $child->{y} = int $child->{y};
3118 }
2607 3119
2608 $self->SUPER::add ($child); 3120 $self->SUPER::add (@children);
3121}
3122
3123sub remove {
3124 my ($self, @children) = @_;
3125
3126 $self->SUPER::remove (@children);
3127
3128 while (@children) {
3129 my $w = pop @children;
3130 push @children, $w->children;
3131 $w->set_invisible;
3132 }
2609} 3133}
2610 3134
2611sub on_refresh { 3135sub on_refresh {
2612 my ($self, $id, $cb) = @_; 3136 my ($self, $id, $cb) = @_;
2613 3137
2614 $self->{refresh_hook}{$id} = $cb; 3138 $self->{refresh_hook}{$id} = $cb;
2615} 3139}
2616 3140
3141sub on_post_alloc {
3142 my ($self, $id, $cb) = @_;
3143
3144 $self->{post_alloc_hook}{$id} = $cb;
3145}
3146
2617sub draw { 3147sub draw {
2618 my ($self) = @_; 3148 my ($self) = @_;
2619 3149
2620 while (my $rcb = delete $self->{refresh_hook}) { 3150 while ($self->{refresh_hook}) {
2621 $_->() for values %$rcb; 3151 $_->()
3152 for values %{delete $self->{refresh_hook}};
3153 }
3154
3155 if ($self->{check_size}) {
3156 my @queue = ([], []);
3157
3158 for (;;) {
3159 if ($self->{check_size}) {
3160 # heuristic: check containers last
3161 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3162 for values %{delete $self->{check_size}}
3163 }
3164
3165 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3166
3167 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3168 ? @$widget{qw(user_w user_h)}
3169 : $widget->size_request;
3170
3171 if (delete $widget->{force_alloc}
3172 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174
3175 $widget->{req_w} = $w;
3176 $widget->{req_h} = $h;
3177
3178 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3179
3180 $widget->{parent}->check_size
3181 if $widget->{parent};
3182 }
3183 }
3184 }
3185
3186 while ($self->{size_alloc}) {
3187 for (values %{delete $self->{size_alloc}}) {
3188 my ($widget, $w, $h) = @$_;
3189
3190 $w = 0 if $w < 0;
3191 $h = 0 if $h < 0;
3192
3193 $widget->{w} = $w;
3194 $widget->{h} = $h;
3195 $widget->emit (size_allocate => $w, $h);
3196 }
3197 }
3198
3199 while ($self->{post_alloc_hook}) {
3200 $_->()
3201 for values %{delete $self->{post_alloc_hook}};
2622 } 3202 }
2623 3203
2624 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3204 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3205 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626 glClear GL_COLOR_BUFFER_BIT; 3206 glClear GL_COLOR_BUFFER_BIT;
2627 3207
2628 glMatrixMode GL_PROJECTION; 3208 glMatrixMode GL_PROJECTION;
2629 glLoadIdentity; 3209 glLoadIdentity;
2630 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3210 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2631 glMatrixMode GL_MODELVIEW; 3211 glMatrixMode GL_MODELVIEW;
2632 glLoadIdentity; 3212 glLoadIdentity;
2633 3213
2634 $self->_draw; 3214 $self->_draw;
2635} 3215}
2636 3216
2637############################################################################# 3217#############################################################################
2638 3218
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; 3219package CFClient::UI;
2693 3220
2694$ROOT = new CFClient::UI::Root; 3221$ROOT = new CFClient::UI::Root;
2695$TOOLTIP = new CFClient::UI::Tooltip; 3222$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2696 3223
26971 32241
2698 3225

Diff Legend

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