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.184 by root, Wed May 3 19:56:05 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 $self->emit (size_allocate => $w, $h);
243 } 297 }
244} 298}
245 299
246sub size_allocate { 300sub size_allocate {
247 # nothing to be done 301 # nothing to be done
248} 302}
249 303
304sub reconfigure {
305 my ($self) = @_;
306
307 $self->check_size (1);
308 $self->update;
309}
310
250sub children { 311sub 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} 312}
262 313
263sub set_max_size { 314sub set_max_size {
264 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
265 316
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 317 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 318 delete $self->{max_h}; $self->{max_h} = $h if $h;
268} 319}
269 320
270# return top left coordinates 321sub set_tooltip {
271sub _topleft {
272 my ($self, $x, $y) = @_; 322 my ($self, $tooltip) = @_;
273 323
274 $self->{parent} 324 $self->{tooltip} = $tooltip;
275 or Carp::confess "no parent widget in _topleft\n";#d#
276 325
277 $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 }
278} 330}
279 331
280# translate global coordinates to local coordinate system 332# translate global coordinates to local coordinate system
281sub coord2local { 333sub coord2local {
282 my ($self, $x, $y) = @_; 334 my ($self, $x, $y) = @_;
283 335
284 my ($X, $Y) = $self->_topleft; 336 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 337}
287 338
288# translate local coordinates to global coordinate system 339# translate local coordinates to global coordinate system
289sub coord2global { 340sub coord2global {
290 my ($self, $x, $y) = @_; 341 my ($self, $x, $y) = @_;
291 342
292 my ($X, $Y) = $self->_topleft; 343 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 344}
295 345
296sub focus_in { 346sub focus_in {
297 my ($self) = @_; 347 my ($self) = @_;
298 348
299 return if $FOCUS == $self; 349 return if $FOCUS == $self;
300 return unless $self->{can_focus}; 350 return unless $self->{can_focus};
301 351
302 my $focus = $FOCUS; $FOCUS = $self; 352 my $focus = $FOCUS; $FOCUS = $self;
303 353
304 $self->emit (focus_in => $focus); 354 $self->_emit (focus_in => $focus);
305 355
306 $focus->update if $focus; 356 $focus->update if $focus;
307 $FOCUS->update; 357 $FOCUS->update;
308} 358}
309 359
… …
312 362
313 return unless $FOCUS == $self; 363 return unless $FOCUS == $self;
314 364
315 my $focus = $FOCUS; undef $FOCUS; 365 my $focus = $FOCUS; undef $FOCUS;
316 366
317 $self->emit (focus_out => $focus); 367 $self->_emit (focus_out => $focus);
318 368
319 $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;
320} 373}
321 374
322sub mouse_motion { } 375sub mouse_motion { }
323sub button_up { } 376sub button_up { }
324sub key_down { } 377sub key_down { }
325sub key_up { } 378sub key_up { }
326 379
327sub button_down { 380sub button_down {
328 my ($self, $ev, $x, $y) = @_; 381 my ($self, $ev, $x, $y) = @_;
329 382
330 $self->focus_in; 383 $self->focus_in;
… …
370 glVertex $self->{w}, 0; 423 glVertex $self->{w}, 0;
371 glVertex $self->{w}, $self->{h}; 424 glVertex $self->{w}, $self->{h};
372 glVertex 0 , $self->{h}; 425 glVertex 0 , $self->{h};
373 glEnd; 426 glEnd;
374 glPopMatrix; 427 glPopMatrix;
375 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;
376 } 429 }
377} 430}
378 431
379sub _draw { 432sub _draw {
380 my ($self) = @_; 433 my ($self) = @_;
… …
396 449
397sub set_parent { 450sub set_parent {
398 my ($self, $parent) = @_; 451 my ($self, $parent) = @_;
399 452
400 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;
401} 460}
402 461
403sub check_size { 462sub check_size {
404 my ($self) = @_; 463 my ($self, $forced) = @_;
405 464
406 $self->{parent} 465 $self->{force_alloc} = 1 if $forced;
407 or return 1; 466 $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} 467}
428 468
429sub update { 469sub update {
430 my ($self) = @_; 470 my ($self) = @_;
431 471
… …
437 my ($self, $signal, $cb) = @_; 477 my ($self, $signal, $cb) = @_;
438 478
439 push @{ $self->{signal_cb}{$signal} }, $cb; 479 push @{ $self->{signal_cb}{$signal} }, $cb;
440} 480}
441 481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
442sub emit { 488sub emit {
443 my ($self, $signal, @args) = @_; 489 my ($self, $signal, @args) = @_;
444 490
445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
446} 493}
447 494
448sub DESTROY { 495sub DESTROY {
449 my ($self) = @_; 496 my ($self) = @_;
450 497
498 delete $WIDGET{$self+0};
451 #$self->deactivate; 499 #$self->deactivate;
452} 500}
453 501
454############################################################################# 502#############################################################################
455 503
… …
464 my $class = shift; 512 my $class = shift;
465 513
466 # range [value, low, high, page] 514 # range [value, low, high, page]
467 515
468 $class->SUPER::new ( 516 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 517 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 518 #active_bg => [1, 1, 1, 0.5],
471 @_ 519 @_
472 ) 520 )
473} 521}
474 522
475sub _draw { 523sub _draw {
476 my ($self) = @_; 524 my ($self) = @_;
477 525
526 my $color = $FOCUS == $self && $self->{active_bg}
527 ? $self->{active_bg}
528 : $self->{bg};
529
530 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 531 my ($w, $h) = @$self{qw(w h)};
479 532
480 glEnable GL_BLEND; 533 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 535 glColor @$color;
483 536
484 glBegin GL_QUADS; 537 glBegin GL_QUADS;
485 glVertex 0 , 0; 538 glVertex 0 , 0;
486 glVertex 0 , $h; 539 glVertex 0 , $h;
487 glVertex $w, $h; 540 glVertex $w, $h;
488 glVertex $w, 0; 541 glVertex $w, 0;
489 glEnd; 542 glEnd;
490 543
491 glDisable GL_BLEND; 544 glDisable GL_BLEND;
545 }
492} 546}
493 547
494############################################################################# 548#############################################################################
495 549
496package CFClient::UI::Empty; 550package CFClient::UI::Empty;
… …
528 582
529 $self 583 $self
530} 584}
531 585
532sub add { 586sub add {
533 my ($self, $child) = @_; 587 my ($self, @widgets) = @_;
534 588
535 $child->set_parent ($self); 589 $_->set_parent ($self)
590 for @widgets;
536 591
537 use sort 'stable'; 592 use sort 'stable';
538 593
539 $self->{children} = [ 594 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 595 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 596 @{$self->{children}}, @widgets
542 ]; 597 ];
543 598
544 $child->check_size; 599 $self->check_size (1);
545 $self->update; 600 $self->update;
546} 601}
547 602
548sub children { 603sub children {
549 @{ $_[0]{children} } 604 @{ $_[0]{children} }
… …
656} 711}
657 712
658sub update { 713sub update {
659 my ($self) = @_; 714 my ($self) = @_;
660 715
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 716 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 717 $self->SUPER::update;
663} 718}
664 719
665sub size_allocate { 720sub size_allocate {
666 my ($self, $w, $h) = @_; 721 my ($self, $w, $h) = @_;
… …
679 $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 {
680 glClearColor 0, 0, 0, 0; 735 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT; 736 glClear GL_COLOR_BUFFER_BIT;
682 737
683 $self->_render; 738 $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 }; 739 };
692} 740}
693 741
694sub _draw { 742sub _draw {
695 my ($self) = @_; 743 my ($self) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 745 my ($w, $h) = ($self->w, $self->h);
698 746
699 my $tex = $self->{texture} 747 my $tex = $self->{texture}
700 or return; 748 or return;
701 749
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 750 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 752 glColor 1, 1, 1, 1;
707 753
708 $tex->draw_quad (0, 0, $w, $h); 754 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 755
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 756 glDisable GL_TEXTURE_2D;
712} 757}
713 758
714############################################################################# 759#############################################################################
715 760
… …
719 764
720sub size_request { 765sub size_request {
721 my ($self) = @_; 766 my ($self) = @_;
722 767
723 @$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)};
724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
725 769
726 @$self{qw(child_w child_h)} 770 @$self{qw(child_w child_h)}
727} 771}
728 772
729sub size_allocate { 773sub size_allocate {
730 my ($self, $w, $h) = @_; 774 my ($self, $w, $h) = @_;
731 775
776 my ($cw, $ch) = @$self{qw(child_w child_h)};
777# $w = $self->{w};
778 $self->child->configure (0, 0, $cw, $ch);
732 $self->update; 779 $self->update;
733} 780}
734 781
735sub set_offset { 782sub set_offset {
736 my ($self, $x, $y) = @_; 783 my ($self, $x, $y) = @_;
… …
739 $self->{view_y} = int $y; 786 $self->{view_y} = int $y;
740 787
741 $self->update; 788 $self->update;
742} 789}
743 790
744# hmm, this does not work for topleft of $self... but we should not aks for that 791# hmm, this does not work for topleft of $self... but we should not ask for that
745sub _topleft { 792sub coord2local {
746 my ($self, $x, $y) = @_; 793 my ($self, $x, $y) = @_;
747 794
748 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 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)
749} 805}
750 806
751sub find_widget { 807sub find_widget {
752 my ($self, $x, $y) = @_; 808 my ($self, $x, $y) = @_;
753 809
… …
781 837
782 my $slider = new CFClient::UI::Slider 838 my $slider = new CFClient::UI::Slider
783 vertical => 1, 839 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix 840 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub { 841 connect_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 842 $self->{vp}->set_offset (0, $_[1]);
787 }, 843 },
788 ; 844 ;
789 845
790 $self = $class->SUPER::new ( 846 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort), 847 vp => (new CFClient::UI::ViewPort expand => 1),
792 slider => $slider, 848 slider => $slider,
793 @_, 849 @_,
794 ); 850 );
795 851
796 $self->{vp}->add ($self->{scrolled}); 852 $self->{vp}->add ($self->{scrolled});
… …
798 $self->add ($self->{slider}); 854 $self->add ($self->{slider});
799 855
800 $self 856 $self
801} 857}
802 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
803#TODO# update range on size_allocate depeneing on child 868#TODO# update range on size_allocate depending on child
804# update viewport offset on scroll 869# update viewport offset on scroll
805 870
806############################################################################# 871#############################################################################
807 872
808package CFClient::UI::Frame; 873package CFClient::UI::Frame;
… …
812use CFClient::OpenGL; 877use CFClient::OpenGL;
813 878
814sub new { 879sub new {
815 my $class = shift; 880 my $class = shift;
816 881
817 my $self = $class->SUPER::new ( 882 $class->SUPER::new (
818 bg => [1, 1, 1, 1], 883 bg => undef,
819 border_bg => [1, 1, 1, 1],
820 border => 0.8,
821 @_ 884 @_,
822 ); 885 )
823
824 $self
825} 886}
826 887
827sub _draw { 888sub _draw {
828 my ($self) = @_; 889 my ($self) = @_;
829 890
830 my ($w, $h) = ($self->{w}, $self->{h}); 891 if ($self->{bg}) {
892 my ($w, $h) = @$self{qw(w h)};
831 893
832 glEnable GL_BLEND; 894 glEnable GL_BLEND;
833 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
834 glEnable GL_TEXTURE_2D; 896 glColor @{ $self->{bg} };
835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
836 897
837# glBegin GL_QUADS; 898 glBegin GL_QUADS;
838# glColor 0, 0, 0, 0;
839# glVertex 0 , 0; 899 glVertex 0 , 0;
840# glVertex 0 , $h; 900 glVertex 0 , $h;
841# glVertex $w, $h; 901 glVertex $w, $h;
842# glVertex $w, 0; 902 glVertex $w, 0;
843# glEnd; 903 glEnd;
844 904
845
846 $self->child->draw;
847 glDisable GL_BLEND; 905 glDisable GL_BLEND;
848 glDisable GL_TEXTURE_2D; 906 }
907
908 $self->SUPER::_draw;
849} 909}
850 910
851############################################################################# 911#############################################################################
852 912
853package CFClient::UI::FancyFrame; 913package CFClient::UI::FancyFrame;
… …
864 my $class = shift; 924 my $class = shift;
865 925
866 # TODO: user_x, user_y, overwrite moveto? 926 # TODO: user_x, user_y, overwrite moveto?
867 927
868 my $self = $class->SUPER::new ( 928 my $self = $class->SUPER::new (
869 bg => [1, 1, 1, 1], 929 bg => [1, 1, 1, 1],
870 border_bg => [1, 1, 1, 1], 930 border_bg => [1, 1, 1, 1],
871 border => 0.6, 931 border => 0.6,
932 is_toplevel => 1,
872 can_events => 1, 933 can_events => 1,
873 @_ 934 @_
874 ); 935 );
875 936
876 $self->{title} &&= new CFClient::UI::Label 937 $self->{title} &&= new CFClient::UI::Label
877 align => 0, 938 align => 0,
… …
901 my ($self, $w, $h) = @_; 962 my ($self, $w, $h) = @_;
902 963
903 $h -= List::Util::max 0, $self->border * 2; 964 $h -= List::Util::max 0, $self->border * 2;
904 $w -= List::Util::max 0, $self->border * 2; 965 $w -= List::Util::max 0, $self->border * 2;
905 966
906 $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)
907 if $self->{title}; 968 if $self->{title};
908 969
909 $self->child->configure ($self->border, $self->border, $w, $h); 970 $self->child->configure ($self->border, $self->border, $w, $h);
910} 971}
911 972
… …
969 my ($self) = @_; 1030 my ($self) = @_;
970 1031
971 my ($w, $h ) = ($self->{w}, $self->{h}); 1032 my ($w, $h ) = ($self->{w}, $self->{h});
972 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1033 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
973 1034
974 glEnable GL_BLEND;
975 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
976 glEnable GL_TEXTURE_2D; 1035 glEnable GL_TEXTURE_2D;
977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
978 1037
979 my $border = $self->border; 1038 my $border = $self->border;
980 1039
981 glColor @{ $self->{border_bg} }; 1040 glColor @{ $self->{border_bg} };
982 $tex[1]->draw_quad (0, 0, $w, $border); 1041 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
983 $tex[3]->draw_quad (0, $border, $border, $ch); 1042 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
984 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1043 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
985 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1044 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
986 1045
987 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1046 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
988 my $bg = $tex[0]; 1047 my $bg = $tex[0];
989 1048
990 # TODO: repeat texture not scale 1049 # TODO: repeat texture not scale
… …
994 glColor @{ $self->{bg} }; 1053 glColor @{ $self->{bg} };
995 1054
996 $bg->{s} = $rep_x; 1055 $bg->{s} = $rep_x;
997 $bg->{t} = $rep_y; 1056 $bg->{t} = $rep_y;
998 $bg->{wrap_mode} = 1; 1057 $bg->{wrap_mode} = 1;
999 $bg->draw_quad ($border, $border, $cw, $ch); 1058 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059 }
1000 1060
1001 glDisable GL_TEXTURE_2D; 1061 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND;
1003 }
1004 1062
1005 $self->{title}->draw if $self->{title}; 1063 $self->{title}->draw if $self->{title};
1006 1064
1007 $self->child->draw; 1065 $self->child->draw;
1008} 1066}
… …
1235} 1293}
1236 1294
1237sub size_allocate { 1295sub size_allocate {
1238 my ($self, $w, $h) = @_; 1296 my ($self, $w, $h) = @_;
1239 1297
1298 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1240 my $children = $self->{children}; 1300 my $children = $self->{children};
1241 1301
1242 my @h = map $_->{req_h}, @$children; 1302 my @h = map $_->{req_h}, @$children;
1243 1303
1244 my $req_h = List::Util::sum @h; 1304 my $req_h = List::Util::sum @h;
… …
1273 1333
1274############################################################################# 1334#############################################################################
1275 1335
1276package CFClient::UI::Label; 1336package CFClient::UI::Label;
1277 1337
1278our @ISA = CFClient::UI::Base::; 1338our @ISA = CFClient::UI::DrawBG::;
1279 1339
1280use CFClient::OpenGL; 1340use CFClient::OpenGL;
1281 1341
1282sub new { 1342sub new {
1283 my ($class, %arg) = @_; 1343 my ($class, %arg) = @_;
1284 1344
1285 my $self = $class->SUPER::new ( 1345 my $self = $class->SUPER::new (
1286 fg => [1, 1, 1], 1346 fg => [1, 1, 1],
1347 #bg => none
1348 #active_bg => none
1287 #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),
1288 fontsize => 1, 1355 fontsize => 1,
1289 text => "",
1290 align => -1, 1356 align => -1,
1291 valign => -1, 1357 valign => -1,
1292 padding => 2, 1358 padding => 2,
1293 layout => new CFClient::Layout,
1294 can_events => 0, 1359 can_events => 0,
1295 %arg 1360 %arg
1296 ); 1361 );
1297 1362
1298 if (exists $self->{template}) { 1363 if (exists $self->{template}) {
1299 my $layout = new CFClient::Layout; 1364 my $layout = new CFClient::Layout;
1300 $layout->set_text (delete $self->{template}); 1365 $layout->set_text (delete $self->{template});
1301 $self->{template} = $layout; 1366 $self->{template} = $layout;
1302 } 1367 }
1303 1368
1304 $self->set_text (delete $self->{text}) if exists $self->{text}; 1369 if (exists $self->{markup}) {
1305 $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 }
1306 1374
1307 $self 1375 $self
1308} 1376}
1309 1377
1310sub escape { 1378sub escape($) {
1311 local $_ = $_[1]; 1379 local $_ = $_[0];
1312 1380
1313 s/&/&amp;/g; 1381 s/&/&amp;/g;
1314 s/>/&gt;/g; 1382 s/>/&gt;/g;
1315 s/</&lt;/g; 1383 s/</&lt;/g;
1316 1384
1317 $_[1] 1385 $_
1318} 1386}
1319 1387
1320sub update { 1388sub update {
1321 my ($self) = @_; 1389 my ($self) = @_;
1322 1390
1323 delete $self->{texture}; 1391 delete $self->{texture};
1324 $self->SUPER::update; 1392 $self->SUPER::update;
1325} 1393}
1326 1394
1327sub reconfigure {
1328 my ($self) = @_;
1329
1330 delete $self->{texture};
1331}
1332
1333sub set_text { 1395sub set_text {
1334 my ($self, $text) = @_; 1396 my ($self, $text) = @_;
1335 1397
1336 return if $self->{text} eq "T$text"; 1398 return if $self->{text} eq "T$text";
1337 $self->{text} = "T$text"; 1399 $self->{text} = "T$text";
1338 1400
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1339 $self->{layout}->set_text ($text); 1402 $self->{layout}->set_text ($text);
1340 1403
1341 delete $self->{texture};
1342 $self->update; 1404 $self->update;
1343 $self->check_size; 1405 $self->check_size;
1344} 1406}
1345 1407
1346sub set_markup { 1408sub set_markup {
1347 my ($self, $markup) = @_; 1409 my ($self, $markup) = @_;
1348 1410
1349 return if $self->{text} eq "M$markup"; 1411 return if $self->{text} eq "M$markup";
1350 $self->{text} = "M$markup"; 1412 $self->{text} = "M$markup";
1351 1413
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415
1416 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1352 $self->{layout}->set_markup ($markup); 1417 $self->{layout}->set_markup ($markup);
1353 1418
1354 delete $self->{texture};
1355 $self->update; 1419 $self->update;
1356 $self->check_size; 1420 $self->check_size;
1357} 1421}
1358 1422
1359sub size_request { 1423sub size_request {
1360 my ($self) = @_; 1424 my ($self) = @_;
1361 1425
1362 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1363 $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});
1364 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1365 1431
1366 my ($w, $h) = $self->{layout}->size; 1432 my ($w, $h) = $self->{layout}->size;
1367 1433
1368 if (exists $self->{template}) { 1434 if (exists $self->{template}) {
… …
1390sub set_fontsize { 1456sub set_fontsize {
1391 my ($self, $fontsize) = @_; 1457 my ($self, $fontsize) = @_;
1392 1458
1393 $self->{fontsize} = $fontsize; 1459 $self->{fontsize} = $fontsize;
1394 delete $self->{texture}; 1460 delete $self->{texture};
1461
1462 $self->update;
1395 $self->check_size; 1463 $self->check_size;
1396 $self->update;
1397} 1464}
1398 1465
1399sub _draw { 1466sub _draw {
1400 my ($self) = @_; 1467 my ($self) = @_;
1401 1468
1469 $self->SUPER::_draw; # draw background, if applicable
1470
1402 my $tex = $self->{texture} ||= do { 1471 my $tex = $self->{texture} ||= do {
1472 $self->{layout}->set_foreground (@{$self->{fg}});
1403 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1473 $self->{layout}->set_font ($self->{font}) if $self->{font};
1404 $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});
1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478
1406 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
1407 }; 1490 };
1408 1491
1409 glEnable GL_BLEND;
1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411 glEnable GL_TEXTURE_2D; 1492 glEnable GL_TEXTURE_2D;
1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413 1494
1495 if ($tex->{format} == GL_ALPHA) {
1414 glColor @{$self->{fg}}; 1496 glColor @{$self->{fg}};
1415
1416 $self->{ox} = int (
1417 $self->{align} < 0 ? $self->{padding}
1418 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419 : ($self->{w} - $tex->{w}) * 0.5
1420 );
1421
1422 $self->{oy} = int (
1423 $self->{valign} < 0 ? $self->{padding}
1424 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425 : ($self->{h} - $tex->{h}) * 0.5
1426 );
1427
1428 $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 }
1429 1501
1430 glDisable GL_TEXTURE_2D; 1502 glDisable GL_TEXTURE_2D;
1431 glDisable GL_BLEND;
1432} 1503}
1433 1504
1434############################################################################# 1505#############################################################################
1435 1506
1436package CFClient::UI::EntryBase; 1507package CFClient::UI::EntryBase;
… …
1449 active_fg => [0, 0, 0], 1520 active_fg => [0, 0, 0],
1450 can_hover => 1, 1521 can_hover => 1,
1451 can_focus => 1, 1522 can_focus => 1,
1452 valign => 0, 1523 valign => 0,
1453 can_events => 1, 1524 can_events => 1,
1525 #text => ...
1454 @_ 1526 @_
1455 ) 1527 )
1456} 1528}
1457 1529
1458sub _set_text { 1530sub _set_text {
… …
1468 $self->{text} = $text; 1540 $self->{text} = $text;
1469 1541
1470 $text =~ s/./*/g if $self->{hidden}; 1542 $text =~ s/./*/g if $self->{hidden};
1471 $self->{layout}->set_text ("$text "); 1543 $self->{layout}->set_text ("$text ");
1472 1544
1473 $self->emit (changed => $self->{text}); 1545 $self->_emit (changed => $self->{text});
1474}
1475
1476sub get_text {
1477 $_[0]{text}
1478}
1479
1480sub size_request {
1481 my ($self) = @_;
1482
1483 my ($w, $h) = $self->SUPER::size_request;
1484
1485 ($w + 1, $h) # add 1 for cursor
1486}
1487
1488sub size_allocate {
1489 my ($self, $w, $h) = @_;
1490
1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492} 1546}
1493 1547
1494sub set_text { 1548sub set_text {
1495 my ($self, $text) = @_; 1549 my ($self, $text) = @_;
1496 1550
1497 $self->{cursor} = length $text; 1551 $self->{cursor} = length $text;
1498 $self->_set_text ($text); 1552 $self->_set_text ($text);
1499 $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
1500} 1573}
1501 1574
1502sub key_down { 1575sub key_down {
1503 my ($self, $ev) = @_; 1576 my ($self, $ev) = @_;
1504 1577
… …
1506 my $sym = $ev->{sym}; 1579 my $sym = $ev->{sym};
1507 my $uni = $ev->{unicode}; 1580 my $uni = $ev->{unicode};
1508 1581
1509 my $text = $self->get_text; 1582 my $text = $self->get_text;
1510 1583
1511 if ($sym == 8) { 1584 if ($uni == 8) {
1512 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1585 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513 } elsif ($sym == 127) { 1586 } elsif ($uni == 127) {
1514 substr $text, $self->{cursor}, 1, ""; 1587 substr $text, $self->{cursor}, 1, "";
1515 } elsif ($sym == CFClient::SDLK_LEFT) { 1588 } elsif ($sym == CFClient::SDLK_LEFT) {
1516 --$self->{cursor} if $self->{cursor}; 1589 --$self->{cursor} if $self->{cursor};
1517 } elsif ($sym == CFClient::SDLK_RIGHT) { 1590 } elsif ($sym == CFClient::SDLK_RIGHT) {
1518 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1591 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1519 } elsif ($sym == CFClient::SDLK_HOME) { 1592 } elsif ($sym == CFClient::SDLK_HOME) {
1520 $self->{cursor} = 0; 1593 $self->{cursor} = 0;
1521 } elsif ($sym == CFClient::SDLK_END) { 1594 } elsif ($sym == CFClient::SDLK_END) {
1522 $self->{cursor} = length $text; 1595 $self->{cursor} = length $text;
1523 } elsif ($sym == 27) { 1596 } elsif ($uni == 27) {
1524 $self->emit ('escape'); 1597 $self->_emit ('escape');
1525 } elsif ($uni) { 1598 } elsif ($uni) {
1526 substr $text, $self->{cursor}++, 0, chr $uni; 1599 substr $text, $self->{cursor}++, 0, chr $uni;
1527 } 1600 }
1528 1601
1529 $self->_set_text ($text); 1602 $self->_set_text ($text);
1530 $self->update; 1603 $self->update;
1604 $self->check_size;
1531} 1605}
1532 1606
1533sub focus_in { 1607sub focus_in {
1534 my ($self) = @_; 1608 my ($self) = @_;
1535 1609
… …
1615 if ($sym == 13) { 1689 if ($sym == 13) {
1616 unshift @{$self->{history}}, 1690 unshift @{$self->{history}},
1617 my $txt = $self->get_text; 1691 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1; 1692 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = ''; 1693 $self->{history_saveback} = '';
1620 $self->emit (activate => $txt); 1694 $self->_emit (activate => $txt);
1621 $self->update; 1695 $self->update;
1622 1696
1623 } elsif ($sym == CFClient::SDLK_UP) { 1697 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) { 1698 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text; 1699 $self->{history_saveback} = $self->get_text;
… …
1664 my $class = shift; 1738 my $class = shift;
1665 1739
1666 $class->SUPER::new ( 1740 $class->SUPER::new (
1667 padding => 4, 1741 padding => 4,
1668 fg => [1, 1, 1], 1742 fg => [1, 1, 1],
1669 bg => [1, 1, 1, 0.2],
1670 active_fg => [0, 0, 1], 1743 active_fg => [0, 0, 1],
1671 can_hover => 1, 1744 can_hover => 1,
1672 align => 0, 1745 align => 0,
1673 valign => 0, 1746 valign => 0,
1674 can_events => 1, 1747 can_events => 1,
1675 @_ 1748 @_
1676 ) 1749 )
1677} 1750}
1678 1751
1752sub activate { }
1753
1679sub button_up { 1754sub button_up {
1680 my ($self, $ev, $x, $y) = @_; 1755 my ($self, $ev, $x, $y) = @_;
1681 1756
1757 $self->emit ("activate")
1682 if ($x >= 0 && $x < $self->{w} 1758 if $x >= 0 && $x < $self->{w}
1683 && $y >= 0 && $y < $self->{h}) { 1759 && $y >= 0 && $y < $self->{h};
1684 $self->emit ("activate");
1685 }
1686} 1760}
1687 1761
1688sub _draw { 1762sub _draw {
1689 my ($self) = @_; 1763 my ($self) = @_;
1690 1764
… …
1692 1766
1693 if ($GRAB == $self) { 1767 if ($GRAB == $self) {
1694 $self->{fg} = $self->{active_fg}; 1768 $self->{fg} = $self->{active_fg};
1695 } 1769 }
1696 1770
1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D; 1771 glEnable GL_TEXTURE_2D;
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1; 1773 glColor 0, 0, 0, 1;
1702 1774
1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1775 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704 1776
1705 glDisable GL_TEXTURE_2D; 1777 glDisable GL_TEXTURE_2D;
1706 glDisable GL_BLEND;
1707 1778
1708 $self->SUPER::_draw; 1779 $self->SUPER::_draw;
1709} 1780}
1710 1781
1711############################################################################# 1782#############################################################################
… …
1725 1796
1726 $class->SUPER::new ( 1797 $class->SUPER::new (
1727 padding => 2, 1798 padding => 2,
1728 fg => [1, 1, 1], 1799 fg => [1, 1, 1],
1729 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],
1730 state => 0, 1803 state => 0,
1731 can_hover => 1, 1804 can_hover => 1,
1732 @_ 1805 @_
1733 ) 1806 )
1734} 1807}
… …
1743 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1744 1817
1745 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1746 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1747 $self->{state} = !$self->{state}; 1820 $self->{state} = !$self->{state};
1748 $self->emit (changed => $self->{state}); 1821 $self->_emit (changed => $self->{state});
1749 } 1822 }
1750} 1823}
1751 1824
1752sub _draw { 1825sub _draw {
1753 my ($self) = @_; 1826 my ($self) = @_;
… …
1758 1831
1759 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;
1760 1833
1761 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1834 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762 1835
1763 glEnable GL_BLEND; 1836 my $tex = $self->{state} ? $tex[1] : $tex[0];
1837
1764 glEnable GL_TEXTURE_2D; 1838 glEnable GL_TEXTURE_2D;
1765 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767 my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769 $tex->draw_quad (0, 0, $s, $s); 1839 $tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1772 glDisable GL_BLEND;
1773} 1841}
1774 1842
1775############################################################################# 1843#############################################################################
1776 1844
1777package CFClient::UI::Image; 1845package CFClient::UI::Image;
… …
1820 glTranslate 0, -$self->{w}, 0; 1888 glTranslate 0, -$self->{w}, 0;
1821 1889
1822 ($w, $h) = ($h, $w); 1890 ($w, $h) = ($h, $w);
1823 } 1891 }
1824 1892
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D; 1893 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 1895
1830 $tex->draw_quad (0, 0, $w, $h); 1896 $tex->draw_quad_alpha (0, 0, $w, $h);
1831 1897
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D; 1898 glDisable GL_TEXTURE_2D;
1834} 1899}
1835 1900
1836############################################################################# 1901#############################################################################
1837 1902
… …
2026 qw(s1_slider.png s1_slider_bg.png); 2091 qw(s1_slider.png s1_slider_bg.png);
2027 2092
2028sub new { 2093sub new {
2029 my $class = shift; 2094 my $class = shift;
2030 2095
2031 # range [value, low, high, page] 2096 # range [value, low, high, page, unit]
2032 2097
2033 # TODO: 0-width page 2098 # TODO: 0-width page
2034 # TODO: req_w/h are wrong with vertical 2099 # TODO: req_w/h are wrong with vertical
2035 # TODO: calculations are off 2100 # TODO: calculations are off
2036 my $self = $class->SUPER::new ( 2101 my $self = $class->SUPER::new (
2037 fg => [1, 1, 1], 2102 fg => [1, 1, 1],
2038 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],
2039 range => [0, 0, 100, 10], 2106 range => [0, 0, 100, 10, 0],
2040 req_w => $::WIDTH / 80, 2107 req_w => $::WIDTH / 80,
2041 req_h => $::WIDTH / 80, 2108 req_h => $::WIDTH / 80,
2042 vertical => 0, 2109 vertical => 0,
2043 can_hover => 1, 2110 can_hover => 1,
2044 inner_pad => 5, 2111 inner_pad => 0.02,
2045 @_ 2112 @_
2046 ); 2113 );
2047 2114
2115 $self->set_value ($self->{range}[0]);
2116 $self->update;
2117
2048 $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 }
2049} 2150}
2050 2151
2051sub size_request { 2152sub size_request {
2052 my ($self) = @_; 2153 my ($self) = @_;
2053 2154
… …
2059 2160
2060sub button_down { 2161sub button_down {
2061 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
2062 2163
2063 $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
2064 $self->mouse_motion ($ev, $x, $y); 2168 $self->mouse_motion ($ev, $x, $y);
2065} 2169}
2066 2170
2067sub mouse_motion { 2171sub mouse_motion {
2068 my ($self, $ev, $x, $y) = @_; 2172 my ($self, $ev, $x, $y) = @_;
2069 2173
2070 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
2071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2191 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100;
2072 2193
2073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2194 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074 2195
2075 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2196 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2076 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2197 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077 2198
2078 $x -= $inner_pad_px; # substract the padding 2199 $value = ($value - $lo) / $range;
2079 $x = $x * ($hi - $lo) / $inner_w + $lo; 2200 $value = $value * $self->{scale} + $self->{offset};
2080 $x = $lo if $x < $lo;
2081 $x = $hi - $page if $x > $hi - $page;
2082 $self->{range}[0] = $x;
2083 2201
2084 $self->emit (changed => $x); 2202 $self->{knob_x} = $value - $knob_w * 0.5;
2085 $self->update; 2203 $self->{knob_w} = $knob_w;
2086 } 2204 });
2087}
2088 2205
2089# the inner_* stuff is for generating a padding for the slider handle, 2206 $self->SUPER::update;
2090# so that the handle doesn't leave the texture. This calculation isn't 100%
2091# correct propably, but it does the job for now
2092sub _calc_inner_pad_px {
2093 my ($self, $w) = @_;
2094 ($w / 100) * $self->{inner_pad} # % to pixels
2095} 2207}
2096 2208
2097sub _draw { 2209sub _draw {
2098 my ($self) = @_; 2210 my ($self) = @_;
2099 2211
2100 $self->SUPER::_draw (); 2212 $self->SUPER::_draw ();
2101 2213
2102 my ($w, $h) = @$self{qw(w h)}; 2214 glScale $self->{w}, $self->{h};
2103 2215
2104 if ($self->{vertical}) { 2216 if ($self->{vertical}) {
2105 # draw a vertical slider like a rotated horizontal slider 2217 # draw a vertical slider like a rotated horizontal slider
2106 2218
2219 glTranslate 1, 0, 0;
2107 glRotate 90, 0, 0, 1; 2220 glRotate 90, 0, 0, 1;
2108 glTranslate 0, -$self->{w}, 0;
2109
2110 ($w, $h) = ($h, $w);
2111 } 2221 }
2112 2222
2113 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2223 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2224 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115 2225
2116 my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118 $hi = $value + 1 if $lo == $hi;
2119
2120 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123 $page = int $page * $inner_w / ($hi - $lo);
2124 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126 $w -= $page;
2127 $page &= ~1;
2128 glTranslate $page * 0.5, 0, 0;
2129 $page ||= 2;
2130
2131 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134 glEnable GL_BLEND;
2135 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136 glEnable GL_TEXTURE_2D; 2226 glEnable GL_TEXTURE_2D;
2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2227 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138 2228
2139 # draw background 2229 # draw background
2140 $tex[1]->draw_quad (0, 0, $w, $h); 2230 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141 2231
2142 # draw handle 2232 # draw handle
2143 $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);
2144 2234
2145 glDisable GL_BLEND;
2146 glDisable GL_TEXTURE_2D; 2235 glDisable GL_TEXTURE_2D;
2147} 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 (@_) }
2148 2278
2149############################################################################# 2279#############################################################################
2150 2280
2151package CFClient::UI::TextView; 2281package CFClient::UI::TextView;
2152 2282
… …
2161 fontsize => 1, 2291 fontsize => 1,
2162 can_events => 0, 2292 can_events => 0,
2163 #font => default_font 2293 #font => default_font
2164 @_, 2294 @_,
2165 2295
2166 layout => (new CFClient::Layout), 2296 layout => (new CFClient::Layout 1),
2167 par => [], 2297 par => [],
2168 height => 0, 2298 height => 0,
2169 children => [ 2299 children => [
2170 (new CFClient::UI::Empty expand => 1), 2300 (new CFClient::UI::Empty expand => 1),
2171 (new CFClient::UI::Slider vertical => 1), 2301 (new CFClient::UI::Slider vertical => 1),
… …
2182 2312
2183 $self->{fontsize} = $fontsize; 2313 $self->{fontsize} = $fontsize;
2184 $self->reflow; 2314 $self->reflow;
2185} 2315}
2186 2316
2187sub text_height {
2188 my ($self, $text) = @_;
2189
2190 my $layout = $self->{layout};
2191
2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $layout->set_width ($self->{children}[0]{w});
2194 $layout->set_text ($text);
2195
2196 ($layout->size)[1]
2197}
2198
2199sub reflow {
2200 my ($self) = @_;
2201
2202 $self->{need_reflow}++;
2203 $self->update;
2204}
2205
2206sub size_allocate { 2317sub size_allocate {
2207 my ($self, $w, $h) = @_; 2318 my ($self, $w, $h) = @_;
2208 2319
2209 $self->SUPER::size_allocate ($w, $h); 2320 $self->SUPER::size_allocate ($w, $h);
2210 2321
… …
2213 $self->{layout}->set_width ($self->{children}[0]{w}); 2324 $self->{layout}->set_width ($self->{children}[0]{w});
2214 2325
2215 $self->reflow; 2326 $self->reflow;
2216} 2327}
2217 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
2218sub add_paragraph { 2363sub add_paragraph {
2219 my ($self, $color, $text) = @_; 2364 my ($self, $color, $text, $indent) = @_;
2220 2365
2221 #TODO: intelligently "reformat" paragraph 2366 for my $line (split /\n/, $text) {
2222 2367 my ($w, $h) = $self->text_size ($line);
2223 my $height = $self->text_height ($text);
2224
2225 $self->{height} += $height; 2368 $self->{height} += $h;
2369 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2370 }
2226 2371
2227 push @{$self->{par}}, [$height, $color, $text];
2228
2229 $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]);
2230 $self->{children}[1]->update;
2231} 2373}
2232 2374
2233sub update { 2375sub update {
2234 my ($self) = @_; 2376 my ($self) = @_;
2235 2377
… …
2237 2379
2238 return unless $self->{h} > 0; 2380 return unless $self->{h} > 0;
2239 2381
2240 delete $self->{texture}; 2382 delete $self->{texture};
2241 2383
2242 $ROOT->on_refresh ($self, sub { 2384 $ROOT->on_post_alloc ($self, sub {
2385 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2386
2243 if (delete $self->{need_reflow}) { 2387 if (delete $self->{need_reflow}) {
2244 my $height = 0; 2388 my $height = 0;
2245 2389
2246 $height += $_->[0] = $self->text_height ($_->[2]) 2390 my $layout = $self->{layout};
2391
2392 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2393
2247 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 }
2248 2405
2249 $self->{height} = $height; 2406 $self->{height} = $height;
2250 2407
2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2408 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2252 2409
2253 delete $self->{texture}; 2410 delete $self->{texture};
2254 } 2411 }
2255 2412
2256 $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 {
2257 glClearColor 0, 0, 0, 0; 2414 glClearColor 0.5, 0.5, 0.5, 0;
2258 glClear GL_COLOR_BUFFER_BIT; 2415 glClear GL_COLOR_BUFFER_BIT;
2259 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
2260 glEnable GL_BLEND; 2428 glEnable GL_BLEND;
2429 #TODO# not correct in windows where rgba is forced off
2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2430 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2262 glEnable GL_TEXTURE_2D;
2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264
2265 my $top = int $self->{children}[1]{range}[0];
2266
2267 my $y0 = $top;
2268 my $y1 = $top + $self->{h};
2269
2270 my $y = 0;
2271
2272 my $layout = $self->{layout};
2273
2274 $layout->set_font ($self->{font}) if $self->{font};
2275 2431
2276 for my $par (@{$self->{par}}) { 2432 for my $par (@{$self->{par}}) {
2277 my $h = $par->[0]; 2433 my $h = $par->[1];
2278 2434
2279 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]);
2280 $layout->set_text ($par->[2]); 2438 $layout->set_markup ($par->[4]);
2281 2439
2282 glColor @{ $par->[1] }; 2440 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283 my ($W, $H) = $layout->size; 2441
2284 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;
2285 } 2444 }
2286 2445
2287 $y += $h; 2446 $y += $h;
2288 } 2447 }
2289 2448
2290 glDisable GL_TEXTURE_2D;
2291 glDisable GL_BLEND; 2449 glDisable GL_BLEND;
2292 }; 2450 };
2293 }); 2451 });
2294} 2452}
2295 2453
2296sub _draw { 2454sub _draw {
2297 my ($self) = @_; 2455 my ($self) = @_;
2298 2456
2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301 glEnable GL_TEXTURE_2D; 2457 glEnable GL_TEXTURE_2D;
2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1; 2459 glColor 1, 1, 1, 1;
2304 $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});
2305 glDisable GL_TEXTURE_2D; 2461 glDisable GL_TEXTURE_2D;
2306 glDisable GL_BLEND;
2307 2462
2308 $self->{children}[1]->draw; 2463 $self->{children}[1]->draw;
2309 2464
2310} 2465}
2311 2466
… …
2379 2534
2380 # TODO: use animation 2535 # TODO: use animation
2381 if ($self->{state} = !$self->{state}) { 2536 if ($self->{state} = !$self->{state}) {
2382 $CFClient::UI::ROOT->add ($self->{other}); 2537 $CFClient::UI::ROOT->add ($self->{other});
2383 $self->{other}->move ($self->coord2global (0, $self->{h})); 2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2384 $self->emit ("open"); 2539 $self->_emit ("open");
2385 } else { 2540 } else {
2386 $CFClient::UI::ROOT->remove ($self->{other}); 2541 $CFClient::UI::ROOT->remove ($self->{other});
2387 $self->emit ("close"); 2542 $self->_emit ("close");
2388 } 2543 }
2389 2544
2390 $self->emit (changed => $self->{state}); 2545 $self->_emit (changed => $self->{state});
2391} 2546}
2392 2547
2393############################################################################# 2548#############################################################################
2394 2549
2395package CFClient::UI::Tooltip; 2550package CFClient::UI::Tooltip;
… …
2405 @_, 2560 @_,
2406 can_events => 0, 2561 can_events => 0,
2407 ) 2562 )
2408} 2563}
2409 2564
2410sub set_markup { 2565sub set_tooltip_from {
2411 my ($self, $text) = @_; 2566 my ($self, $widget) = @_;
2412 2567
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2568 $self->add (new CFClient::UI::Label
2414 $self->{label}->set_markup ($text); 2569 markup => $widget->{tooltip},
2415 $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 );
2416} 2576}
2417 2577
2418sub size_request { 2578sub size_request {
2419 my ($self) = @_; 2579 my ($self) = @_;
2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422 2580
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2581 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424 2582
2425 ($w + 4, $h + 4) 2583 ($w + 4, $h + 4)
2426} 2584}
… …
2432} 2590}
2433 2591
2434sub _draw { 2592sub _draw {
2435 my ($self) = @_; 2593 my ($self) = @_;
2436 2594
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375; 2595 glTranslate 0.375, 0.375;
2439 2596
2440 my ($w, $h) = @$self{qw(w h)}; 2597 my ($w, $h) = @$self{qw(w h)};
2441 2598
2442 glColor 1, 0.8, 0.4; 2599 glColor 1, 0.8, 0.4;
… …
2453 glVertex 0 , $h; 2610 glVertex 0 , $h;
2454 glVertex $w, $h; 2611 glVertex $w, $h;
2455 glVertex $w, 0; 2612 glVertex $w, 0;
2456 glEnd; 2613 glEnd;
2457 2614
2458 glPopMatrix; 2615 glTranslate 2 - 0.375, 2 - 0.375;
2459
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw; 2616 $self->SUPER::_draw;
2462} 2617}
2463 2618
2464############################################################################# 2619#############################################################################
2465 2620
… …
2470use CFClient::OpenGL; 2625use CFClient::OpenGL;
2471 2626
2472sub new { 2627sub new {
2473 my $class = shift; 2628 my $class = shift;
2474 2629
2475 $class->SUPER::new ( 2630 my $self = $class->SUPER::new (
2476 aspect => 1, 2631 aspect => 1,
2477 @_, 2632 @_,
2478 ) 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
2479} 2650}
2480 2651
2481sub size_request { 2652sub size_request {
2482 (32, 8) 2653 (32, 8)
2483} 2654}
2484 2655
2656sub update {
2657 my ($self) = @_;
2658
2659 return unless $self->{visible};
2660
2661 $self->SUPER::update;
2662}
2663
2485sub _draw { 2664sub _draw {
2486 my ($self) = @_; 2665 my ($self) = @_;
2487 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
2488 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2678 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2489 2679
2490 # TODO animation
2491 if ($tex) { 2680 if ($tex) {
2492 glEnable GL_BLEND;
2493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2494 glEnable GL_TEXTURE_2D; 2681 glEnable GL_TEXTURE_2D;
2495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2496 glColor 1, 1, 1, 1; 2683 glColor 1, 1, 1, 1;
2497 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2684 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2498 glDisable GL_TEXTURE_2D; 2685 glDisable GL_TEXTURE_2D;
2499 glDisable GL_BLEND;
2500 } 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});
2501} 2859}
2502 2860
2503############################################################################# 2861#############################################################################
2504 2862
2505package CFClient::UI::Menu; 2863package CFClient::UI::Menu;
… …
2540 2898
2541# 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)
2542sub popup { 2900sub popup {
2543 my ($self, $ev) = @_; 2901 my ($self, $ev) = @_;
2544 2902
2545 $self->emit ("popdown"); 2903 $self->_emit ("popdown");
2546 2904
2547 # maybe save $GRAB? must be careful about events... 2905 # maybe save $GRAB? must be careful about events...
2548 $GRAB = $self; 2906 $GRAB = $self;
2549 $self->{button} = $ev->{button}; 2907 $self->{button} = $ev->{button};
2550 2908
… …
2565 2923
2566 if ($ev->{button} == $self->{button}) { 2924 if ($ev->{button} == $self->{button}) {
2567 undef $GRAB; 2925 undef $GRAB;
2568 $self->hide; 2926 $self->hide;
2569 2927
2570 $self->emit ("popdown"); 2928 $self->_emit ("popdown");
2571 $self->{hover}[1]->() if $self->{hover}; 2929 $self->{hover}[1]->() if $self->{hover};
2572 } 2930 }
2573} 2931}
2574 2932
2575############################################################################# 2933#############################################################################
2576 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
2577package CFClient::UI::Root; 3043package CFClient::UI::Root;
2578 3044
2579our @ISA = CFClient::UI::Container::; 3045our @ISA = CFClient::UI::Container::;
2580 3046
2581use CFClient::OpenGL; 3047use CFClient::OpenGL;
2582 3048
2583sub check_size { 3049sub new {
2584 my ($self) = @_; 3050 my $class = shift;
2585 3051
2586 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3052 $class->SUPER::new (
2587} 3053 @_,
2588 3054 )
2589sub size_request {
2590 ($::WIDTH, $::HEIGHT)
2591} 3055}
2592 3056
2593sub configure { 3057sub configure {
2594 my ($self, $x, $y, $w, $h) = @_; 3058 my ($self, $x, $y, $w, $h) = @_;
2595 3059
2596 $self->SUPER::configure ($x, $y, $w, $h); 3060 $self->{w} = $w;
3061 $self->{h} = $h;
3062}
2597 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
2598 for my $child (@{$self->{children}}) { 3080 for my $child ($self->children) {
2599 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)};
2600 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
2601 $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;
2602 $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
2603 $child->configure ($X, $Y, $W,$H); 3092 $child->configure ($X, $Y, $W, $H);
2604 } 3093 }
2605} 3094}
2606 3095
2607sub _topleft { 3096sub coord2local {
2608 my ($self, $x, $y) = @_; 3097 my ($self, $x, $y) = @_;
2609 3098
2610 ($x, $y) 3099 ($x, $y)
2611} 3100}
2612 3101
3102sub coord2global {
3103 my ($self, $x, $y) = @_;
3104
3105 ($x, $y)
3106}
3107
2613sub update { 3108sub update {
2614 my ($self) = @_; 3109 my ($self) = @_;
2615 3110
2616 $self->check_size; 3111 $self->check_size;
2617 ::refresh (); 3112 $::WANT_REFRESH++;
2618} 3113}
2619 3114
2620sub add { 3115sub add {
2621 my ($self, $child) = @_; 3116 my ($self, @children) = @_;
2622 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
2623 # integerize window positions 3127 # integerise window positions
2624 $child->{x} = int $child->{x}; 3128 $child->{x} = int $child->{x};
2625 $child->{y} = int $child->{y}; 3129 $child->{y} = int $child->{y};
3130 }
2626 3131
2627 $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 }
2628} 3145}
2629 3146
2630sub on_refresh { 3147sub on_refresh {
2631 my ($self, $id, $cb) = @_; 3148 my ($self, $id, $cb) = @_;
2632 3149
2633 $self->{refresh_hook}{$id} = $cb; 3150 $self->{refresh_hook}{$id} = $cb;
2634} 3151}
2635 3152
3153sub on_post_alloc {
3154 my ($self, $id, $cb) = @_;
3155
3156 $self->{post_alloc_hook}{$id} = $cb;
3157}
3158
2636sub draw { 3159sub draw {
2637 my ($self) = @_; 3160 my ($self) = @_;
2638 3161
2639 while (my $rcb = delete $self->{refresh_hook}) { 3162 while ($self->{refresh_hook}) {
2640 $_->() 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}};
2641 } 3214 }
2642 3215
2643 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3216 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2644 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2645 glClear GL_COLOR_BUFFER_BIT; 3218 glClear GL_COLOR_BUFFER_BIT;
2646 3219
2647 glMatrixMode GL_PROJECTION; 3220 glMatrixMode GL_PROJECTION;
2648 glLoadIdentity; 3221 glLoadIdentity;
2649 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2650 glMatrixMode GL_MODELVIEW; 3223 glMatrixMode GL_MODELVIEW;
2651 glLoadIdentity; 3224 glLoadIdentity;
2652 3225
2653 $self->_draw; 3226 $self->_draw;
2654} 3227}
2655 3228
2656############################################################################# 3229#############################################################################
2657 3230
2658package CFClient::UI::InventoryItem;
2659
2660our @ISA = CFClient::UI::HBox::;
2661
2662sub new {
2663 my $class = shift;
2664
2665 my %args = @_;
2666
2667 my $item = $args{item};
2668
2669 my $desc = $item->{nrof} < 2
2670 ? $item->{name}
2671 : "$item->{nrof} $item->{name_pl}";
2672
2673
2674 my $self = $class->SUPER::new (
2675 can_hover => 1,
2676 can_events => 1,
2677 tooltip => (CFClient::UI::Label->escape ($desc)
2678 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2679 connect_button_down => sub {
2680 my ($self, $ev, $x, $y) = @_;
2681
2682 # todo: maybe put examine on 1? but should just be a tooltip :(
2683 if ($ev->{button} == 1) {
2684 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2685 } elsif ($ev->{button} == 2) {
2686 $::CONN->send ("apply $item->{tag}");
2687 } elsif ($ev->{button} == 3) {
2688 CFClient::UI::Menu->new (
2689 items => [
2690 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2691 [
2692 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2693 sub { $::CONN->send ("lock $item->{tag}") },
2694 ],
2695 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2696 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2697 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2698 ],
2699 )->popup ($ev);
2700 }
2701
2702 1
2703 },
2704 %args
2705 );
2706 $self->add(new CFClient::UI::Face
2707 can_events => 0,
2708 face => $item->{face},
2709 anim => $item->{anim},
2710 animspeed => $item->{animspeed});
2711 $self->add(new CFClient::UI::Label
2712 can_events => 0,
2713 text => $desc);
2714
2715 $self
2716}
2717
2718#############################################################################
2719
2720package CFClient::UI::Inventory;
2721
2722our @ISA = CFClient::UI::ScrolledWindow::;
2723
2724sub new {
2725 my $class = shift;
2726
2727 my $self = $class->SUPER::new (
2728 scrolled => (new CFClient::UI::VBox),
2729 @_,
2730 );
2731
2732 $self
2733}
2734
2735sub set_items {
2736 my ($self, $items) = @_;
2737
2738 $self->{scrolled}->clear;
2739 return unless $items;
2740
2741 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2742
2743 $self->{real_items} = \@items;
2744
2745 for my $item (@items) {
2746 my $desc = $item->{nrof} < 2
2747 ? $item->{name}
2748 : "$item->{nrof} $item->{name_pl}";
2749
2750 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760
2761#############################################################################
2762
2763package CFClient::UI; 3231package CFClient::UI;
2764 3232
2765$ROOT = new CFClient::UI::Root; 3233$ROOT = new CFClient::UI::Root;
2766$TOOLTIP = new CFClient::UI::Tooltip; 3234$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2767 3235
27681 32361
2769 3237

Diff Legend

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