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.190 by root, Mon May 8 22:17:38 2006 UTC vs.
Revision 1.234 by root, Thu May 25 16:24:44 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48} 51}
49 52
50# class methods for events 53# class methods for events
51sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 56 if $FOCUS;
54} 57}
55 58
56sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 61 if $FOCUS;
59} 62}
60 63
61sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
62 my ($ev) = @_; 65 my ($ev) = @_;
… …
71 check_tooltip; 74 check_tooltip;
72 } 75 }
73 76
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 78
76 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 81}
81 82
82sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
83 my ($ev) = @_; 84 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
85 86
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 88
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 90
90 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 93
95 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 96 $grab->update if $grab;
98 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 114
116 check_tooltip; 115 check_tooltip;
117 } 116 }
118 117
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 119 if $HOVER;
123} 120}
124 121
125# convert position array to integers 122# convert position array to integers
126sub harmonize { 123sub harmonize {
127 my ($vals) = @_; 124 my ($vals) = @_;
… …
131 for (@$vals) { 128 for (@$vals) {
132 my $i = int $_ + $rem; 129 my $i = int $_ + $rem;
133 $rem += $_ - $i; 130 $rem += $_ - $i;
134 $_ = $i; 131 $_ = $i;
135 } 132 }
133}
134
135sub full_refresh {
136 # make a copy, otherwise for complains about freed values.
137 my @widgets = values %WIDGET;
138
139 $_->update
140 for @widgets;
141}
142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
151# call when resolution changes etc.
152sub rescale_widgets {
153 my ($sx, $sy) = @_;
154
155 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) {
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 }
166 }
167
168 reconfigure_widgets;
136} 169}
137 170
138############################################################################# 171#############################################################################
139 172
140package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
158 if (/^connect_(.*)$/) { 191 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 192 $self->connect ($1 => delete $self->{$_});
160 } 193 }
161 } 194 }
162 195
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197
163 $self 198 $self
164} 199}
165 200
166sub destroy { 201sub destroy {
167 my ($self) = @_; 202 my ($self) = @_;
… …
170 %$self = (); 205 %$self = ();
171} 206}
172 207
173sub show { 208sub show {
174 my ($self) = @_; 209 my ($self) = @_;
175
176 return if $self->{parent}; 210 return if $self->{parent};
177 211
178 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
179} 213}
180 214
181sub hide { 215sub show_centered {
182 my ($self) = @_; 216 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220
221 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 },
225 );
226}
227
228sub set_invisible {
229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
183 234
184 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
244sub hide {
245 my ($self) = @_;
246
247 $self->set_invisible;
186 248
187 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
188 if $self->{parent}; 250 if $self->{parent};
189} 251}
190 252
… …
232 $self->{y} = $y; 294 $self->{y} = $y;
233 $self->update; 295 $self->update;
234 } 296 }
235 297
236 if ($self->{w} != $w || $self->{h} != $h) { 298 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 300 }
244} 301}
245 302
246sub size_allocate { 303sub size_allocate {
247 # nothing to be done 304 # nothing to be done
248} 305}
249 306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
250sub children { 314sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263} 315}
264 316
265sub set_max_size { 317sub set_max_size {
266 my ($self, $w, $h) = @_; 318 my ($self, $w, $h) = @_;
267 319
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 322}
271 323
272# return top left coordinates 324sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 325 my ($self, $tooltip) = @_;
275 326
276 $self->{parent} 327 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 328 $tooltip =~ s/\s+$//;
278 329
279 $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 }
280} 338}
281 339
282# translate global coordinates to local coordinate system 340# translate global coordinates to local coordinate system
283sub coord2local { 341sub coord2local {
284 my ($self, $x, $y) = @_; 342 my ($self, $x, $y) = @_;
285 343
286 my ($X, $Y) = $self->_topleft; 344 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 345}
289 346
290# translate local coordinates to global coordinate system 347# translate local coordinates to global coordinate system
291sub coord2global { 348sub coord2global {
292 my ($self, $x, $y) = @_; 349 my ($self, $x, $y) = @_;
293 350
294 my ($X, $Y) = $self->_topleft; 351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 352}
297 353
298sub focus_in { 354sub focus_in {
299 my ($self) = @_; 355 my ($self) = @_;
300 356
301 return if $FOCUS == $self; 357 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
303 359
304 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
305 361
306 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
307 363
308 $focus->update if $focus; 364 $focus->update if $focus;
309 $FOCUS->update; 365 $FOCUS->update;
310} 366}
311 367
… …
314 370
315 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
316 372
317 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
318 374
319 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
320 376
321 $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;
322} 381}
323 382
324sub mouse_motion { } 383sub mouse_motion { }
325sub button_up { } 384sub button_up { }
326sub key_down { } 385sub key_down { }
327sub key_up { } 386sub key_up { }
328 387
329sub button_down { 388sub button_down {
330 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
331 390
332 $self->focus_in; 391 $self->focus_in;
… …
366 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix; 426 glPushMatrix;
368 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 430 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
373 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
374 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
375 glEnd; 434 glEnd;
376 glPopMatrix; 435 glPopMatrix;
377 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;
378 } 437 }
379} 438}
380 439
381sub _draw { 440sub _draw {
382 my ($self) = @_; 441 my ($self) = @_;
… …
398 457
399sub set_parent { 458sub set_parent {
400 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
401 460
402 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
403} 468}
404 469
405sub check_size { 470sub check_size {
406 my ($self) = @_; 471 my ($self, $forced) = @_;
407 472
408 $self->_check_size; 473 $self->{force_alloc} = 1 if $forced;
409 return;
410 #TODO: but needs a vastly more difficult algorithm
411 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
412
413 $check_size->{$self} = $self;
414
415 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
416 while (%$check_size) {
417 my @widgets = values %$check_size;
418 $_->_check_size
419 for @widgets;
420 }
421 });
422}
423
424sub _check_size {
425 my ($self) = @_;
426
427 delete $CFClient::UI::ROOT->{_check_size}{$self}; 474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428
429 $self->{parent}
430 or return 1;
431
432 my ($w, $h) = $self->{user_w} && $self->{user_h}
433 ? @$self{qw(user_w user_h)}
434 : $self->size_request;
435
436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
437 $self->{req_w} = $w;
438 $self->{req_h} = $h;
439
440 $self->{parent}->_check_size
441 or $self->size_allocate (
442 (List::Util::max $self->{w}, $w),
443 (List::Util::max $self->{h}, $h),
444 );
445
446 1
447 } else {
448 0
449 }
450} 475}
451 476
452sub update { 477sub update {
453 my ($self) = @_; 478 my ($self) = @_;
454 479
455 my $update = $CFClient::UI::ROOT->{_update} ||= {}; 480 $self->{parent}->update
456 481 if $self->{parent};
457 $update->{$self} = $self;
458
459 $CFClient::UI::ROOT->on_refresh (_update => sub {
460 while (%$update) {
461 my @widgets = values %$update;
462 %$update = ();
463
464 $_->{parent} && $_->{parent}->update
465 for @widgets;
466 }
467 });
468} 482}
469 483
470sub connect { 484sub connect {
471 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
472 486
473 push @{ $self->{signal_cb}{$signal} }, $cb; 487 push @{ $self->{signal_cb}{$signal} }, $cb;
474} 488}
475 489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
476sub emit { 496sub emit {
477 my ($self, $signal, @args) = @_; 497 my ($self, $signal, @args) = @_;
478 498
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
480} 501}
481 502
482sub DESTROY { 503sub DESTROY {
483 my ($self) = @_; 504 my ($self) = @_;
484 505
506 delete $WIDGET{$self+0};
485 #$self->deactivate; 507 #$self->deactivate;
486} 508}
487 509
488############################################################################# 510#############################################################################
489 511
… …
498 my $class = shift; 520 my $class = shift;
499 521
500 # range [value, low, high, page] 522 # range [value, low, high, page]
501 523
502 $class->SUPER::new ( 524 $class->SUPER::new (
503 bg => [0, 0, 0, 0.2], 525 #bg => [0, 0, 0, 0.2],
504 active_bg => [1, 1, 1, 0.5], 526 #active_bg => [1, 1, 1, 0.5],
505 @_ 527 @_
506 ) 528 )
507} 529}
508 530
509sub _draw { 531sub _draw {
510 my ($self) = @_; 532 my ($self) = @_;
511 533
534 my $color = $FOCUS == $self && $self->{active_bg}
535 ? $self->{active_bg}
536 : $self->{bg};
537
538 if ($color && (@$color < 4 || $color->[3])) {
512 my ($w, $h) = @$self{qw(w h)}; 539 my ($w, $h) = @$self{qw(w h)};
513 540
514 glEnable GL_BLEND; 541 glEnable GL_BLEND;
515 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
516 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 543 glColor @$color;
517 544
518 glBegin GL_QUADS; 545 glBegin GL_QUADS;
519 glVertex 0 , 0; 546 glVertex 0 , 0;
520 glVertex 0 , $h; 547 glVertex 0 , $h;
521 glVertex $w, $h; 548 glVertex $w, $h;
522 glVertex $w, 0; 549 glVertex $w, 0;
523 glEnd; 550 glEnd;
524 551
525 glDisable GL_BLEND; 552 glDisable GL_BLEND;
553 }
526} 554}
527 555
528############################################################################# 556#############################################################################
529 557
530package CFClient::UI::Empty; 558package CFClient::UI::Empty;
… …
574 $self->{children} = [ 602 $self->{children} = [
575 sort { $a->{z} <=> $b->{z} } 603 sort { $a->{z} <=> $b->{z} }
576 @{$self->{children}}, @widgets 604 @{$self->{children}}, @widgets
577 ]; 605 ];
578 606
579 $_->check_size 607 $self->check_size (1);
580 for @widgets;
581
582 $self->update; 608 $self->update;
583} 609}
584 610
585sub children { 611sub children {
586 @{ $_[0]{children} } 612 @{ $_[0]{children} }
… …
693} 719}
694 720
695sub update { 721sub update {
696 my ($self) = @_; 722 my ($self) = @_;
697 723
698 $ROOT->on_refresh ($self => sub { $self->render_child }); 724 $ROOT->on_post_alloc ($self => sub { $self->render_child });
699 $self->SUPER::update; 725 $self->SUPER::update;
700} 726}
701 727
702sub size_allocate { 728sub size_allocate {
703 my ($self, $w, $h) = @_; 729 my ($self, $w, $h) = @_;
… …
716 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 742 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
717 glClearColor 0, 0, 0, 0; 743 glClearColor 0, 0, 0, 0;
718 glClear GL_COLOR_BUFFER_BIT; 744 glClear GL_COLOR_BUFFER_BIT;
719 745
720 $self->_render; 746 $self->_render;
721# glColorMask 1, 1, 1, 0;
722# glEnable GL_BLEND;
723# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
724# glRasterPos 0, 0;
725# glCopyPixels 0, 0, $self->{w}, $self->{h};
726# glDisable GL_BLEND;
727# glColorMask 1, 1, 1, 1;
728 }; 747 };
729} 748}
730 749
731sub _draw { 750sub _draw {
732 my ($self) = @_; 751 my ($self) = @_;
… …
734 my ($w, $h) = ($self->w, $self->h); 753 my ($w, $h) = ($self->w, $self->h);
735 754
736 my $tex = $self->{texture} 755 my $tex = $self->{texture}
737 or return; 756 or return;
738 757
739 glEnable GL_BLEND;
740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 758 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1; 760 glColor 1, 1, 1, 1;
744 761
745 $tex->draw_quad (0, 0, $w, $h); 762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
746 763
747 glDisable GL_BLEND;
748 glDisable GL_TEXTURE_2D; 764 glDisable GL_TEXTURE_2D;
749} 765}
750 766
751############################################################################# 767#############################################################################
752 768
753package CFClient::UI::ViewPort; 769package CFClient::UI::ViewPort;
754 770
755our @ISA = CFClient::UI::Window::; 771our @ISA = CFClient::UI::Window::;
756 772
773sub new {
774 my $class = shift;
775
776 $class->SUPER::new (
777 scroll_x => 0,
778 scroll_y => 1,
779 @_,
780 )
781}
782
757sub size_request { 783sub size_request {
758 my ($self) = @_; 784 my ($self) = @_;
759 785
760 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
761 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
762 787
763 @$self{qw(child_w child_h)} 788 @$self{qw(child_w child_h)}
764} 789}
765 790
766sub size_allocate { 791sub size_allocate {
767 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
768 793
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796
797 $self->child->configure (0, 0, $w, $h);
769 $self->update; 798 $self->update;
770} 799}
771 800
772sub set_offset { 801sub set_offset {
773 my ($self, $x, $y) = @_; 802 my ($self, $x, $y) = @_;
… …
776 $self->{view_y} = int $y; 805 $self->{view_y} = int $y;
777 806
778 $self->update; 807 $self->update;
779} 808}
780 809
781# hmm, this does not work for topleft of $self... but we should not aks for that 810# hmm, this does not work for topleft of $self... but we should not ask for that
782sub _topleft { 811sub coord2local {
783 my ($self, $x, $y) = @_; 812 my ($self, $x, $y) = @_;
784 813
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 814 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
815}
816
817sub coord2global {
818 my ($self, $x, $y) = @_;
819
820 $x = List::Util::min $self->{w}, $x - $self->{view_x};
821 $y = List::Util::min $self->{h}, $y - $self->{view_y};
822
823 $self->SUPER::coord2global ($x, $y)
786} 824}
787 825
788sub find_widget { 826sub find_widget {
789 my ($self, $x, $y) = @_; 827 my ($self, $x, $y) = @_;
790 828
… …
818 856
819 my $slider = new CFClient::UI::Slider 857 my $slider = new CFClient::UI::Slider
820 vertical => 1, 858 vertical => 1,
821 range => [0, 0, 1, 0.01], # HACK fix 859 range => [0, 0, 1, 0.01], # HACK fix
822 connect_changed => sub { 860 connect_changed => sub {
823 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 861 $self->{vp}->set_offset (0, $_[1]);
824 }, 862 },
825 ; 863 ;
826 864
827 $self = $class->SUPER::new ( 865 $self = $class->SUPER::new (
828 vp => (new CFClient::UI::ViewPort), 866 vp => (new CFClient::UI::ViewPort expand => 1),
829 slider => $slider, 867 slider => $slider,
830 @_, 868 @_,
831 ); 869 );
832 870
833 $self->{vp}->add ($self->{scrolled}); 871 $self->{vp}->add ($self->{scrolled});
… …
835 $self->add ($self->{slider}); 873 $self->add ($self->{slider});
836 874
837 $self 875 $self
838} 876}
839 877
878sub size_allocate {
879 my ($self, $w, $h) = @_;
880
881 $self->SUPER::size_allocate ($w, $h);
882
883 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
885}
886
840#TODO# update range on size_allocate depeneing on child 887#TODO# update range on size_allocate depending on child
841# update viewport offset on scroll 888# update viewport offset on scroll
842 889
843############################################################################# 890#############################################################################
844 891
845package CFClient::UI::Frame; 892package CFClient::UI::Frame;
… …
849use CFClient::OpenGL; 896use CFClient::OpenGL;
850 897
851sub new { 898sub new {
852 my $class = shift; 899 my $class = shift;
853 900
854 my $self = $class->SUPER::new ( 901 $class->SUPER::new (
855 bg => [1, 1, 1, 1], 902 bg => undef,
856 border_bg => [1, 1, 1, 1],
857 border => 0.8,
858 @_ 903 @_,
859 ); 904 )
860
861 $self
862} 905}
863 906
864sub _draw { 907sub _draw {
865 my ($self) = @_; 908 my ($self) = @_;
866 909
867 my ($w, $h) = ($self->{w}, $self->{h}); 910 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)};
868 912
869 glEnable GL_BLEND; 913 glEnable GL_BLEND;
870 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
871 glEnable GL_TEXTURE_2D; 915 glColor @{ $self->{bg} };
872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
873 916
874# glBegin GL_QUADS; 917 glBegin GL_QUADS;
875# glColor 0, 0, 0, 0;
876# glVertex 0 , 0; 918 glVertex 0 , 0;
877# glVertex 0 , $h; 919 glVertex 0 , $h;
878# glVertex $w, $h; 920 glVertex $w, $h;
879# glVertex $w, 0; 921 glVertex $w, 0;
880# glEnd; 922 glEnd;
881 923
882
883 $self->child->draw;
884 glDisable GL_BLEND; 924 glDisable GL_BLEND;
885 glDisable GL_TEXTURE_2D; 925 }
926
927 $self->SUPER::_draw;
886} 928}
887 929
888############################################################################# 930#############################################################################
889 931
890package CFClient::UI::FancyFrame; 932package CFClient::UI::FancyFrame;
… …
901 my $class = shift; 943 my $class = shift;
902 944
903 # TODO: user_x, user_y, overwrite moveto? 945 # TODO: user_x, user_y, overwrite moveto?
904 946
905 my $self = $class->SUPER::new ( 947 my $self = $class->SUPER::new (
906 bg => [1, 1, 1, 1], 948 bg => [1, 1, 1, 1],
907 border_bg => [1, 1, 1, 1], 949 border_bg => [1, 1, 1, 1],
908 border => 0.6, 950 border => 0.6,
951 is_toplevel => 1,
909 can_events => 1, 952 can_events => 1,
910 @_ 953 @_
911 ); 954 );
912 955
913 $self->{title} &&= new CFClient::UI::Label 956 $self->{title} &&= new CFClient::UI::Label
914 align => 0, 957 align => 0,
… …
938 my ($self, $w, $h) = @_; 981 my ($self, $w, $h) = @_;
939 982
940 $h -= List::Util::max 0, $self->border * 2; 983 $h -= List::Util::max 0, $self->border * 2;
941 $w -= List::Util::max 0, $self->border * 2; 984 $w -= List::Util::max 0, $self->border * 2;
942 985
943 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
944 if $self->{title}; 987 if $self->{title};
945 988
946 $self->child->configure ($self->border, $self->border, $w, $h); 989 $self->child->configure ($self->border, $self->border, $w, $h);
947} 990}
948 991
… …
1006 my ($self) = @_; 1049 my ($self) = @_;
1007 1050
1008 my ($w, $h ) = ($self->{w}, $self->{h}); 1051 my ($w, $h ) = ($self->{w}, $self->{h});
1009 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1010 1053
1011 glEnable GL_BLEND;
1012 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1013 glEnable GL_TEXTURE_2D; 1054 glEnable GL_TEXTURE_2D;
1014 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1015 1056
1016 my $border = $self->border; 1057 my $border = $self->border;
1017 1058
1018 glColor @{ $self->{border_bg} }; 1059 glColor @{ $self->{border_bg} };
1019 $tex[1]->draw_quad (0, 0, $w, $border); 1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
1020 $tex[3]->draw_quad (0, $border, $border, $ch); 1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1022 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1023 1064
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1025 my $bg = $tex[0]; 1066 my $bg = $tex[0];
1026 1067
1027 # TODO: repeat texture not scale 1068 # TODO: repeat texture not scale
… …
1031 glColor @{ $self->{bg} }; 1072 glColor @{ $self->{bg} };
1032 1073
1033 $bg->{s} = $rep_x; 1074 $bg->{s} = $rep_x;
1034 $bg->{t} = $rep_y; 1075 $bg->{t} = $rep_y;
1035 $bg->{wrap_mode} = 1; 1076 $bg->{wrap_mode} = 1;
1036 $bg->draw_quad ($border, $border, $cw, $ch); 1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 }
1037 1079
1038 glDisable GL_TEXTURE_2D; 1080 glDisable GL_TEXTURE_2D;
1039 glDisable GL_BLEND;
1040 }
1041 1081
1042 $self->{title}->draw if $self->{title}; 1082 $self->{title}->draw if $self->{title};
1043 1083
1044 $self->child->draw; 1084 $self->child->draw;
1045} 1085}
… …
1057sub new { 1097sub new {
1058 my $class = shift; 1098 my $class = shift;
1059 1099
1060 $class->SUPER::new ( 1100 $class->SUPER::new (
1061 col_expand => [], 1101 col_expand => [],
1062 @_ 1102 @_,
1063 ) 1103 )
1064} 1104}
1065 1105
1066sub add { 1106sub add {
1067 my ($self, $x, $y, $child) = @_; 1107 my ($self, $x, $y, $child) = @_;
… …
1272} 1312}
1273 1313
1274sub size_allocate { 1314sub size_allocate {
1275 my ($self, $w, $h) = @_; 1315 my ($self, $w, $h) = @_;
1276 1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1277 my $children = $self->{children}; 1319 my $children = $self->{children};
1278 1320
1279 my @h = map $_->{req_h}, @$children; 1321 my @h = map $_->{req_h}, @$children;
1280 1322
1281 my $req_h = List::Util::sum @h; 1323 my $req_h = List::Util::sum @h;
… …
1310 1352
1311############################################################################# 1353#############################################################################
1312 1354
1313package CFClient::UI::Label; 1355package CFClient::UI::Label;
1314 1356
1315our @ISA = CFClient::UI::Base::; 1357our @ISA = CFClient::UI::DrawBG::;
1316 1358
1317use CFClient::OpenGL; 1359use CFClient::OpenGL;
1318 1360
1319sub new { 1361sub new {
1320 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1321 1363
1322 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1323 fg => [1, 1, 1], 1365 fg => [1, 1, 1],
1366 #bg => none
1367 #active_bg => none
1324 #font => default_font 1368 #font => default_font
1369 #text => initial text
1370 #markup => initial narkup
1371 #max_w => maximum pixel width
1372 ellipsise => 3, # end
1373 layout => (new CFClient::Layout),
1325 fontsize => 1, 1374 fontsize => 1,
1326 text => "",
1327 align => -1, 1375 align => -1,
1328 valign => -1, 1376 valign => -1,
1329 padding => 2, 1377 padding => 2,
1330 layout => new CFClient::Layout,
1331 can_events => 0, 1378 can_events => 0,
1332 %arg 1379 %arg
1333 ); 1380 );
1334 1381
1335 if (exists $self->{template}) { 1382 if (exists $self->{template}) {
1336 my $layout = new CFClient::Layout; 1383 my $layout = new CFClient::Layout;
1337 $layout->set_text (delete $self->{template}); 1384 $layout->set_text (delete $self->{template});
1338 $self->{template} = $layout; 1385 $self->{template} = $layout;
1339 } 1386 }
1340 1387
1341 $self->set_text (delete $self->{text}) if exists $self->{text}; 1388 if (exists $self->{markup}) {
1342 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1389 $self->set_markup (delete $self->{markup});
1390 } else {
1391 $self->set_text (delete $self->{text});
1392 }
1343 1393
1344 $self 1394 $self
1345} 1395}
1346 1396
1347sub escape { 1397sub escape($) {
1348 local $_ = $_[1]; 1398 local $_ = $_[0];
1349 1399
1350 s/&/&amp;/g; 1400 s/&/&amp;/g;
1351 s/>/&gt;/g; 1401 s/>/&gt;/g;
1352 s/</&lt;/g; 1402 s/</&lt;/g;
1353 1403
1354 $_[1] 1404 $_
1355} 1405}
1356 1406
1357sub update { 1407sub update {
1358 my ($self) = @_; 1408 my ($self) = @_;
1359 1409
… …
1365 my ($self, $text) = @_; 1415 my ($self, $text) = @_;
1366 1416
1367 return if $self->{text} eq "T$text"; 1417 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text"; 1418 $self->{text} = "T$text";
1369 1419
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1421 $self->{layout}->set_text ($text);
1371 1422
1372 delete $self->{texture};
1373 $self->update; 1423 $self->update;
1374 $self->check_size; 1424 $self->check_size;
1375} 1425}
1376 1426
1377sub set_markup { 1427sub set_markup {
1378 my ($self, $markup) = @_; 1428 my ($self, $markup) = @_;
1379 1429
1380 return if $self->{text} eq "M$markup"; 1430 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup"; 1431 $self->{text} = "M$markup";
1382 1432
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1383 $self->{layout}->set_markup ($markup); 1436 $self->{layout}->set_markup ($markup);
1384 1437
1385 delete $self->{texture};
1386 $self->update; 1438 $self->update;
1387 $self->check_size; 1439 $self->check_size;
1388} 1440}
1389 1441
1390sub size_request { 1442sub size_request {
1391 my ($self) = @_; 1443 my ($self) = @_;
1392 1444
1393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1445 $self->{layout}->set_font ($self->{font}) if $self->{font};
1394 $self->{layout}->set_width ($self->{max_w} || -1); 1446 $self->{layout}->set_width ($self->{max_w} || -1);
1447 $self->{layout}->set_ellipsise ($self->{ellipsise});
1448 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1449 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1396 1450
1397 my ($w, $h) = $self->{layout}->size; 1451 my ($w, $h) = $self->{layout}->size;
1398 1452
1399 if (exists $self->{template}) { 1453 if (exists $self->{template}) {
… …
1429} 1483}
1430 1484
1431sub _draw { 1485sub _draw {
1432 my ($self) = @_; 1486 my ($self) = @_;
1433 1487
1488 $self->SUPER::_draw; # draw background, if applicable
1489
1434 my $tex = $self->{texture} ||= do { 1490 my $tex = $self->{texture} ||= do {
1491 $self->{layout}->set_foreground (@{$self->{fg}});
1435 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1492 $self->{layout}->set_font ($self->{font}) if $self->{font};
1436 $self->{layout}->set_width ($self->{w}); 1493 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1437 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497
1438 new_from_layout CFClient::Texture $self->{layout} 1498 my $tex = new_from_layout CFClient::Texture $self->{layout};
1499
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1502 : ($self->{w} - $tex->{w}) * 0.5);
1503
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1506 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1439 }; 1509 };
1440 1510
1441 glEnable GL_BLEND;
1442 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1443 glEnable GL_TEXTURE_2D; 1511 glEnable GL_TEXTURE_2D;
1444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1445 1513
1514 if ($tex->{format} == GL_ALPHA) {
1446 glColor @{$self->{fg}}; 1515 glColor @{$self->{fg}};
1447
1448 $self->{ox} = int (
1449 $self->{align} < 0 ? $self->{padding}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1451 : ($self->{w} - $tex->{w}) * 0.5
1452 );
1453
1454 $self->{oy} = int (
1455 $self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5
1458 );
1459
1460 $tex->draw_quad ($self->{ox}, $self->{oy}); 1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1517 } else {
1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1519 }
1461 1520
1462 glDisable GL_TEXTURE_2D; 1521 glDisable GL_TEXTURE_2D;
1463 glDisable GL_BLEND;
1464} 1522}
1465 1523
1466############################################################################# 1524#############################################################################
1467 1525
1468package CFClient::UI::EntryBase; 1526package CFClient::UI::EntryBase;
… …
1481 active_fg => [0, 0, 0], 1539 active_fg => [0, 0, 0],
1482 can_hover => 1, 1540 can_hover => 1,
1483 can_focus => 1, 1541 can_focus => 1,
1484 valign => 0, 1542 valign => 0,
1485 can_events => 1, 1543 can_events => 1,
1544 #text => ...
1486 @_ 1545 @_
1487 ) 1546 )
1488} 1547}
1489 1548
1490sub _set_text { 1549sub _set_text {
… …
1500 $self->{text} = $text; 1559 $self->{text} = $text;
1501 1560
1502 $text =~ s/./*/g if $self->{hidden}; 1561 $text =~ s/./*/g if $self->{hidden};
1503 $self->{layout}->set_text ("$text "); 1562 $self->{layout}->set_text ("$text ");
1504 1563
1505 $self->emit (changed => $self->{text}); 1564 $self->_emit (changed => $self->{text});
1506}
1507
1508sub get_text {
1509 $_[0]{text}
1510}
1511
1512sub size_request {
1513 my ($self) = @_;
1514
1515 my ($w, $h) = $self->SUPER::size_request;
1516
1517 ($w + 1, $h) # add 1 for cursor
1518}
1519
1520sub size_allocate {
1521 my ($self, $w, $h) = @_;
1522
1523 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1524} 1565}
1525 1566
1526sub set_text { 1567sub set_text {
1527 my ($self, $text) = @_; 1568 my ($self, $text) = @_;
1528 1569
1529 $self->{cursor} = length $text; 1570 $self->{cursor} = length $text;
1530 $self->_set_text ($text); 1571 $self->_set_text ($text);
1531 $self->update; 1572 $self->update;
1573 $self->check_size;
1574}
1575
1576sub get_text {
1577 $_[0]{text}
1578}
1579
1580sub size_request {
1581 my ($self) = @_;
1582
1583 my ($w, $h) = $self->SUPER::size_request;
1584
1585 ($w + 1, $h) # add 1 for cursor
1532} 1586}
1533 1587
1534sub key_down { 1588sub key_down {
1535 my ($self, $ev) = @_; 1589 my ($self, $ev) = @_;
1536 1590
… …
1538 my $sym = $ev->{sym}; 1592 my $sym = $ev->{sym};
1539 my $uni = $ev->{unicode}; 1593 my $uni = $ev->{unicode};
1540 1594
1541 my $text = $self->get_text; 1595 my $text = $self->get_text;
1542 1596
1543 if ($sym == 8) { 1597 if ($uni == 8) {
1544 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1598 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1545 } elsif ($sym == 127) { 1599 } elsif ($uni == 127) {
1546 substr $text, $self->{cursor}, 1, ""; 1600 substr $text, $self->{cursor}, 1, "";
1547 } elsif ($sym == CFClient::SDLK_LEFT) { 1601 } elsif ($sym == CFClient::SDLK_LEFT) {
1548 --$self->{cursor} if $self->{cursor}; 1602 --$self->{cursor} if $self->{cursor};
1549 } elsif ($sym == CFClient::SDLK_RIGHT) { 1603 } elsif ($sym == CFClient::SDLK_RIGHT) {
1550 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1604 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1551 } elsif ($sym == CFClient::SDLK_HOME) { 1605 } elsif ($sym == CFClient::SDLK_HOME) {
1552 $self->{cursor} = 0; 1606 $self->{cursor} = 0;
1553 } elsif ($sym == CFClient::SDLK_END) { 1607 } elsif ($sym == CFClient::SDLK_END) {
1554 $self->{cursor} = length $text; 1608 $self->{cursor} = length $text;
1555 } elsif ($sym == 27) { 1609 } elsif ($uni == 27) {
1556 $self->emit ('escape'); 1610 $self->_emit ('escape');
1557 } elsif ($uni) { 1611 } elsif ($uni) {
1558 substr $text, $self->{cursor}++, 0, chr $uni; 1612 substr $text, $self->{cursor}++, 0, chr $uni;
1559 } 1613 }
1560 1614
1561 $self->_set_text ($text); 1615 $self->_set_text ($text);
1562 $self->update; 1616 $self->update;
1617 $self->check_size;
1563} 1618}
1564 1619
1565sub focus_in { 1620sub focus_in {
1566 my ($self) = @_; 1621 my ($self) = @_;
1567 1622
… …
1647 if ($sym == 13) { 1702 if ($sym == 13) {
1648 unshift @{$self->{history}}, 1703 unshift @{$self->{history}},
1649 my $txt = $self->get_text; 1704 my $txt = $self->get_text;
1650 $self->{history_pointer} = -1; 1705 $self->{history_pointer} = -1;
1651 $self->{history_saveback} = ''; 1706 $self->{history_saveback} = '';
1652 $self->emit (activate => $txt); 1707 $self->_emit (activate => $txt);
1653 $self->update; 1708 $self->update;
1654 1709
1655 } elsif ($sym == CFClient::SDLK_UP) { 1710 } elsif ($sym == CFClient::SDLK_UP) {
1656 if ($self->{history_pointer} < 0) { 1711 if ($self->{history_pointer} < 0) {
1657 $self->{history_saveback} = $self->get_text; 1712 $self->{history_saveback} = $self->get_text;
… …
1696 my $class = shift; 1751 my $class = shift;
1697 1752
1698 $class->SUPER::new ( 1753 $class->SUPER::new (
1699 padding => 4, 1754 padding => 4,
1700 fg => [1, 1, 1], 1755 fg => [1, 1, 1],
1701 bg => [1, 1, 1, 0.2],
1702 active_fg => [0, 0, 1], 1756 active_fg => [0, 0, 1],
1703 can_hover => 1, 1757 can_hover => 1,
1704 align => 0, 1758 align => 0,
1705 valign => 0, 1759 valign => 0,
1706 can_events => 1, 1760 can_events => 1,
1707 @_ 1761 @_
1708 ) 1762 )
1709} 1763}
1710 1764
1765sub activate { }
1766
1711sub button_up { 1767sub button_up {
1712 my ($self, $ev, $x, $y) = @_; 1768 my ($self, $ev, $x, $y) = @_;
1713 1769
1770 $self->emit ("activate")
1714 if ($x >= 0 && $x < $self->{w} 1771 if $x >= 0 && $x < $self->{w}
1715 && $y >= 0 && $y < $self->{h}) { 1772 && $y >= 0 && $y < $self->{h};
1716 $self->emit ("activate");
1717 }
1718} 1773}
1719 1774
1720sub _draw { 1775sub _draw {
1721 my ($self) = @_; 1776 my ($self) = @_;
1722 1777
… …
1724 1779
1725 if ($GRAB == $self) { 1780 if ($GRAB == $self) {
1726 $self->{fg} = $self->{active_fg}; 1781 $self->{fg} = $self->{active_fg};
1727 } 1782 }
1728 1783
1729 glEnable GL_BLEND;
1730 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1731 glEnable GL_TEXTURE_2D; 1784 glEnable GL_TEXTURE_2D;
1732 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1733 glColor 0, 0, 0, 1; 1786 glColor 0, 0, 0, 1;
1734 1787
1735 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1788 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1736 1789
1737 glDisable GL_TEXTURE_2D; 1790 glDisable GL_TEXTURE_2D;
1738 glDisable GL_BLEND;
1739 1791
1740 $self->SUPER::_draw; 1792 $self->SUPER::_draw;
1741} 1793}
1742 1794
1743############################################################################# 1795#############################################################################
… …
1757 1809
1758 $class->SUPER::new ( 1810 $class->SUPER::new (
1759 padding => 2, 1811 padding => 2,
1760 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1761 active_fg => [1, 1, 0], 1813 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5],
1762 state => 0, 1816 state => 0,
1763 can_hover => 1, 1817 can_hover => 1,
1764 @_ 1818 @_
1765 ) 1819 )
1766} 1820}
… …
1775 my ($self, $ev, $x, $y) = @_; 1829 my ($self, $ev, $x, $y) = @_;
1776 1830
1777 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1778 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1779 $self->{state} = !$self->{state}; 1833 $self->{state} = !$self->{state};
1780 $self->emit (changed => $self->{state}); 1834 $self->_emit (changed => $self->{state});
1781 } 1835 }
1782} 1836}
1783 1837
1784sub _draw { 1838sub _draw {
1785 my ($self) = @_; 1839 my ($self) = @_;
… …
1790 1844
1791 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1845 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1792 1846
1793 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1794 1848
1795 glEnable GL_BLEND; 1849 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850
1796 glEnable GL_TEXTURE_2D; 1851 glEnable GL_TEXTURE_2D;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798
1799 my $tex = $self->{state} ? $tex[1] : $tex[0];
1800
1801 $tex->draw_quad (0, 0, $s, $s); 1852 $tex->draw_quad_alpha (0, 0, $s, $s);
1802
1803 glDisable GL_TEXTURE_2D; 1853 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805} 1854}
1806 1855
1807############################################################################# 1856#############################################################################
1808 1857
1809package CFClient::UI::Image; 1858package CFClient::UI::Image;
… …
1852 glTranslate 0, -$self->{w}, 0; 1901 glTranslate 0, -$self->{w}, 0;
1853 1902
1854 ($w, $h) = ($h, $w); 1903 ($w, $h) = ($h, $w);
1855 } 1904 }
1856 1905
1857 glEnable GL_BLEND;
1858 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1859 glEnable GL_TEXTURE_2D; 1906 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1907 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 1908
1862 $tex->draw_quad (0, 0, $w, $h); 1909 $tex->draw_quad_alpha (0, 0, $w, $h);
1863 1910
1864 glDisable GL_BLEND;
1865 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1866} 1912}
1867 1913
1868############################################################################# 1914#############################################################################
1869 1915
… …
2058 qw(s1_slider.png s1_slider_bg.png); 2104 qw(s1_slider.png s1_slider_bg.png);
2059 2105
2060sub new { 2106sub new {
2061 my $class = shift; 2107 my $class = shift;
2062 2108
2063 # range [value, low, high, page] 2109 # range [value, low, high, page, unit]
2064 2110
2065 # TODO: 0-width page 2111 # TODO: 0-width page
2066 # TODO: req_w/h are wrong with vertical 2112 # TODO: req_w/h are wrong with vertical
2067 # TODO: calculations are off 2113 # TODO: calculations are off
2068 my $self = $class->SUPER::new ( 2114 my $self = $class->SUPER::new (
2069 fg => [1, 1, 1], 2115 fg => [1, 1, 1],
2070 active_fg => [0, 0, 0], 2116 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5],
2071 range => [0, 0, 100, 10], 2119 range => [0, 0, 100, 10, 0],
2072 req_w => $::WIDTH / 80, 2120 req_w => $::WIDTH / 80,
2073 req_h => $::WIDTH / 80, 2121 req_h => $::WIDTH / 80,
2074 vertical => 0, 2122 vertical => 0,
2075 can_hover => 1, 2123 can_hover => 1,
2076 inner_pad => 5, 2124 inner_pad => 0.02,
2077 @_ 2125 @_
2078 ); 2126 );
2079 2127
2128 $self->set_value ($self->{range}[0]);
2129 $self->update;
2130
2080 $self 2131 $self
2132}
2133
2134sub set_range {
2135 my ($self, $range) = @_;
2136
2137 $self->{range} = $range;
2138
2139 $self->update;
2140}
2141
2142sub set_value {
2143 my ($self, $value) = @_;
2144
2145 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2146
2147 $hi = $lo + 1 if $hi <= $lo;
2148
2149 $page = $hi - $lo if $page > $hi - $lo;
2150
2151 $value = $lo if $value < $lo;
2152 $value = $hi - $page if $value > $hi - $page;
2153
2154 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2155 if $unit;
2156
2157 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2158
2159 if ($value != $old_value) {
2160 $self->_emit (changed => $value);
2161 $self->update;
2162 }
2081} 2163}
2082 2164
2083sub size_request { 2165sub size_request {
2084 my ($self) = @_; 2166 my ($self) = @_;
2085 2167
… …
2091 2173
2092sub button_down { 2174sub button_down {
2093 my ($self, $ev, $x, $y) = @_; 2175 my ($self, $ev, $x, $y) = @_;
2094 2176
2095 $self->SUPER::button_down ($ev, $x, $y); 2177 $self->SUPER::button_down ($ev, $x, $y);
2178
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180
2096 $self->mouse_motion ($ev, $x, $y); 2181 $self->mouse_motion ($ev, $x, $y);
2097} 2182}
2098 2183
2099sub mouse_motion { 2184sub mouse_motion {
2100 my ($self, $ev, $x, $y) = @_; 2185 my ($self, $ev, $x, $y) = @_;
2101 2186
2102 if ($GRAB == $self) { 2187 if ($GRAB == $self) {
2188 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2189
2190 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193
2194 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2195 }
2196}
2197
2198sub update {
2199 my ($self) = @_;
2200
2201 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2202 $self->set_value ($self->{range}[0]);
2203
2103 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2204 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100;
2104 2206
2105 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2207 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2106 2208
2107 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2209 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2108 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2210 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2109 2211
2110 $x -= $inner_pad_px; # substract the padding 2212 $value = ($value - $lo) / $range;
2111 $x = $x * ($hi - $lo) / $inner_w + $lo; 2213 $value = $value * $self->{scale} + $self->{offset};
2112 $x = $lo if $x < $lo;
2113 $x = $hi - $page if $x > $hi - $page;
2114 $self->{range}[0] = $x;
2115 2214
2116 $self->emit (changed => $x); 2215 $self->{knob_x} = $value - $knob_w * 0.5;
2117 $self->update; 2216 $self->{knob_w} = $knob_w;
2118 } 2217 });
2119}
2120 2218
2121# the inner_* stuff is for generating a padding for the slider handle, 2219 $self->SUPER::update;
2122# so that the handle doesn't leave the texture. This calculation isn't 100%
2123# correct propably, but it does the job for now
2124sub _calc_inner_pad_px {
2125 my ($self, $w) = @_;
2126 ($w / 100) * $self->{inner_pad} # % to pixels
2127} 2220}
2128 2221
2129sub _draw { 2222sub _draw {
2130 my ($self) = @_; 2223 my ($self) = @_;
2131 2224
2132 $self->SUPER::_draw (); 2225 $self->SUPER::_draw ();
2133 2226
2134 my ($w, $h) = @$self{qw(w h)}; 2227 glScale $self->{w}, $self->{h};
2135 2228
2136 if ($self->{vertical}) { 2229 if ($self->{vertical}) {
2137 # draw a vertical slider like a rotated horizontal slider 2230 # draw a vertical slider like a rotated horizontal slider
2138 2231
2232 glTranslate 1, 0, 0;
2139 glRotate 90, 0, 0, 1; 2233 glRotate 90, 0, 0, 1;
2140 glTranslate 0, -$self->{w}, 0;
2141
2142 ($w, $h) = ($h, $w);
2143 } 2234 }
2144 2235
2145 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2236 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2146 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2237 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2147 2238
2148 my ($value, $lo, $hi, $page) = @{$self->{range}};
2149
2150 $hi = $value + 1 if $lo == $hi;
2151
2152 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2153 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2154
2155 $page = int $page * $inner_w / ($hi - $lo);
2156 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2157
2158 $w -= $page;
2159 $page &= ~1;
2160 glTranslate $page * 0.5, 0, 0;
2161 $page ||= 2;
2162
2163 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2164 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2165
2166 glEnable GL_BLEND;
2167 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2168 glEnable GL_TEXTURE_2D; 2239 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2240 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 2241
2171 # draw background 2242 # draw background
2172 $tex[1]->draw_quad (0, 0, $w, $h); 2243 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2173 2244
2174 # draw handle 2245 # draw handle
2175 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2246 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2176 2247
2177 glDisable GL_BLEND;
2178 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2179} 2249}
2250
2251#############################################################################
2252
2253package CFClient::UI::ValSlider;
2254
2255our @ISA = CFClient::UI::HBox::;
2256
2257sub new {
2258 my ($class, %arg) = @_;
2259
2260 my $range = delete $arg{range};
2261
2262 my $self = $class->SUPER::new (
2263 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2264 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2265 to_value => sub { shift },
2266 from_value => sub { shift },
2267 %arg,
2268 );
2269
2270 $self->{slider}->connect (changed => sub {
2271 my ($self, $value) = @_;
2272 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2273 $self->{parent}->emit (changed => $value);
2274 });
2275
2276# $self->{entry}->connect (changed => sub {
2277# my ($self, $value) = @_;
2278# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2279# $self->{parent}->emit (changed => $value);
2280# });
2281
2282 $self->add ($self->{slider}, $self->{entry});
2283
2284 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2285
2286 $self
2287}
2288
2289sub set_range { shift->{slider}->set_range (@_) }
2290sub set_value { shift->{slider}->set_value (@_) }
2180 2291
2181############################################################################# 2292#############################################################################
2182 2293
2183package CFClient::UI::TextView; 2294package CFClient::UI::TextView;
2184 2295
… …
2193 fontsize => 1, 2304 fontsize => 1,
2194 can_events => 0, 2305 can_events => 0,
2195 #font => default_font 2306 #font => default_font
2196 @_, 2307 @_,
2197 2308
2198 layout => (new CFClient::Layout), 2309 layout => (new CFClient::Layout 1),
2199 par => [], 2310 par => [],
2200 height => 0, 2311 height => 0,
2201 children => [ 2312 children => [
2202 (new CFClient::UI::Empty expand => 1), 2313 (new CFClient::UI::Empty expand => 1),
2203 (new CFClient::UI::Slider vertical => 1), 2314 (new CFClient::UI::Slider vertical => 1),
… …
2214 2325
2215 $self->{fontsize} = $fontsize; 2326 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2327 $self->reflow;
2217} 2328}
2218 2329
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_text ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2330sub size_allocate {
2239 my ($self, $w, $h) = @_; 2331 my ($self, $w, $h) = @_;
2240 2332
2241 $self->SUPER::size_allocate ($w, $h); 2333 $self->SUPER::size_allocate ($w, $h);
2242 2334
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2337 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2338
2247 $self->reflow; 2339 $self->reflow;
2248} 2340}
2249 2341
2342sub text_size {
2343 my ($self, $text, $indent) = @_;
2344
2345 my $layout = $self->{layout};
2346
2347 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2348 $layout->set_width ($self->{children}[0]{w} - $indent);
2349 $layout->set_markup ($text);
2350
2351 $layout->size
2352}
2353
2354sub reflow {
2355 my ($self) = @_;
2356
2357 $self->{need_reflow}++;
2358 $self->update;
2359}
2360
2361sub set_offset {
2362 my ($self, $offset) = @_;
2363
2364 # todo: base offset on lines or so, not on pixels
2365 $self->{children}[1]->set_value ($offset);
2366}
2367
2368sub clear {
2369 my ($self) = @_;
2370
2371 $self->{par} = [];
2372 $self->{height} = 0;
2373 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2374}
2375
2250sub add_paragraph { 2376sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2377 my ($self, $color, $text, $indent) = @_;
2252 2378
2253 #TODO: intelligently "reformat" paragraph 2379 for my $line (split /\n/, $text) {
2254 2380 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2381 $self->{height} += $h;
2382 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2383 }
2258 2384
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2385 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262 $self->{children}[1]->update;
2263} 2386}
2264 2387
2265sub update { 2388sub update {
2266 my ($self) = @_; 2389 my ($self) = @_;
2267 2390
… …
2269 2392
2270 return unless $self->{h} > 0; 2393 return unless $self->{h} > 0;
2271 2394
2272 delete $self->{texture}; 2395 delete $self->{texture};
2273 2396
2274 $ROOT->on_refresh ($self, sub { 2397 $ROOT->on_post_alloc ($self, sub {
2398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399
2275 if (delete $self->{need_reflow}) { 2400 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2401 my $height = 0;
2277 2402
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406
2279 for @{$self->{par}}; 2407 for (@{$self->{par}}) {
2408 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2409 $layout->set_width ($W - $_->[3]);
2410 $layout->set_markup ($_->[4]);
2411 my ($w, $h) = $layout->size;
2412 $_->[0] = $w + $_->[3];
2413 $_->[1] = $h;
2414 }
2415
2416 $height += $_->[1];
2417 }
2280 2418
2281 $self->{height} = $height; 2419 $self->{height} = $height;
2282 2420
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2421 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2422
2285 delete $self->{texture}; 2423 delete $self->{texture};
2286 } 2424 }
2287 2425
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2427 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2428 glClear GL_COLOR_BUFFER_BIT;
2291 2429
2430 my $top = int $self->{children}[1]{range}[0];
2431
2432 my $y0 = $top;
2433 my $y1 = $top + $H;
2434
2435 my $y = 0;
2436
2437 my $layout = $self->{layout};
2438
2439 $layout->set_font ($self->{font}) if $self->{font};
2440
2292 glEnable GL_BLEND; 2441 glEnable GL_BLEND;
2442 #TODO# not correct in windows where rgba is forced off
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2443 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296
2297 my $top = int $self->{children}[1]{range}[0];
2298
2299 my $y0 = $top;
2300 my $y1 = $top + $self->{h};
2301
2302 my $y = 0;
2303
2304 my $layout = $self->{layout};
2305
2306 $layout->set_font ($self->{font}) if $self->{font};
2307 2444
2308 for my $par (@{$self->{par}}) { 2445 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2446 my $h = $par->[1];
2310 2447
2311 if ($y0 < $y + $h && $y < $y1) { 2448 if ($y0 < $y + $h && $y < $y1) {
2449 $layout->set_foreground (@{ $par->[2] });
2450 $layout->set_width ($W - $par->[3]);
2312 $layout->set_text ($par->[2]); 2451 $layout->set_markup ($par->[4]);
2313 2452
2314 glColor @{ $par->[1] }; 2453 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2315 my ($W, $H) = $layout->size; 2454
2316 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2455 glRasterPos $par->[3], $y - $y0;
2456 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2317 } 2457 }
2318 2458
2319 $y += $h; 2459 $y += $h;
2320 } 2460 }
2321 2461
2322 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND; 2462 glDisable GL_BLEND;
2324 }; 2463 };
2325 }); 2464 });
2326} 2465}
2327 2466
2328sub _draw { 2467sub _draw {
2329 my ($self) = @_; 2468 my ($self) = @_;
2330 2469
2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2333 glEnable GL_TEXTURE_2D; 2470 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2472 glColor 1, 1, 1, 1;
2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2473 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2474 glDisable GL_TEXTURE_2D;
2338 glDisable GL_BLEND;
2339 2475
2340 $self->{children}[1]->draw; 2476 $self->{children}[1]->draw;
2341 2477
2342} 2478}
2343 2479
… …
2411 2547
2412 # TODO: use animation 2548 # TODO: use animation
2413 if ($self->{state} = !$self->{state}) { 2549 if ($self->{state} = !$self->{state}) {
2414 $CFClient::UI::ROOT->add ($self->{other}); 2550 $CFClient::UI::ROOT->add ($self->{other});
2415 $self->{other}->move ($self->coord2global (0, $self->{h})); 2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2416 $self->emit ("open"); 2552 $self->_emit ("open");
2417 } else { 2553 } else {
2418 $CFClient::UI::ROOT->remove ($self->{other}); 2554 $CFClient::UI::ROOT->remove ($self->{other});
2419 $self->emit ("close"); 2555 $self->_emit ("close");
2420 } 2556 }
2421 2557
2422 $self->emit (changed => $self->{state}); 2558 $self->_emit (changed => $self->{state});
2423} 2559}
2424 2560
2425############################################################################# 2561#############################################################################
2426 2562
2427package CFClient::UI::Tooltip; 2563package CFClient::UI::Tooltip;
… …
2437 @_, 2573 @_,
2438 can_events => 0, 2574 can_events => 0,
2439 ) 2575 )
2440} 2576}
2441 2577
2442sub set_markup { 2578sub set_tooltip_from {
2443 my ($self, $text) = @_; 2579 my ($self, $widget) = @_;
2444 2580
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2581 $self->add (new CFClient::UI::Label
2446 $self->{label}->set_markup ($text); 2582 markup => $widget->{tooltip},
2447 $self->add ($self->{label}); 2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8,
2585 fg => [0, 0, 0, 1],
2586 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP),
2588 );
2448} 2589}
2449 2590
2450sub size_request { 2591sub size_request {
2451 my ($self) = @_; 2592 my ($self) = @_;
2452
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454 2593
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2594 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456 2595
2457 ($w + 4, $h + 4) 2596 ($w + 4, $h + 4)
2458} 2597}
… …
2464} 2603}
2465 2604
2466sub _draw { 2605sub _draw {
2467 my ($self) = @_; 2606 my ($self) = @_;
2468 2607
2469 glPushMatrix;
2470 glTranslate 0.375, 0.375; 2608 glTranslate 0.375, 0.375;
2471 2609
2472 my ($w, $h) = @$self{qw(w h)}; 2610 my ($w, $h) = @$self{qw(w h)};
2473 2611
2474 glColor 1, 0.8, 0.4; 2612 glColor 1, 0.8, 0.4;
… …
2485 glVertex 0 , $h; 2623 glVertex 0 , $h;
2486 glVertex $w, $h; 2624 glVertex $w, $h;
2487 glVertex $w, 0; 2625 glVertex $w, 0;
2488 glEnd; 2626 glEnd;
2489 2627
2490 glPopMatrix; 2628 glTranslate 2 - 0.375, 2 - 0.375;
2491
2492 glTranslate 2, 2;
2493 $self->SUPER::_draw; 2629 $self->SUPER::_draw;
2494} 2630}
2495 2631
2496############################################################################# 2632#############################################################################
2497 2633
… …
2502use CFClient::OpenGL; 2638use CFClient::OpenGL;
2503 2639
2504sub new { 2640sub new {
2505 my $class = shift; 2641 my $class = shift;
2506 2642
2507 $class->SUPER::new ( 2643 my $self = $class->SUPER::new (
2508 aspect => 1, 2644 aspect => 1,
2645 can_events => 0,
2509 @_, 2646 @_,
2510 ) 2647 );
2648
2649 if ($self->{anim} && $self->{animspeed}) {
2650 Scalar::Util::weaken (my $widget = $self);
2651
2652 $self->{timer} = Event->timer (
2653 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2654 hard => 1,
2655 interval => $self->{animspeed},
2656 cb => sub {
2657 ++$widget->{frame};
2658 $widget->update;
2659 },
2660 );
2661 }
2662
2663 $self
2511} 2664}
2512 2665
2513sub size_request { 2666sub size_request {
2514 (32, 8) 2667 (32, 8)
2515} 2668}
2516 2669
2670sub update {
2671 my ($self) = @_;
2672
2673 return unless $self->{visible};
2674
2675 $self->SUPER::update;
2676}
2677
2517sub _draw { 2678sub _draw {
2518 my ($self) = @_; 2679 my ($self) = @_;
2519 2680
2520 return unless $::CONN;#d# manage and cache textures differently 2681 return unless $::CONN;
2682
2683 my $face;
2684
2685 if ($self->{frame}) {
2686 my $anim = $::CONN->{anim}[$self->{anim}];
2687
2688 $face = $anim->[ $self->{frame} % @$anim ]
2689 if $anim && @$anim;
2690 }
2691
2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2522 2693
2523 # TODO animation
2524 if ($tex) { 2694 if ($tex) {
2525 glEnable GL_BLEND;
2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527 glEnable GL_TEXTURE_2D; 2695 glEnable GL_TEXTURE_2D;
2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529 glColor 1, 1, 1, 1; 2697 glColor 1, 1, 1, 1;
2530 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2531 glDisable GL_TEXTURE_2D; 2699 glDisable GL_TEXTURE_2D;
2532 glDisable GL_BLEND;
2533 } 2700 }
2701}
2702
2703sub DESTROY {
2704 my ($self) = @_;
2705
2706 $self->{timer}->cancel
2707 if $self->{timer};
2708
2709 $self->SUPER::DESTROY;
2534} 2710}
2535 2711
2536############################################################################# 2712#############################################################################
2537 2713
2538package CFClient::UI::InventoryItem; 2714package CFClient::UI::InventoryItem;
… …
2542sub new { 2718sub new {
2543 my $class = shift; 2719 my $class = shift;
2544 2720
2545 my %args = @_; 2721 my %args = @_;
2546 2722
2547 my $item = $args{item}; 2723 my $item = delete $args{item};
2548 2724
2549 my $desc = $item->{nrof} < 2 2725 my $desc = CFClient::Item::desc_string $item;
2550 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}";
2552
2553 2726
2554 my $self = $class->SUPER::new ( 2727 my $self = $class->SUPER::new (
2555 can_hover => 1, 2728 can_hover => 1,
2556 can_events => 1, 2729 can_events => 1,
2557 tooltip => (CFClient::UI::Label->escape ($desc) 2730 tooltip => ((CFClient::UI::Label::escape $desc)
2558 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2731 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2559 connect_button_down => sub { 2732 connect_button_down => sub {
2560 my ($self, $ev, $x, $y) = @_; 2733 my ($self, $ev, $x, $y) = @_;
2561 2734
2562 # todo: maybe put examine on 1? but should just be a tooltip :( 2735 # todo: maybe put examine on 1? but should just be a tooltip :(
2736 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737 my $targ = $::CONN->{player}{tag};
2738
2739 if ($item->{container} == $::CONN->{player}{tag}) {
2740 $targ = $main::OPENCONT;
2741 }
2742
2743 $::CONN->send ("move $targ $item->{tag} 0");
2563 if ($ev->{button} == 1) { 2744 } elsif ($ev->{button} == 1) {
2564 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2745 $::CONN->send ("examine $item->{tag}");
2565 } elsif ($ev->{button} == 2) { 2746 } elsif ($ev->{button} == 2) {
2566 $::CONN->send ("apply $item->{tag}"); 2747 $::CONN->send ("apply $item->{tag}");
2567 } elsif ($ev->{button} == 3) { 2748 } elsif ($ev->{button} == 3) {
2568 CFClient::UI::Menu->new ( 2749 my @menu_items = (
2569 items => [
2570 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2750 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571 [
2572 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2573 sub { $::CONN->send ("lock $item->{tag}") },
2574 ],
2575 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2751 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2576 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2752 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753 (
2754 $item->{flags} & Crossfire::Protocol::F_LOCKED
2755 ? (
2756 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757 )
2758 : (
2759 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2577 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2760 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761 )
2578 ], 2762 ),
2579 )->popup ($ev); 2763 );
2764
2765 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2580 } 2766 }
2581 2767
2582 1 2768 1
2583 }, 2769 },
2584 %args 2770 %args
2585 ); 2771 );
2772
2773
2586 $self->add(new CFClient::UI::Face 2774 $self->add (new CFClient::UI::Face
2587 can_events => 0, 2775 can_events => 0,
2588 face => $item->{face}, 2776 face => $item->{face},
2589 anim => $item->{anim}, 2777 anim => $item->{anim},
2590 animspeed => $item->{animspeed}); 2778 animspeed => $item->{animspeed},
2591 $self->add(new CFClient::UI::Label 2779 );
2592 can_events => 0, 2780
2593 text => $desc); 2781 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783 $self->{item} = $item;
2784
2785 $self->update_item;
2594 2786
2595 $self 2787 $self
2788}
2789
2790sub update_item {
2791 my ($self) = @_;
2792
2793 my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795 $self->{name_lbl}->set_text ($desc);
2596} 2796}
2597 2797
2598############################################################################# 2798#############################################################################
2599 2799
2600package CFClient::UI::Inventory; 2800package CFClient::UI::Inventory;
… …
2603 2803
2604sub new { 2804sub new {
2605 my $class = shift; 2805 my $class = shift;
2606 2806
2607 my $self = $class->SUPER::new ( 2807 my $self = $class->SUPER::new (
2608 scrolled => (new CFClient::UI::VBox), 2808 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2609 @_, 2809 @_,
2610 ); 2810 );
2611 2811
2612 $self 2812 $self
2613} 2813}
… …
2616 my ($self, $items) = @_; 2816 my ($self, $items) = @_;
2617 2817
2618 $self->{scrolled}->clear; 2818 $self->{scrolled}->clear;
2619 return unless $items; 2819 return unless $items;
2620 2820
2621 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2821 my @items = sort {
2822 ($a->{type} <=> $b->{type})
2823 or ($a->{name} cmp $b->{name})
2824 } @$items;
2622 2825
2623 $self->{real_items} = \@items; 2826 $self->{real_items} = \@items;
2624 2827
2828 my $row = 0;
2625 for my $item (@items) { 2829 for my $item (@items) {
2626 my $desc = $item->{nrof} < 2 2830 CFClient::Item::update_widgets $item;
2627 ? $item->{name}
2628 : "$item->{nrof} $item->{name_pl}";
2629 2831
2630 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2832 $self->{scrolled}->add (0, $row, $item->{face_widget});
2833 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2834 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2835
2836 $row++;
2631 } 2837 }
2632 2838
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2634} 2840}
2635 2841
… …
2678 2884
2679# popup given the event (must be a mouse button down event currently) 2885# popup given the event (must be a mouse button down event currently)
2680sub popup { 2886sub popup {
2681 my ($self, $ev) = @_; 2887 my ($self, $ev) = @_;
2682 2888
2683 $self->emit ("popdown"); 2889 $self->_emit ("popdown");
2684 2890
2685 # maybe save $GRAB? must be careful about events... 2891 # maybe save $GRAB? must be careful about events...
2686 $GRAB = $self; 2892 $GRAB = $self;
2687 $self->{button} = $ev->{button}; 2893 $self->{button} = $ev->{button};
2688 2894
… …
2703 2909
2704 if ($ev->{button} == $self->{button}) { 2910 if ($ev->{button} == $self->{button}) {
2705 undef $GRAB; 2911 undef $GRAB;
2706 $self->hide; 2912 $self->hide;
2707 2913
2708 $self->emit ("popdown"); 2914 $self->_emit ("popdown");
2709 $self->{hover}[1]->() if $self->{hover}; 2915 $self->{hover}[1]->() if $self->{hover};
2710 } 2916 }
2711} 2917}
2712 2918
2713############################################################################# 2919#############################################################################
2714 2920
2921package CFClient::UI::Statusbox;
2922
2923our @ISA = CFClient::UI::VBox::;
2924
2925sub new {
2926 my $class = shift;
2927
2928 $class->SUPER::new (
2929 fontsize => 0.8,
2930 @_,
2931 )
2932}
2933
2934sub reorder {
2935 my ($self) = @_;
2936 my $NOW = time;
2937
2938 while (my ($k, $v) = each %{ $self->{item} }) {
2939 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2940 }
2941
2942 my @widgets;
2943
2944 my @items = sort {
2945 $a->{pri} <=> $b->{pri}
2946 or $b->{id} <=> $a->{id}
2947 } values %{ $self->{item} };
2948
2949 my $count = 10 + 1;
2950 for my $item (@items) {
2951 last unless --$count;
2952
2953 push @widgets, $item->{label} ||= do {
2954 # TODO: doesn't handle markup well (read as: at all)
2955 my $short = $item->{count} > 1
2956 ? "<b>$item->{count} ×</b> $item->{text}"
2957 : $item->{text};
2958
2959 for ($short) {
2960 s/^\s+//;
2961 s/\s+/ /g;
2962 }
2963
2964 new CFClient::UI::Label
2965 markup => $short,
2966 tooltip => $item->{tooltip},
2967 tooltip_font => $::FONT_PROP,
2968 tooltip_width => 0.67,
2969 fontsize => $item->{fontsize} || $self->{fontsize},
2970 max_w => $::WIDTH * 0.44,
2971 fg => $item->{fg},
2972 can_events => 1,
2973 can_hover => 1
2974 };
2975 }
2976
2977 $self->clear;
2978 $self->SUPER::add (reverse @widgets);
2979}
2980
2981sub add {
2982 my ($self, $text, %arg) = @_;
2983
2984 $text =~ s/^\s+//;
2985 $text =~ s/\s+$//;
2986
2987 return unless $text;
2988
2989 my $timeout = time + ((delete $arg{timeout}) || 60);
2990
2991 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2992
2993 if (my $item = $self->{item}{$group}) {
2994 if ($item->{text} eq $text) {
2995 $item->{count}++;
2996 } else {
2997 $item->{count} = 1;
2998 $item->{text} = $item->{tooltip} = $text;
2999 }
3000 $item->{id} = ++$self->{id};
3001 $item->{timeout} = $timeout;
3002 delete $item->{label};
3003 } else {
3004 $self->{item}{$group} = {
3005 id => ++$self->{id},
3006 text => $text,
3007 timeout => $timeout,
3008 tooltip => $text,
3009 fg => [0.8, 0.8, 0.8, 0.8],
3010 pri => 0,
3011 count => 1,
3012 %arg,
3013 };
3014 }
3015
3016 $self->reorder;
3017}
3018
3019sub reconfigure {
3020 my ($self) = @_;
3021
3022 delete $_->{label}
3023 for values %{ $self->{item} || {} };
3024
3025 $self->reorder;
3026 $self->SUPER::reconfigure;
3027}
3028
3029#############################################################################
3030
2715package CFClient::UI::Root; 3031package CFClient::UI::Root;
2716 3032
2717our @ISA = CFClient::UI::Container::; 3033our @ISA = CFClient::UI::Container::;
2718 3034
2719use CFClient::OpenGL; 3035use CFClient::OpenGL;
2720 3036
3037sub new {
3038 my $class = shift;
3039
3040 $class->SUPER::new (
3041 @_,
3042 )
3043}
3044
3045sub configure {
3046 my ($self, $x, $y, $w, $h) = @_;
3047
3048 $self->{w} = $w;
3049 $self->{h} = $h;
3050}
3051
2721sub check_size { 3052sub check_size {
2722 my ($self) = @_; 3053 my ($self) = @_;
2723 3054
2724 $self->configure (0, 0, $self->{w}, $self->{h}); 3055 $self->size_allocate ($self->{w}, $self->{h})
3056 if $self->{w};
2725} 3057}
2726 3058
2727sub size_request { 3059sub size_request {
2728 my ($self) = @_; 3060 my ($self) = @_;
2729 3061
… …
2731} 3063}
2732 3064
2733sub size_allocate { 3065sub size_allocate {
2734 my ($self, $w, $h) = @_; 3066 my ($self, $w, $h) = @_;
2735 3067
2736 my $old_w = $self->{old_w};
2737 my $old_h = $self->{old_h};
2738
2739 if ($old_w && $old_h) {
2740 for my $child ($self->children) {
2741 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2742 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2743 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2744 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2745 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2746 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2747 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2748 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2749 }
2750 }
2751
2752 $self->{old_w} = $w;
2753 $self->{old_h} = $h;
2754}
2755
2756sub configure {
2757 my ($self, $x, $y, $w, $h) = @_;
2758
2759 $self->SUPER::configure ($x, $y, $w, $h);
2760
2761 for my $child ($self->children) { 3068 for my $child ($self->children) {
2762 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3069 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2763 3070
3071 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3072 if exists $child->{req_x};
3073
3074 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3075 if exists $child->{req_y};
3076
2764 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3077 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2765 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3078 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079
2766 $child->configure ($X, $Y, $W, $H); 3080 $child->configure ($X, $Y, $W, $H);
2767 } 3081 }
2768} 3082}
2769 3083
2770sub _topleft { 3084sub coord2local {
2771 my ($self, $x, $y) = @_; 3085 my ($self, $x, $y) = @_;
2772 3086
2773 ($x, $y) 3087 ($x, $y)
2774} 3088}
2775 3089
3090sub coord2global {
3091 my ($self, $x, $y) = @_;
3092
3093 ($x, $y)
3094}
3095
2776sub update { 3096sub update {
2777 my ($self) = @_; 3097 my ($self) = @_;
2778 3098
2779 $self->check_size; 3099 $self->check_size;
2780 ::refresh (); 3100 $::WANT_REFRESH++;
2781} 3101}
2782 3102
2783sub add { 3103sub add {
2784 my ($self, $child) = @_; 3104 my ($self, @children) = @_;
2785 3105
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111
3112 for my $child (@children) {
3113 $child->{is_toplevel} = 1;
3114
2786 # integerize window positions 3115 # integerise window positions
2787 $child->{x} = int $child->{x}; 3116 $child->{x} = int $child->{x};
2788 $child->{y} = int $child->{y}; 3117 $child->{y} = int $child->{y};
3118 }
2789 3119
2790 $self->SUPER::add ($child); 3120 $self->SUPER::add (@children);
3121}
3122
3123sub remove {
3124 my ($self, @children) = @_;
3125
3126 $self->SUPER::remove (@children);
3127
3128 while (@children) {
3129 my $w = pop @children;
3130 push @children, $w->children;
3131 $w->set_invisible;
3132 }
2791} 3133}
2792 3134
2793sub on_refresh { 3135sub on_refresh {
2794 my ($self, $id, $cb) = @_; 3136 my ($self, $id, $cb) = @_;
2795 3137
2796 $self->{refresh_hook}{$id} = $cb; 3138 $self->{refresh_hook}{$id} = $cb;
2797} 3139}
2798 3140
3141sub on_post_alloc {
3142 my ($self, $id, $cb) = @_;
3143
3144 $self->{post_alloc_hook}{$id} = $cb;
3145}
3146
2799sub draw { 3147sub draw {
2800 my ($self) = @_; 3148 my ($self) = @_;
2801 3149
2802 while (my $rcb = delete $self->{refresh_hook}) { 3150 while ($self->{refresh_hook}) {
2803 $_->() for values %$rcb; 3151 $_->()
3152 for values %{delete $self->{refresh_hook}};
3153 }
3154
3155 if ($self->{check_size}) {
3156 my @queue = ([], []);
3157
3158 for (;;) {
3159 if ($self->{check_size}) {
3160 # heuristic: check containers last
3161 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3162 for values %{delete $self->{check_size}}
3163 }
3164
3165 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3166
3167 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3168 ? @$widget{qw(user_w user_h)}
3169 : $widget->size_request;
3170
3171 if (delete $widget->{force_alloc}
3172 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174
3175 $widget->{req_w} = $w;
3176 $widget->{req_h} = $h;
3177
3178 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3179
3180 $widget->{parent}->check_size
3181 if $widget->{parent};
3182 }
3183 }
3184 }
3185
3186 while ($self->{size_alloc}) {
3187 for (values %{delete $self->{size_alloc}}) {
3188 my ($widget, $w, $h) = @$_;
3189
3190 $w = 0 if $w < 0;
3191 $h = 0 if $h < 0;
3192
3193 $widget->{w} = $w;
3194 $widget->{h} = $h;
3195 $widget->emit (size_allocate => $w, $h);
3196 }
3197 }
3198
3199 while ($self->{post_alloc_hook}) {
3200 $_->()
3201 for values %{delete $self->{post_alloc_hook}};
2804 } 3202 }
2805 3203
2806 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3204 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2807 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3205 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2808 glClear GL_COLOR_BUFFER_BIT; 3206 glClear GL_COLOR_BUFFER_BIT;
2809 3207
2810 glMatrixMode GL_PROJECTION; 3208 glMatrixMode GL_PROJECTION;
2811 glLoadIdentity; 3209 glLoadIdentity;
2812 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3210 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2813 glMatrixMode GL_MODELVIEW; 3211 glMatrixMode GL_MODELVIEW;
2814 glLoadIdentity; 3212 glLoadIdentity;
2815 3213
2816 $self->_draw; 3214 $self->_draw;
2817} 3215}
… …
2819############################################################################# 3217#############################################################################
2820 3218
2821package CFClient::UI; 3219package CFClient::UI;
2822 3220
2823$ROOT = new CFClient::UI::Root; 3221$ROOT = new CFClient::UI::Root;
2824$TOOLTIP = new CFClient::UI::Tooltip; 3222$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2825 3223
28261 32241
2827 3225

Diff Legend

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