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.239 by root, Thu May 25 22:29:57 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 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
401} 471}
402 472
403sub check_size { 473sub check_size {
404 my ($self) = @_; 474 my ($self, $forced) = @_;
405 475
406 $self->{parent} 476 $self->{force_alloc} = 1 if $forced;
407 or return 1; 477 $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} 478}
428 479
429sub update { 480sub update {
430 my ($self) = @_; 481 my ($self) = @_;
431 482
… …
437 my ($self, $signal, $cb) = @_; 488 my ($self, $signal, $cb) = @_;
438 489
439 push @{ $self->{signal_cb}{$signal} }, $cb; 490 push @{ $self->{signal_cb}{$signal} }, $cb;
440} 491}
441 492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
442sub emit { 499sub emit {
443 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
444 501
445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
446} 504}
447 505
448sub DESTROY { 506sub DESTROY {
449 my ($self) = @_; 507 my ($self) = @_;
450 508
509 delete $WIDGET{$self+0};
451 #$self->deactivate; 510 #$self->deactivate;
452} 511}
453 512
454############################################################################# 513#############################################################################
455 514
… …
464 my $class = shift; 523 my $class = shift;
465 524
466 # range [value, low, high, page] 525 # range [value, low, high, page]
467 526
468 $class->SUPER::new ( 527 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 528 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 529 #active_bg => [1, 1, 1, 0.5],
471 @_ 530 @_
472 ) 531 )
473} 532}
474 533
475sub _draw { 534sub _draw {
476 my ($self) = @_; 535 my ($self) = @_;
477 536
537 my $color = $FOCUS == $self && $self->{active_bg}
538 ? $self->{active_bg}
539 : $self->{bg};
540
541 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 542 my ($w, $h) = @$self{qw(w h)};
479 543
480 glEnable GL_BLEND; 544 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 546 glColor @$color;
483 547
484 glBegin GL_QUADS; 548 glBegin GL_QUADS;
485 glVertex 0 , 0; 549 glVertex 0 , 0;
486 glVertex 0 , $h; 550 glVertex 0 , $h;
487 glVertex $w, $h; 551 glVertex $w, $h;
488 glVertex $w, 0; 552 glVertex $w, 0;
489 glEnd; 553 glEnd;
490 554
491 glDisable GL_BLEND; 555 glDisable GL_BLEND;
556 }
492} 557}
493 558
494############################################################################# 559#############################################################################
495 560
496package CFClient::UI::Empty; 561package CFClient::UI::Empty;
… …
528 593
529 $self 594 $self
530} 595}
531 596
532sub add { 597sub add {
533 my ($self, $child) = @_; 598 my ($self, @widgets) = @_;
534 599
535 $child->set_parent ($self); 600 $_->set_parent ($self)
601 for @widgets;
536 602
537 use sort 'stable'; 603 use sort 'stable';
538 604
539 $self->{children} = [ 605 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 606 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 607 @{$self->{children}}, @widgets
542 ]; 608 ];
543 609
544 $child->check_size; 610 $self->check_size (1);
545 $self->update; 611 $self->update;
546} 612}
547 613
548sub children { 614sub children {
549 @{ $_[0]{children} } 615 @{ $_[0]{children} }
… …
555 delete $child->{parent}; 621 delete $child->{parent};
556 $child->hide; 622 $child->hide;
557 623
558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559 625
560 $self->check_size; 626 $self->check_size (1);
561 $self->update; 627 $self->update;
562} 628}
563 629
564sub clear { 630sub clear {
565 my ($self) = @_; 631 my ($self) = @_;
… …
656} 722}
657 723
658sub update { 724sub update {
659 my ($self) = @_; 725 my ($self) = @_;
660 726
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 727 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 728 $self->SUPER::update;
663} 729}
664 730
665sub size_allocate { 731sub size_allocate {
666 my ($self, $w, $h) = @_; 732 my ($self, $w, $h) = @_;
… …
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0; 746 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT; 747 glClear GL_COLOR_BUFFER_BIT;
682 748
683 $self->_render; 749 $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 }; 750 };
692} 751}
693 752
694sub _draw { 753sub _draw {
695 my ($self) = @_; 754 my ($self) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 756 my ($w, $h) = ($self->w, $self->h);
698 757
699 my $tex = $self->{texture} 758 my $tex = $self->{texture}
700 or return; 759 or return;
701 760
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 761 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 763 glColor 1, 1, 1, 1;
707 764
708 $tex->draw_quad (0, 0, $w, $h); 765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 766
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 767 glDisable GL_TEXTURE_2D;
712} 768}
713 769
714############################################################################# 770#############################################################################
715 771
716package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
717 773
718our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
719 775
776sub new {
777 my $class = shift;
778
779 $class->SUPER::new (
780 scroll_x => 0,
781 scroll_y => 1,
782 @_,
783 )
784}
785
720sub size_request { 786sub size_request {
721 my ($self) = @_; 787 my ($self) = @_;
722 788
723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 789 @$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 790
726 @$self{qw(child_w child_h)} 791 @$self{qw(child_w child_h)}
727} 792}
728 793
729sub size_allocate { 794sub size_allocate {
730 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
731 796
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799
800 $self->child->configure (0, 0, $w, $h);
732 $self->update; 801 $self->update;
733} 802}
734 803
735sub set_offset { 804sub set_offset {
736 my ($self, $x, $y) = @_; 805 my ($self, $x, $y) = @_;
… …
739 $self->{view_y} = int $y; 808 $self->{view_y} = int $y;
740 809
741 $self->update; 810 $self->update;
742} 811}
743 812
744# hmm, this does not work for topleft of $self... but we should not aks for that 813# hmm, this does not work for topleft of $self... but we should not ask for that
745sub _topleft { 814sub coord2local {
746 my ($self, $x, $y) = @_; 815 my ($self, $x, $y) = @_;
747 816
748 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 817 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
818}
819
820sub coord2global {
821 my ($self, $x, $y) = @_;
822
823 $x = List::Util::min $self->{w}, $x - $self->{view_x};
824 $y = List::Util::min $self->{h}, $y - $self->{view_y};
825
826 $self->SUPER::coord2global ($x, $y)
749} 827}
750 828
751sub find_widget { 829sub find_widget {
752 my ($self, $x, $y) = @_; 830 my ($self, $x, $y) = @_;
753 831
… …
781 859
782 my $slider = new CFClient::UI::Slider 860 my $slider = new CFClient::UI::Slider
783 vertical => 1, 861 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix 862 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub { 863 connect_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 864 $self->{vp}->set_offset (0, $_[1]);
787 }, 865 },
788 ; 866 ;
789 867
790 $self = $class->SUPER::new ( 868 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort), 869 vp => (new CFClient::UI::ViewPort expand => 1),
792 slider => $slider, 870 slider => $slider,
793 @_, 871 @_,
794 ); 872 );
795 873
796 $self->{vp}->add ($self->{scrolled}); 874 $self->{vp}->add ($self->{scrolled});
… …
798 $self->add ($self->{slider}); 876 $self->add ($self->{slider});
799 877
800 $self 878 $self
801} 879}
802 880
881sub update {
882 my ($self) = @_;
883
884 $self->SUPER::update;
885
886 # todo: overwrite size_allocate of child
887 my $child = $self->{vp}->child;
888 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
889}
890
891sub size_allocate {
892 my ($self, $w, $h) = @_;
893
894 $self->SUPER::size_allocate ($w, $h);
895
896 my $child = $self->{vp}->child;
897 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
898}
899
803#TODO# update range on size_allocate depeneing on child 900#TODO# update range on size_allocate depending on child
804# update viewport offset on scroll 901# update viewport offset on scroll
805 902
806############################################################################# 903#############################################################################
807 904
808package CFClient::UI::Frame; 905package CFClient::UI::Frame;
… …
812use CFClient::OpenGL; 909use CFClient::OpenGL;
813 910
814sub new { 911sub new {
815 my $class = shift; 912 my $class = shift;
816 913
817 my $self = $class->SUPER::new ( 914 $class->SUPER::new (
818 bg => [1, 1, 1, 1], 915 bg => undef,
819 border_bg => [1, 1, 1, 1],
820 border => 0.8,
821 @_ 916 @_,
822 ); 917 )
823
824 $self
825} 918}
826 919
827sub _draw { 920sub _draw {
828 my ($self) = @_; 921 my ($self) = @_;
829 922
830 my ($w, $h) = ($self->{w}, $self->{h}); 923 if ($self->{bg}) {
924 my ($w, $h) = @$self{qw(w h)};
831 925
832 glEnable GL_BLEND; 926 glEnable GL_BLEND;
833 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 927 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
834 glEnable GL_TEXTURE_2D; 928 glColor @{ $self->{bg} };
835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
836 929
837# glBegin GL_QUADS; 930 glBegin GL_QUADS;
838# glColor 0, 0, 0, 0;
839# glVertex 0 , 0; 931 glVertex 0 , 0;
840# glVertex 0 , $h; 932 glVertex 0 , $h;
841# glVertex $w, $h; 933 glVertex $w, $h;
842# glVertex $w, 0; 934 glVertex $w, 0;
843# glEnd; 935 glEnd;
844 936
845
846 $self->child->draw;
847 glDisable GL_BLEND; 937 glDisable GL_BLEND;
848 glDisable GL_TEXTURE_2D; 938 }
939
940 $self->SUPER::_draw;
849} 941}
850 942
851############################################################################# 943#############################################################################
852 944
853package CFClient::UI::FancyFrame; 945package CFClient::UI::FancyFrame;
… …
864 my $class = shift; 956 my $class = shift;
865 957
866 # TODO: user_x, user_y, overwrite moveto? 958 # TODO: user_x, user_y, overwrite moveto?
867 959
868 my $self = $class->SUPER::new ( 960 my $self = $class->SUPER::new (
869 bg => [1, 1, 1, 1], 961 bg => [1, 1, 1, 1],
870 border_bg => [1, 1, 1, 1], 962 border_bg => [1, 1, 1, 1],
871 border => 0.6, 963 border => 0.6,
964 is_toplevel => 1,
872 can_events => 1, 965 can_events => 1,
873 @_ 966 @_
874 ); 967 );
875 968
876 $self->{title} &&= new CFClient::UI::Label 969 $self->{title} &&= new CFClient::UI::Label
877 align => 0, 970 align => 0,
… …
901 my ($self, $w, $h) = @_; 994 my ($self, $w, $h) = @_;
902 995
903 $h -= List::Util::max 0, $self->border * 2; 996 $h -= List::Util::max 0, $self->border * 2;
904 $w -= List::Util::max 0, $self->border * 2; 997 $w -= List::Util::max 0, $self->border * 2;
905 998
906 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 999 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
907 if $self->{title}; 1000 if $self->{title};
908 1001
909 $self->child->configure ($self->border, $self->border, $w, $h); 1002 $self->child->configure ($self->border, $self->border, $w, $h);
910} 1003}
911 1004
… …
969 my ($self) = @_; 1062 my ($self) = @_;
970 1063
971 my ($w, $h ) = ($self->{w}, $self->{h}); 1064 my ($w, $h ) = ($self->{w}, $self->{h});
972 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1065 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
973 1066
974 glEnable GL_BLEND;
975 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
976 glEnable GL_TEXTURE_2D; 1067 glEnable GL_TEXTURE_2D;
977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
978 1069
979 my $border = $self->border; 1070 my $border = $self->border;
980 1071
981 glColor @{ $self->{border_bg} }; 1072 glColor @{ $self->{border_bg} };
982 $tex[1]->draw_quad (0, 0, $w, $border); 1073 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
983 $tex[3]->draw_quad (0, $border, $border, $ch); 1074 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
984 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1075 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
985 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1076 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
986 1077
987 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1078 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
988 my $bg = $tex[0]; 1079 my $bg = $tex[0];
989 1080
990 # TODO: repeat texture not scale 1081 # TODO: repeat texture not scale
… …
994 glColor @{ $self->{bg} }; 1085 glColor @{ $self->{bg} };
995 1086
996 $bg->{s} = $rep_x; 1087 $bg->{s} = $rep_x;
997 $bg->{t} = $rep_y; 1088 $bg->{t} = $rep_y;
998 $bg->{wrap_mode} = 1; 1089 $bg->{wrap_mode} = 1;
999 $bg->draw_quad ($border, $border, $cw, $ch); 1090 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091 }
1000 1092
1001 glDisable GL_TEXTURE_2D; 1093 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND;
1003 }
1004 1094
1005 $self->{title}->draw if $self->{title}; 1095 $self->{title}->draw if $self->{title};
1006 1096
1007 $self->child->draw; 1097 $self->child->draw;
1008} 1098}
… …
1020sub new { 1110sub new {
1021 my $class = shift; 1111 my $class = shift;
1022 1112
1023 $class->SUPER::new ( 1113 $class->SUPER::new (
1024 col_expand => [], 1114 col_expand => [],
1025 @_ 1115 @_,
1026 ) 1116 )
1117}
1118
1119sub children {
1120 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1027} 1121}
1028 1122
1029sub add { 1123sub add {
1030 my ($self, $x, $y, $child) = @_; 1124 my ($self, $x, $y, $child) = @_;
1031 1125
1032 $child->set_parent ($self); 1126 $child->set_parent ($self);
1033 $self->{children}[$y][$x] = $child; 1127 $self->{children}[$y][$x] = $child;
1034 1128
1035 $child->check_size; 1129 $self->check_size (1);
1036} 1130}
1037 1131
1038sub children {
1039 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040}
1041
1042# TODO: move to container class maybe? send childs a signal on removal? 1132# TODO: move to container class maybe? send children a signal on removal?
1043sub clear { 1133sub clear {
1044 my ($self) = @_; 1134 my ($self) = @_;
1045 1135
1046 my @children = $self->children; 1136 my @children = $self->children;
1047 delete $self->{children}; 1137 delete $self->{children};
… …
1049 for (@children) { 1139 for (@children) {
1050 delete $_->{parent}; 1140 delete $_->{parent};
1051 $_->hide; 1141 $_->hide;
1052 } 1142 }
1053 1143
1144 $self->check_size (1);
1054 $self->update; 1145 $self->update;
1055} 1146}
1056 1147
1057sub get_wh { 1148sub get_wh {
1058 my ($self) = @_; 1149 my ($self) = @_;
… …
1090sub size_allocate { 1181sub size_allocate {
1091 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1092 1183
1093 my ($ws, $hs) = $self->get_wh; 1184 my ($ws, $hs) = $self->get_wh;
1094 1185
1095 my $req_w = sum @$ws; 1186 my $req_w = (sum @$ws) || 1;
1096 my $req_h = sum @$hs; 1187 my $req_h = (sum @$hs) || 1;
1097 1188
1098 # TODO: nicer code && do row_expand 1189 # TODO: nicer code && do row_expand
1099 my @col_expand = @{$self->{col_expand}}; 1190 my @col_expand = @{$self->{col_expand}};
1100 @col_expand = (1) x @$ws unless @col_expand; 1191 @col_expand = (1) x @$ws unless @col_expand;
1101 my $col_expand = (sum @col_expand) || 1; 1192 my $col_expand = (sum @col_expand) || 1;
… …
1235} 1326}
1236 1327
1237sub size_allocate { 1328sub size_allocate {
1238 my ($self, $w, $h) = @_; 1329 my ($self, $w, $h) = @_;
1239 1330
1331 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1332
1240 my $children = $self->{children}; 1333 my $children = $self->{children};
1241 1334
1242 my @h = map $_->{req_h}, @$children; 1335 my @h = map $_->{req_h}, @$children;
1243 1336
1244 my $req_h = List::Util::sum @h; 1337 my $req_h = List::Util::sum @h;
… …
1273 1366
1274############################################################################# 1367#############################################################################
1275 1368
1276package CFClient::UI::Label; 1369package CFClient::UI::Label;
1277 1370
1278our @ISA = CFClient::UI::Base::; 1371our @ISA = CFClient::UI::DrawBG::;
1279 1372
1280use CFClient::OpenGL; 1373use CFClient::OpenGL;
1281 1374
1282sub new { 1375sub new {
1283 my ($class, %arg) = @_; 1376 my ($class, %arg) = @_;
1284 1377
1285 my $self = $class->SUPER::new ( 1378 my $self = $class->SUPER::new (
1286 fg => [1, 1, 1], 1379 fg => [1, 1, 1],
1380 #bg => none
1381 #active_bg => none
1287 #font => default_font 1382 #font => default_font
1383 #text => initial text
1384 #markup => initial narkup
1385 #max_w => maximum pixel width
1386 ellipsise => 3, # end
1387 layout => (new CFClient::Layout),
1288 fontsize => 1, 1388 fontsize => 1,
1289 text => "",
1290 align => -1, 1389 align => -1,
1291 valign => -1, 1390 valign => -1,
1292 padding => 2, 1391 padding => 2,
1293 layout => new CFClient::Layout,
1294 can_events => 0, 1392 can_events => 0,
1295 %arg 1393 %arg
1296 ); 1394 );
1297 1395
1298 if (exists $self->{template}) { 1396 if (exists $self->{template}) {
1299 my $layout = new CFClient::Layout; 1397 my $layout = new CFClient::Layout;
1300 $layout->set_text (delete $self->{template}); 1398 $layout->set_text (delete $self->{template});
1301 $self->{template} = $layout; 1399 $self->{template} = $layout;
1302 } 1400 }
1303 1401
1304 $self->set_text (delete $self->{text}) if exists $self->{text}; 1402 if (exists $self->{markup}) {
1305 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1403 $self->set_markup (delete $self->{markup});
1404 } else {
1405 $self->set_text (delete $self->{text});
1406 }
1306 1407
1307 $self 1408 $self
1308} 1409}
1309 1410
1310sub escape { 1411sub escape($) {
1311 local $_ = $_[1]; 1412 local $_ = $_[0];
1312 1413
1313 s/&/&amp;/g; 1414 s/&/&amp;/g;
1314 s/>/&gt;/g; 1415 s/>/&gt;/g;
1315 s/</&lt;/g; 1416 s/</&lt;/g;
1316 1417
1317 $_[1] 1418 $_
1318} 1419}
1319 1420
1320sub update { 1421sub update {
1321 my ($self) = @_; 1422 my ($self) = @_;
1322 1423
1323 delete $self->{texture}; 1424 delete $self->{texture};
1324 $self->SUPER::update; 1425 $self->SUPER::update;
1325} 1426}
1326 1427
1327sub reconfigure {
1328 my ($self) = @_;
1329
1330 delete $self->{texture};
1331}
1332
1333sub set_text { 1428sub set_text {
1334 my ($self, $text) = @_; 1429 my ($self, $text) = @_;
1335 1430
1336 return if $self->{text} eq "T$text"; 1431 return if $self->{text} eq "T$text";
1337 $self->{text} = "T$text"; 1432 $self->{text} = "T$text";
1338 1433
1434 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1339 $self->{layout}->set_text ($text); 1435 $self->{layout}->set_text ($text);
1340 1436
1341 delete $self->{texture};
1342 $self->update; 1437 $self->update;
1343 $self->check_size; 1438 $self->check_size;
1344} 1439}
1345 1440
1346sub set_markup { 1441sub set_markup {
1347 my ($self, $markup) = @_; 1442 my ($self, $markup) = @_;
1348 1443
1349 return if $self->{text} eq "M$markup"; 1444 return if $self->{text} eq "M$markup";
1350 $self->{text} = "M$markup"; 1445 $self->{text} = "M$markup";
1351 1446
1447 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448
1449 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1352 $self->{layout}->set_markup ($markup); 1450 $self->{layout}->set_markup ($markup);
1353 1451
1354 delete $self->{texture};
1355 $self->update; 1452 $self->update;
1356 $self->check_size; 1453 $self->check_size;
1357} 1454}
1358 1455
1359sub size_request { 1456sub size_request {
1360 my ($self) = @_; 1457 my ($self) = @_;
1361 1458
1362 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1459 $self->{layout}->set_font ($self->{font}) if $self->{font};
1363 $self->{layout}->set_width ($self->{max_w} || -1); 1460 $self->{layout}->set_width ($self->{max_w} || -1);
1461 $self->{layout}->set_ellipsise ($self->{ellipsise});
1462 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1364 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1463 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1365 1464
1366 my ($w, $h) = $self->{layout}->size; 1465 my ($w, $h) = $self->{layout}->size;
1367 1466
1368 if (exists $self->{template}) { 1467 if (exists $self->{template}) {
… …
1390sub set_fontsize { 1489sub set_fontsize {
1391 my ($self, $fontsize) = @_; 1490 my ($self, $fontsize) = @_;
1392 1491
1393 $self->{fontsize} = $fontsize; 1492 $self->{fontsize} = $fontsize;
1394 delete $self->{texture}; 1493 delete $self->{texture};
1494
1495 $self->update;
1395 $self->check_size; 1496 $self->check_size;
1396 $self->update;
1397} 1497}
1398 1498
1399sub _draw { 1499sub _draw {
1400 my ($self) = @_; 1500 my ($self) = @_;
1401 1501
1502 $self->SUPER::_draw; # draw background, if applicable
1503
1402 my $tex = $self->{texture} ||= do { 1504 my $tex = $self->{texture} ||= do {
1505 $self->{layout}->set_foreground (@{$self->{fg}});
1403 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1506 $self->{layout}->set_font ($self->{font}) if $self->{font};
1404 $self->{layout}->set_width ($self->{w}); 1507 $self->{layout}->set_width ($self->{w});
1508 $self->{layout}->set_ellipsise ($self->{ellipsise});
1509 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1511
1406 new_from_layout CFClient::Texture $self->{layout} 1512 my $tex = new_from_layout CFClient::Texture $self->{layout};
1513
1514 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1515 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1516 : ($self->{w} - $tex->{w}) * 0.5);
1517
1518 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1519 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1520 : ($self->{h} - $tex->{h}) * 0.5);
1521
1522 $tex
1407 }; 1523 };
1408 1524
1409 glEnable GL_BLEND;
1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411 glEnable GL_TEXTURE_2D; 1525 glEnable GL_TEXTURE_2D;
1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413 1527
1528 if ($tex->{format} == GL_ALPHA) {
1414 glColor @{$self->{fg}}; 1529 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}); 1530 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1531 } else {
1532 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1533 }
1429 1534
1430 glDisable GL_TEXTURE_2D; 1535 glDisable GL_TEXTURE_2D;
1431 glDisable GL_BLEND;
1432} 1536}
1433 1537
1434############################################################################# 1538#############################################################################
1435 1539
1436package CFClient::UI::EntryBase; 1540package CFClient::UI::EntryBase;
… …
1449 active_fg => [0, 0, 0], 1553 active_fg => [0, 0, 0],
1450 can_hover => 1, 1554 can_hover => 1,
1451 can_focus => 1, 1555 can_focus => 1,
1452 valign => 0, 1556 valign => 0,
1453 can_events => 1, 1557 can_events => 1,
1558 #text => ...
1454 @_ 1559 @_
1455 ) 1560 )
1456} 1561}
1457 1562
1458sub _set_text { 1563sub _set_text {
… …
1468 $self->{text} = $text; 1573 $self->{text} = $text;
1469 1574
1470 $text =~ s/./*/g if $self->{hidden}; 1575 $text =~ s/./*/g if $self->{hidden};
1471 $self->{layout}->set_text ("$text "); 1576 $self->{layout}->set_text ("$text ");
1472 1577
1473 $self->emit (changed => $self->{text}); 1578 $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} 1579}
1493 1580
1494sub set_text { 1581sub set_text {
1495 my ($self, $text) = @_; 1582 my ($self, $text) = @_;
1496 1583
1497 $self->{cursor} = length $text; 1584 $self->{cursor} = length $text;
1498 $self->_set_text ($text); 1585 $self->_set_text ($text);
1499 $self->update; 1586 $self->update;
1587 $self->check_size;
1588}
1589
1590sub get_text {
1591 $_[0]{text}
1592}
1593
1594sub size_request {
1595 my ($self) = @_;
1596
1597 my ($w, $h) = $self->SUPER::size_request;
1598
1599 ($w + 1, $h) # add 1 for cursor
1500} 1600}
1501 1601
1502sub key_down { 1602sub key_down {
1503 my ($self, $ev) = @_; 1603 my ($self, $ev) = @_;
1504 1604
… …
1506 my $sym = $ev->{sym}; 1606 my $sym = $ev->{sym};
1507 my $uni = $ev->{unicode}; 1607 my $uni = $ev->{unicode};
1508 1608
1509 my $text = $self->get_text; 1609 my $text = $self->get_text;
1510 1610
1511 if ($sym == 8) { 1611 if ($uni == 8) {
1512 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1612 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513 } elsif ($sym == 127) { 1613 } elsif ($uni == 127) {
1514 substr $text, $self->{cursor}, 1, ""; 1614 substr $text, $self->{cursor}, 1, "";
1515 } elsif ($sym == CFClient::SDLK_LEFT) { 1615 } elsif ($sym == CFClient::SDLK_LEFT) {
1516 --$self->{cursor} if $self->{cursor}; 1616 --$self->{cursor} if $self->{cursor};
1517 } elsif ($sym == CFClient::SDLK_RIGHT) { 1617 } elsif ($sym == CFClient::SDLK_RIGHT) {
1518 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1618 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1519 } elsif ($sym == CFClient::SDLK_HOME) { 1619 } elsif ($sym == CFClient::SDLK_HOME) {
1520 $self->{cursor} = 0; 1620 $self->{cursor} = 0;
1521 } elsif ($sym == CFClient::SDLK_END) { 1621 } elsif ($sym == CFClient::SDLK_END) {
1522 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1523 } elsif ($sym == 27) { 1623 } elsif ($uni == 27) {
1524 $self->emit ('escape'); 1624 $self->_emit ('escape');
1525 } elsif ($uni) { 1625 } elsif ($uni) {
1526 substr $text, $self->{cursor}++, 0, chr $uni; 1626 substr $text, $self->{cursor}++, 0, chr $uni;
1527 } 1627 }
1528 1628
1529 $self->_set_text ($text); 1629 $self->_set_text ($text);
1530 $self->update; 1630 $self->update;
1631 $self->check_size;
1531} 1632}
1532 1633
1533sub focus_in { 1634sub focus_in {
1534 my ($self) = @_; 1635 my ($self) = @_;
1535 1636
… …
1615 if ($sym == 13) { 1716 if ($sym == 13) {
1616 unshift @{$self->{history}}, 1717 unshift @{$self->{history}},
1617 my $txt = $self->get_text; 1718 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1; 1719 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = ''; 1720 $self->{history_saveback} = '';
1620 $self->emit (activate => $txt); 1721 $self->_emit (activate => $txt);
1621 $self->update; 1722 $self->update;
1622 1723
1623 } elsif ($sym == CFClient::SDLK_UP) { 1724 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) { 1725 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text; 1726 $self->{history_saveback} = $self->get_text;
… …
1664 my $class = shift; 1765 my $class = shift;
1665 1766
1666 $class->SUPER::new ( 1767 $class->SUPER::new (
1667 padding => 4, 1768 padding => 4,
1668 fg => [1, 1, 1], 1769 fg => [1, 1, 1],
1669 bg => [1, 1, 1, 0.2],
1670 active_fg => [0, 0, 1], 1770 active_fg => [0, 0, 1],
1671 can_hover => 1, 1771 can_hover => 1,
1672 align => 0, 1772 align => 0,
1673 valign => 0, 1773 valign => 0,
1674 can_events => 1, 1774 can_events => 1,
1675 @_ 1775 @_
1676 ) 1776 )
1677} 1777}
1678 1778
1779sub activate { }
1780
1679sub button_up { 1781sub button_up {
1680 my ($self, $ev, $x, $y) = @_; 1782 my ($self, $ev, $x, $y) = @_;
1681 1783
1784 $self->emit ("activate")
1682 if ($x >= 0 && $x < $self->{w} 1785 if $x >= 0 && $x < $self->{w}
1683 && $y >= 0 && $y < $self->{h}) { 1786 && $y >= 0 && $y < $self->{h};
1684 $self->emit ("activate");
1685 }
1686} 1787}
1687 1788
1688sub _draw { 1789sub _draw {
1689 my ($self) = @_; 1790 my ($self) = @_;
1690 1791
… …
1692 1793
1693 if ($GRAB == $self) { 1794 if ($GRAB == $self) {
1694 $self->{fg} = $self->{active_fg}; 1795 $self->{fg} = $self->{active_fg};
1695 } 1796 }
1696 1797
1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D; 1798 glEnable GL_TEXTURE_2D;
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1; 1800 glColor 0, 0, 0, 1;
1702 1801
1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1802 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704 1803
1705 glDisable GL_TEXTURE_2D; 1804 glDisable GL_TEXTURE_2D;
1706 glDisable GL_BLEND;
1707 1805
1708 $self->SUPER::_draw; 1806 $self->SUPER::_draw;
1709} 1807}
1710 1808
1711############################################################################# 1809#############################################################################
… …
1725 1823
1726 $class->SUPER::new ( 1824 $class->SUPER::new (
1727 padding => 2, 1825 padding => 2,
1728 fg => [1, 1, 1], 1826 fg => [1, 1, 1],
1729 active_fg => [1, 1, 0], 1827 active_fg => [1, 1, 0],
1828 bg => [0, 0, 0, 0.2],
1829 active_bg => [1, 1, 1, 0.5],
1730 state => 0, 1830 state => 0,
1731 can_hover => 1, 1831 can_hover => 1,
1732 @_ 1832 @_
1733 ) 1833 )
1734} 1834}
… …
1743 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1744 1844
1745 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1845 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1746 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1846 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1747 $self->{state} = !$self->{state}; 1847 $self->{state} = !$self->{state};
1748 $self->emit (changed => $self->{state}); 1848 $self->_emit (changed => $self->{state});
1749 } 1849 }
1750} 1850}
1751 1851
1752sub _draw { 1852sub _draw {
1753 my ($self) = @_; 1853 my ($self) = @_;
… …
1758 1858
1759 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1859 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1760 1860
1761 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1861 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762 1862
1763 glEnable GL_BLEND; 1863 my $tex = $self->{state} ? $tex[1] : $tex[0];
1864
1764 glEnable GL_TEXTURE_2D; 1865 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); 1866 $tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771 glDisable GL_TEXTURE_2D; 1867 glDisable GL_TEXTURE_2D;
1772 glDisable GL_BLEND;
1773} 1868}
1774 1869
1775############################################################################# 1870#############################################################################
1776 1871
1777package CFClient::UI::Image; 1872package CFClient::UI::Image;
… …
1820 glTranslate 0, -$self->{w}, 0; 1915 glTranslate 0, -$self->{w}, 0;
1821 1916
1822 ($w, $h) = ($h, $w); 1917 ($w, $h) = ($h, $w);
1823 } 1918 }
1824 1919
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D; 1920 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 1922
1830 $tex->draw_quad (0, 0, $w, $h); 1923 $tex->draw_quad_alpha (0, 0, $w, $h);
1831 1924
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D; 1925 glDisable GL_TEXTURE_2D;
1834} 1926}
1835 1927
1836############################################################################# 1928#############################################################################
1837 1929
… …
2026 qw(s1_slider.png s1_slider_bg.png); 2118 qw(s1_slider.png s1_slider_bg.png);
2027 2119
2028sub new { 2120sub new {
2029 my $class = shift; 2121 my $class = shift;
2030 2122
2031 # range [value, low, high, page] 2123 # range [value, low, high, page, unit]
2032 2124
2033 # TODO: 0-width page 2125 # TODO: 0-width page
2034 # TODO: req_w/h are wrong with vertical 2126 # TODO: req_w/h are wrong with vertical
2035 # TODO: calculations are off 2127 # TODO: calculations are off
2036 my $self = $class->SUPER::new ( 2128 my $self = $class->SUPER::new (
2037 fg => [1, 1, 1], 2129 fg => [1, 1, 1],
2038 active_fg => [0, 0, 0], 2130 active_fg => [0, 0, 0],
2131 bg => [0, 0, 0, 0.2],
2132 active_bg => [1, 1, 1, 0.5],
2039 range => [0, 0, 100, 10], 2133 range => [0, 0, 100, 10, 0],
2040 req_w => $::WIDTH / 80, 2134 req_w => $::WIDTH / 80,
2041 req_h => $::WIDTH / 80, 2135 req_h => $::WIDTH / 80,
2042 vertical => 0, 2136 vertical => 0,
2043 can_hover => 1, 2137 can_hover => 1,
2044 inner_pad => 5, 2138 inner_pad => 0.02,
2045 @_ 2139 @_
2046 ); 2140 );
2047 2141
2142 $self->set_value ($self->{range}[0]);
2143 $self->update;
2144
2048 $self 2145 $self
2146}
2147
2148sub set_range {
2149 my ($self, $range) = @_;
2150
2151 ($range, $self->{range}) = ($self->{range}, $range);
2152
2153 $self->update
2154 if "@$range" ne "@{$self->{range}}";
2155}
2156
2157sub set_value {
2158 my ($self, $value) = @_;
2159
2160 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2161
2162 $hi = $lo + 1 if $hi <= $lo;
2163
2164 $page = $hi - $lo if $page > $hi - $lo;
2165
2166 $value = $lo if $value < $lo;
2167 $value = $hi - $page if $value > $hi - $page;
2168
2169 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2170 if $unit;
2171
2172 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2173
2174 if ($value != $old_value) {
2175 $self->_emit (changed => $value);
2176 $self->update;
2177 }
2049} 2178}
2050 2179
2051sub size_request { 2180sub size_request {
2052 my ($self) = @_; 2181 my ($self) = @_;
2053 2182
… …
2059 2188
2060sub button_down { 2189sub button_down {
2061 my ($self, $ev, $x, $y) = @_; 2190 my ($self, $ev, $x, $y) = @_;
2062 2191
2063 $self->SUPER::button_down ($ev, $x, $y); 2192 $self->SUPER::button_down ($ev, $x, $y);
2193
2194 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2195
2064 $self->mouse_motion ($ev, $x, $y); 2196 $self->mouse_motion ($ev, $x, $y);
2065} 2197}
2066 2198
2067sub mouse_motion { 2199sub mouse_motion {
2068 my ($self, $ev, $x, $y) = @_; 2200 my ($self, $ev, $x, $y) = @_;
2069 2201
2070 if ($GRAB == $self) { 2202 if ($GRAB == $self) {
2203 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2204
2205 my (undef, $lo, $hi, $page) = @{$self->{range}};
2206
2207 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2208
2209 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2210 }
2211}
2212
2213sub update {
2214 my ($self) = @_;
2215
2216 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2217 $self->set_value ($self->{range}[0]);
2218
2071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2219 my ($value, $lo, $hi, $page) = @{$self->{range}};
2220 my $range = ($hi - $page - $lo) || 1e-100;
2072 2221
2073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2222 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074 2223
2075 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2224 $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 2225 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077 2226
2078 $x -= $inner_pad_px; # substract the padding 2227 $value = ($value - $lo) / $range;
2079 $x = $x * ($hi - $lo) / $inner_w + $lo; 2228 $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 2229
2084 $self->emit (changed => $x); 2230 $self->{knob_x} = $value - $knob_w * 0.5;
2085 $self->update; 2231 $self->{knob_w} = $knob_w;
2086 } 2232 });
2087}
2088 2233
2089# the inner_* stuff is for generating a padding for the slider handle, 2234 $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} 2235}
2096 2236
2097sub _draw { 2237sub _draw {
2098 my ($self) = @_; 2238 my ($self) = @_;
2099 2239
2100 $self->SUPER::_draw (); 2240 $self->SUPER::_draw ();
2101 2241
2102 my ($w, $h) = @$self{qw(w h)}; 2242 glScale $self->{w}, $self->{h};
2103 2243
2104 if ($self->{vertical}) { 2244 if ($self->{vertical}) {
2105 # draw a vertical slider like a rotated horizontal slider 2245 # draw a vertical slider like a rotated horizontal slider
2106 2246
2247 glTranslate 1, 0, 0;
2107 glRotate 90, 0, 0, 1; 2248 glRotate 90, 0, 0, 1;
2108 glTranslate 0, -$self->{w}, 0;
2109
2110 ($w, $h) = ($h, $w);
2111 } 2249 }
2112 2250
2113 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2251 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2252 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115 2253
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; 2254 glEnable GL_TEXTURE_2D;
2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2255 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138 2256
2139 # draw background 2257 # draw background
2140 $tex[1]->draw_quad (0, 0, $w, $h); 2258 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141 2259
2142 # draw handle 2260 # draw handle
2143 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2261 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144 2262
2145 glDisable GL_BLEND;
2146 glDisable GL_TEXTURE_2D; 2263 glDisable GL_TEXTURE_2D;
2147} 2264}
2265
2266#############################################################################
2267
2268package CFClient::UI::ValSlider;
2269
2270our @ISA = CFClient::UI::HBox::;
2271
2272sub new {
2273 my ($class, %arg) = @_;
2274
2275 my $range = delete $arg{range};
2276
2277 my $self = $class->SUPER::new (
2278 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2279 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2280 to_value => sub { shift },
2281 from_value => sub { shift },
2282 %arg,
2283 );
2284
2285 $self->{slider}->connect (changed => sub {
2286 my ($self, $value) = @_;
2287 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2288 $self->{parent}->emit (changed => $value);
2289 });
2290
2291# $self->{entry}->connect (changed => sub {
2292# my ($self, $value) = @_;
2293# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2294# $self->{parent}->emit (changed => $value);
2295# });
2296
2297 $self->add ($self->{slider}, $self->{entry});
2298
2299 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2300
2301 $self
2302}
2303
2304sub set_range { shift->{slider}->set_range (@_) }
2305sub set_value { shift->{slider}->set_value (@_) }
2148 2306
2149############################################################################# 2307#############################################################################
2150 2308
2151package CFClient::UI::TextView; 2309package CFClient::UI::TextView;
2152 2310
… …
2161 fontsize => 1, 2319 fontsize => 1,
2162 can_events => 0, 2320 can_events => 0,
2163 #font => default_font 2321 #font => default_font
2164 @_, 2322 @_,
2165 2323
2166 layout => (new CFClient::Layout), 2324 layout => (new CFClient::Layout 1),
2167 par => [], 2325 par => [],
2168 height => 0, 2326 height => 0,
2169 children => [ 2327 children => [
2170 (new CFClient::UI::Empty expand => 1), 2328 (new CFClient::UI::Empty expand => 1),
2171 (new CFClient::UI::Slider vertical => 1), 2329 (new CFClient::UI::Slider vertical => 1),
… …
2182 2340
2183 $self->{fontsize} = $fontsize; 2341 $self->{fontsize} = $fontsize;
2184 $self->reflow; 2342 $self->reflow;
2185} 2343}
2186 2344
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 { 2345sub size_allocate {
2207 my ($self, $w, $h) = @_; 2346 my ($self, $w, $h) = @_;
2208 2347
2209 $self->SUPER::size_allocate ($w, $h); 2348 $self->SUPER::size_allocate ($w, $h);
2210 2349
… …
2213 $self->{layout}->set_width ($self->{children}[0]{w}); 2352 $self->{layout}->set_width ($self->{children}[0]{w});
2214 2353
2215 $self->reflow; 2354 $self->reflow;
2216} 2355}
2217 2356
2357sub text_size {
2358 my ($self, $text, $indent) = @_;
2359
2360 my $layout = $self->{layout};
2361
2362 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2363 $layout->set_width ($self->{children}[0]{w} - $indent);
2364 $layout->set_markup ($text);
2365
2366 $layout->size
2367}
2368
2369sub reflow {
2370 my ($self) = @_;
2371
2372 $self->{need_reflow}++;
2373 $self->update;
2374}
2375
2376sub set_offset {
2377 my ($self, $offset) = @_;
2378
2379 # todo: base offset on lines or so, not on pixels
2380 $self->{children}[1]->set_value ($offset);
2381}
2382
2383sub clear {
2384 my ($self) = @_;
2385
2386 $self->{par} = [];
2387 $self->{height} = 0;
2388 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2389}
2390
2218sub add_paragraph { 2391sub add_paragraph {
2219 my ($self, $color, $text) = @_; 2392 my ($self, $color, $text, $indent) = @_;
2220 2393
2221 #TODO: intelligently "reformat" paragraph 2394 for my $line (split /\n/, $text) {
2222 2395 my ($w, $h) = $self->text_size ($line);
2223 my $height = $self->text_height ($text);
2224
2225 $self->{height} += $height; 2396 $self->{height} += $h;
2397 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2398 }
2226 2399
2227 push @{$self->{par}}, [$height, $color, $text];
2228
2229 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2400 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2230 $self->{children}[1]->update;
2231} 2401}
2232 2402
2233sub update { 2403sub update {
2234 my ($self) = @_; 2404 my ($self) = @_;
2235 2405
… …
2237 2407
2238 return unless $self->{h} > 0; 2408 return unless $self->{h} > 0;
2239 2409
2240 delete $self->{texture}; 2410 delete $self->{texture};
2241 2411
2242 $ROOT->on_refresh ($self, sub { 2412 $ROOT->on_post_alloc ($self, sub {
2413 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2414
2243 if (delete $self->{need_reflow}) { 2415 if (delete $self->{need_reflow}) {
2244 my $height = 0; 2416 my $height = 0;
2245 2417
2246 $height += $_->[0] = $self->text_height ($_->[2]) 2418 my $layout = $self->{layout};
2419
2420 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2421
2247 for @{$self->{par}}; 2422 for (@{$self->{par}}) {
2423 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2424 $layout->set_width ($W - $_->[3]);
2425 $layout->set_markup ($_->[4]);
2426 my ($w, $h) = $layout->size;
2427 $_->[0] = $w + $_->[3];
2428 $_->[1] = $h;
2429 }
2430
2431 $height += $_->[1];
2432 }
2248 2433
2249 $self->{height} = $height; 2434 $self->{height} = $height;
2250 2435
2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2436 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2252 2437
2253 delete $self->{texture}; 2438 delete $self->{texture};
2254 } 2439 }
2255 2440
2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2441 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2257 glClearColor 0, 0, 0, 0; 2442 glClearColor 0.5, 0.5, 0.5, 0;
2258 glClear GL_COLOR_BUFFER_BIT; 2443 glClear GL_COLOR_BUFFER_BIT;
2259 2444
2445 my $top = int $self->{children}[1]{range}[0];
2446
2447 my $y0 = $top;
2448 my $y1 = $top + $H;
2449
2450 my $y = 0;
2451
2452 my $layout = $self->{layout};
2453
2454 $layout->set_font ($self->{font}) if $self->{font};
2455
2260 glEnable GL_BLEND; 2456 glEnable GL_BLEND;
2457 #TODO# not correct in windows where rgba is forced off
2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2458 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 2459
2276 for my $par (@{$self->{par}}) { 2460 for my $par (@{$self->{par}}) {
2277 my $h = $par->[0]; 2461 my $h = $par->[1];
2278 2462
2279 if ($y0 < $y + $h && $y < $y1) { 2463 if ($y0 < $y + $h && $y < $y1) {
2464 $layout->set_foreground (@{ $par->[2] });
2465 $layout->set_width ($W - $par->[3]);
2280 $layout->set_text ($par->[2]); 2466 $layout->set_markup ($par->[4]);
2281 2467
2282 glColor @{ $par->[1] }; 2468 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283 my ($W, $H) = $layout->size; 2469
2284 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2470 glRasterPos $par->[3], $y - $y0;
2471 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2285 } 2472 }
2286 2473
2287 $y += $h; 2474 $y += $h;
2288 } 2475 }
2289 2476
2290 glDisable GL_TEXTURE_2D;
2291 glDisable GL_BLEND; 2477 glDisable GL_BLEND;
2292 }; 2478 };
2293 }); 2479 });
2294} 2480}
2295 2481
2296sub _draw { 2482sub _draw {
2297 my ($self) = @_; 2483 my ($self) = @_;
2298 2484
2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301 glEnable GL_TEXTURE_2D; 2485 glEnable GL_TEXTURE_2D;
2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1; 2487 glColor 1, 1, 1, 1;
2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2488 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2305 glDisable GL_TEXTURE_2D; 2489 glDisable GL_TEXTURE_2D;
2306 glDisable GL_BLEND;
2307 2490
2308 $self->{children}[1]->draw; 2491 $self->{children}[1]->draw;
2309 2492
2310} 2493}
2311 2494
… …
2379 2562
2380 # TODO: use animation 2563 # TODO: use animation
2381 if ($self->{state} = !$self->{state}) { 2564 if ($self->{state} = !$self->{state}) {
2382 $CFClient::UI::ROOT->add ($self->{other}); 2565 $CFClient::UI::ROOT->add ($self->{other});
2383 $self->{other}->move ($self->coord2global (0, $self->{h})); 2566 $self->{other}->move ($self->coord2global (0, $self->{h}));
2384 $self->emit ("open"); 2567 $self->_emit ("open");
2385 } else { 2568 } else {
2386 $CFClient::UI::ROOT->remove ($self->{other}); 2569 $CFClient::UI::ROOT->remove ($self->{other});
2387 $self->emit ("close"); 2570 $self->_emit ("close");
2388 } 2571 }
2389 2572
2390 $self->emit (changed => $self->{state}); 2573 $self->_emit (changed => $self->{state});
2391} 2574}
2392 2575
2393############################################################################# 2576#############################################################################
2394 2577
2395package CFClient::UI::Tooltip; 2578package CFClient::UI::Tooltip;
… …
2405 @_, 2588 @_,
2406 can_events => 0, 2589 can_events => 0,
2407 ) 2590 )
2408} 2591}
2409 2592
2410sub set_markup { 2593sub set_tooltip_from {
2411 my ($self, $text) = @_; 2594 my ($self, $widget) = @_;
2412 2595
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2596 $self->add (new CFClient::UI::Label
2414 $self->{label}->set_markup ($text); 2597 markup => $widget->{tooltip},
2415 $self->add ($self->{label}); 2598 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2599 fontsize => 0.8,
2600 fg => [0, 0, 0, 1],
2601 ellipsise => 0,
2602 font => ($widget->{tooltip_font} || $::FONT_PROP),
2603 );
2416} 2604}
2417 2605
2418sub size_request { 2606sub size_request {
2419 my ($self) = @_; 2607 my ($self) = @_;
2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422 2608
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2609 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424 2610
2425 ($w + 4, $h + 4) 2611 ($w + 4, $h + 4)
2426} 2612}
… …
2432} 2618}
2433 2619
2434sub _draw { 2620sub _draw {
2435 my ($self) = @_; 2621 my ($self) = @_;
2436 2622
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375; 2623 glTranslate 0.375, 0.375;
2439 2624
2440 my ($w, $h) = @$self{qw(w h)}; 2625 my ($w, $h) = @$self{qw(w h)};
2441 2626
2442 glColor 1, 0.8, 0.4; 2627 glColor 1, 0.8, 0.4;
… …
2453 glVertex 0 , $h; 2638 glVertex 0 , $h;
2454 glVertex $w, $h; 2639 glVertex $w, $h;
2455 glVertex $w, 0; 2640 glVertex $w, 0;
2456 glEnd; 2641 glEnd;
2457 2642
2458 glPopMatrix; 2643 glTranslate 2 - 0.375, 2 - 0.375;
2459
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw; 2644 $self->SUPER::_draw;
2462} 2645}
2463 2646
2464############################################################################# 2647#############################################################################
2465 2648
… …
2470use CFClient::OpenGL; 2653use CFClient::OpenGL;
2471 2654
2472sub new { 2655sub new {
2473 my $class = shift; 2656 my $class = shift;
2474 2657
2475 $class->SUPER::new ( 2658 my $self = $class->SUPER::new (
2476 aspect => 1, 2659 aspect => 1,
2660 can_events => 0,
2477 @_, 2661 @_,
2478 ) 2662 );
2663
2664 if ($self->{anim} && $self->{animspeed}) {
2665 Scalar::Util::weaken (my $widget = $self);
2666
2667 $self->{timer} = Event->timer (
2668 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2669 hard => 1,
2670 interval => $self->{animspeed},
2671 cb => sub {
2672 ++$widget->{frame};
2673 $widget->update;
2674 },
2675 );
2676 }
2677
2678 $self
2479} 2679}
2480 2680
2481sub size_request { 2681sub size_request {
2482 (32, 8) 2682 (32, 8)
2483} 2683}
2484 2684
2685sub update {
2686 my ($self) = @_;
2687
2688 return unless $self->{visible};
2689
2690 $self->SUPER::update;
2691}
2692
2485sub _draw { 2693sub _draw {
2486 my ($self) = @_; 2694 my ($self) = @_;
2487 2695
2696 return unless $::CONN;
2697
2698 my $face;
2699
2700 if ($self->{frame}) {
2701 my $anim = $::CONN->{anim}[$self->{anim}];
2702
2703 $face = $anim->[ $self->{frame} % @$anim ]
2704 if $anim && @$anim;
2705 }
2706
2488 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2707 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2489 2708
2490 # TODO animation
2491 if ($tex) { 2709 if ($tex) {
2492 glEnable GL_BLEND;
2493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2494 glEnable GL_TEXTURE_2D; 2710 glEnable GL_TEXTURE_2D;
2495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2496 glColor 1, 1, 1, 1; 2712 glColor 1, 1, 1, 1;
2497 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2713 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2498 glDisable GL_TEXTURE_2D; 2714 glDisable GL_TEXTURE_2D;
2499 glDisable GL_BLEND;
2500 } 2715 }
2716}
2717
2718sub DESTROY {
2719 my ($self) = @_;
2720
2721 $self->{timer}->cancel
2722 if $self->{timer};
2723
2724 $self->SUPER::DESTROY;
2725}
2726
2727#############################################################################
2728
2729package CFClient::UI::Inventory;
2730
2731our @ISA = CFClient::UI::ScrolledWindow::;
2732
2733sub new {
2734 my $class = shift;
2735
2736 my $self = $class->SUPER::new (
2737 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2738 @_,
2739 );
2740
2741 $self
2742}
2743
2744sub set_items {
2745 my ($self, $items) = @_;
2746
2747 $self->{scrolled}->clear;
2748 return unless $items;
2749
2750 my @items = sort {
2751 ($a->{type} <=> $b->{type})
2752 or ($a->{name} cmp $b->{name})
2753 } @$items;
2754
2755 $self->{real_items} = \@items;
2756
2757 my $row = 0;
2758 for my $item (@items) {
2759 CFClient::Item::update_widgets $item;
2760
2761 $self->{scrolled}->add (0, $row, $item->{face_widget});
2762 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2763 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2764
2765 $row++;
2766 }
2767}
2768
2769sub size_request {
2770 my ($self) = @_;
2771 ($self->{req_w}, $self->{req_h});
2501} 2772}
2502 2773
2503############################################################################# 2774#############################################################################
2504 2775
2505package CFClient::UI::Menu; 2776package CFClient::UI::Menu;
… …
2540 2811
2541# popup given the event (must be a mouse button down event currently) 2812# popup given the event (must be a mouse button down event currently)
2542sub popup { 2813sub popup {
2543 my ($self, $ev) = @_; 2814 my ($self, $ev) = @_;
2544 2815
2545 $self->emit ("popdown"); 2816 $self->_emit ("popdown");
2546 2817
2547 # maybe save $GRAB? must be careful about events... 2818 # maybe save $GRAB? must be careful about events...
2548 $GRAB = $self; 2819 $GRAB = $self;
2549 $self->{button} = $ev->{button}; 2820 $self->{button} = $ev->{button};
2550 2821
… …
2565 2836
2566 if ($ev->{button} == $self->{button}) { 2837 if ($ev->{button} == $self->{button}) {
2567 undef $GRAB; 2838 undef $GRAB;
2568 $self->hide; 2839 $self->hide;
2569 2840
2570 $self->emit ("popdown"); 2841 $self->_emit ("popdown");
2571 $self->{hover}[1]->() if $self->{hover}; 2842 $self->{hover}[1]->() if $self->{hover};
2572 } 2843 }
2573} 2844}
2574 2845
2575############################################################################# 2846#############################################################################
2576 2847
2848package CFClient::UI::Statusbox;
2849
2850our @ISA = CFClient::UI::VBox::;
2851
2852sub new {
2853 my $class = shift;
2854
2855 $class->SUPER::new (
2856 fontsize => 0.8,
2857 @_,
2858 )
2859}
2860
2861sub reorder {
2862 my ($self) = @_;
2863 my $NOW = time;
2864
2865 while (my ($k, $v) = each %{ $self->{item} }) {
2866 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2867 }
2868
2869 my @widgets;
2870
2871 my @items = sort {
2872 $a->{pri} <=> $b->{pri}
2873 or $b->{id} <=> $a->{id}
2874 } values %{ $self->{item} };
2875
2876 my $count = 10 + 1;
2877 for my $item (@items) {
2878 last unless --$count;
2879
2880 push @widgets, $item->{label} ||= do {
2881 # TODO: doesn't handle markup well (read as: at all)
2882 my $short = $item->{count} > 1
2883 ? "<b>$item->{count} ×</b> $item->{text}"
2884 : $item->{text};
2885
2886 for ($short) {
2887 s/^\s+//;
2888 s/\s+/ /g;
2889 }
2890
2891 new CFClient::UI::Label
2892 markup => $short,
2893 tooltip => $item->{tooltip},
2894 tooltip_font => $::FONT_PROP,
2895 tooltip_width => 0.67,
2896 fontsize => $item->{fontsize} || $self->{fontsize},
2897 max_w => $::WIDTH * 0.44,
2898 fg => $item->{fg},
2899 can_events => 1,
2900 can_hover => 1
2901 };
2902 }
2903
2904 $self->clear;
2905 $self->SUPER::add (reverse @widgets);
2906}
2907
2908sub add {
2909 my ($self, $text, %arg) = @_;
2910
2911 $text =~ s/^\s+//;
2912 $text =~ s/\s+$//;
2913
2914 return unless $text;
2915
2916 my $timeout = time + ((delete $arg{timeout}) || 60);
2917
2918 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2919
2920 if (my $item = $self->{item}{$group}) {
2921 if ($item->{text} eq $text) {
2922 $item->{count}++;
2923 } else {
2924 $item->{count} = 1;
2925 $item->{text} = $item->{tooltip} = $text;
2926 }
2927 $item->{id} = ++$self->{id};
2928 $item->{timeout} = $timeout;
2929 delete $item->{label};
2930 } else {
2931 $self->{item}{$group} = {
2932 id => ++$self->{id},
2933 text => $text,
2934 timeout => $timeout,
2935 tooltip => $text,
2936 fg => [0.8, 0.8, 0.8, 0.8],
2937 pri => 0,
2938 count => 1,
2939 %arg,
2940 };
2941 }
2942
2943 $self->reorder;
2944}
2945
2946sub reconfigure {
2947 my ($self) = @_;
2948
2949 delete $_->{label}
2950 for values %{ $self->{item} || {} };
2951
2952 $self->reorder;
2953 $self->SUPER::reconfigure;
2954}
2955
2956#############################################################################
2957
2577package CFClient::UI::Root; 2958package CFClient::UI::Root;
2578 2959
2579our @ISA = CFClient::UI::Container::; 2960our @ISA = CFClient::UI::Container::;
2580 2961
2581use CFClient::OpenGL; 2962use CFClient::OpenGL;
2582 2963
2583sub check_size { 2964sub new {
2584 my ($self) = @_; 2965 my $class = shift;
2585 2966
2586 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2967 $class->SUPER::new (
2587} 2968 @_,
2588 2969 )
2589sub size_request {
2590 ($::WIDTH, $::HEIGHT)
2591} 2970}
2592 2971
2593sub configure { 2972sub configure {
2594 my ($self, $x, $y, $w, $h) = @_; 2973 my ($self, $x, $y, $w, $h) = @_;
2595 2974
2596 $self->SUPER::configure ($x, $y, $w, $h); 2975 $self->{w} = $w;
2976 $self->{h} = $h;
2977}
2597 2978
2979sub check_size {
2980 my ($self) = @_;
2981
2982 $self->size_allocate ($self->{w}, $self->{h})
2983 if $self->{w};
2984}
2985
2986sub size_request {
2987 my ($self) = @_;
2988
2989 ($self->{w}, $self->{h})
2990}
2991
2992sub size_allocate {
2993 my ($self, $w, $h) = @_;
2994
2598 for my $child (@{$self->{children}}) { 2995 for my $child ($self->children) {
2599 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2996 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2600 2997
2998 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2999 if exists $child->{req_x};
3000
3001 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3002 if exists $child->{req_y};
3003
2601 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3004 $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; 3005 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3006
2603 $child->configure ($X, $Y, $W,$H); 3007 $child->configure ($X, $Y, $W, $H);
2604 } 3008 }
2605} 3009}
2606 3010
2607sub _topleft { 3011sub coord2local {
2608 my ($self, $x, $y) = @_; 3012 my ($self, $x, $y) = @_;
2609 3013
2610 ($x, $y) 3014 ($x, $y)
2611} 3015}
2612 3016
3017sub coord2global {
3018 my ($self, $x, $y) = @_;
3019
3020 ($x, $y)
3021}
3022
2613sub update { 3023sub update {
2614 my ($self) = @_; 3024 my ($self) = @_;
2615 3025
2616 $self->check_size; 3026 $self->check_size;
2617 ::refresh (); 3027 $::WANT_REFRESH++;
2618} 3028}
2619 3029
2620sub add { 3030sub add {
2621 my ($self, $child) = @_; 3031 my ($self, @children) = @_;
2622 3032
3033 for (my @widgets = @children; my $w = pop @widgets; ) {
3034 push @widgets, $w->children;
3035 $w->{root} = $self;
3036 $w->{visible} = 1;
3037 }
3038
3039 for my $child (@children) {
3040 $child->{is_toplevel} = 1;
3041
2623 # integerize window positions 3042 # integerise window positions
2624 $child->{x} = int $child->{x}; 3043 $child->{x} = int $child->{x};
2625 $child->{y} = int $child->{y}; 3044 $child->{y} = int $child->{y};
3045 }
2626 3046
2627 $self->SUPER::add ($child); 3047 $self->SUPER::add (@children);
3048}
3049
3050sub remove {
3051 my ($self, @children) = @_;
3052
3053 $self->SUPER::remove (@children);
3054
3055 while (@children) {
3056 my $w = pop @children;
3057 push @children, $w->children;
3058 $w->set_invisible;
3059 }
2628} 3060}
2629 3061
2630sub on_refresh { 3062sub on_refresh {
2631 my ($self, $id, $cb) = @_; 3063 my ($self, $id, $cb) = @_;
2632 3064
2633 $self->{refresh_hook}{$id} = $cb; 3065 $self->{refresh_hook}{$id} = $cb;
2634} 3066}
2635 3067
3068sub on_post_alloc {
3069 my ($self, $id, $cb) = @_;
3070
3071 $self->{post_alloc_hook}{$id} = $cb;
3072}
3073
2636sub draw { 3074sub draw {
2637 my ($self) = @_; 3075 my ($self) = @_;
2638 3076
2639 while (my $rcb = delete $self->{refresh_hook}) { 3077 while ($self->{refresh_hook}) {
2640 $_->() for values %$rcb; 3078 $_->()
3079 for values %{delete $self->{refresh_hook}};
3080 }
3081
3082 if ($self->{check_size}) {
3083 my @queue = ([], []);
3084
3085 for (;;) {
3086 if ($self->{check_size}) {
3087 # heuristic: check containers last
3088 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3089 for values %{delete $self->{check_size}}
3090 }
3091
3092 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3093
3094 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3095 ? @$widget{qw(user_w user_h)}
3096 : $widget->size_request;
3097
3098 if (delete $widget->{force_alloc}
3099 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3100 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3101
3102 $widget->{req_w} = $w;
3103 $widget->{req_h} = $h;
3104
3105 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3106
3107 $widget->{parent}->check_size
3108 if $widget->{parent};
3109 }
3110 }
3111 }
3112
3113 while ($self->{size_alloc}) {
3114 for (values %{delete $self->{size_alloc}}) {
3115 my ($widget, $w, $h) = @$_;
3116
3117 $w = 0 if $w < 0;
3118 $h = 0 if $h < 0;
3119
3120 $widget->{w} = $w;
3121 $widget->{h} = $h;
3122 $widget->emit (size_allocate => $w, $h);
3123 }
3124 }
3125
3126 while ($self->{post_alloc_hook}) {
3127 $_->()
3128 for values %{delete $self->{post_alloc_hook}};
2641 } 3129 }
2642 3130
2643 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3131 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2644 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3132 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2645 glClear GL_COLOR_BUFFER_BIT; 3133 glClear GL_COLOR_BUFFER_BIT;
2646 3134
2647 glMatrixMode GL_PROJECTION; 3135 glMatrixMode GL_PROJECTION;
2648 glLoadIdentity; 3136 glLoadIdentity;
2649 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3137 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2650 glMatrixMode GL_MODELVIEW; 3138 glMatrixMode GL_MODELVIEW;
2651 glLoadIdentity; 3139 glLoadIdentity;
2652 3140
2653 $self->_draw; 3141 $self->_draw;
2654} 3142}
2655 3143
2656############################################################################# 3144#############################################################################
2657 3145
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; 3146package CFClient::UI;
2764 3147
2765$ROOT = new CFClient::UI::Root; 3148$ROOT = new CFClient::UI::Root;
2766$TOOLTIP = new CFClient::UI::Tooltip; 3149$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2767 3150
27681 31511
2769 3152

Diff Legend

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