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.187 by root, Mon May 8 20:40:31 2006 UTC vs.
Revision 1.240 by root, Fri May 26 18:28:23 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
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
12our $ROOT; 14our $ROOT;
13our $TOOLTIP; 15our $TOOLTIP;
14our $BUTTON_STATE; 16our $BUTTON_STATE;
17
18our %WIDGET; # all widgets, weak-referenced
15 19
16sub check_tooltip { 20sub check_tooltip {
17 if (!$GRAB) { 21 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 23 if (length $widget->{tooltip}) {
… …
23 27
24 my $tip = $widget->{tooltip}; 28 my $tip = $widget->{tooltip};
25 29
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 30 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 31
28 $TOOLTIP->set_markup ($widget->{tooltip}); 32 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 33 $TOOLTIP->show;
31 34
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 36
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 38 if $x + $TOOLTIP->{w} > $::WIDTH;
37 39
38 $TOOLTIP->move ($x, $y); 40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
39 } 43 }
40 44
41 return; 45 return;
42 } 46 }
43 } 47 }
… …
47 delete $TOOLTIP->{owner}; 51 delete $TOOLTIP->{owner};
48} 52}
49 53
50# class methods for events 54# class methods for events
51sub feed_sdl_key_down_event { 55sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 56 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 57 if $FOCUS;
54} 58}
55 59
56sub feed_sdl_key_up_event { 60sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 61 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 62 if $FOCUS;
59} 63}
60 64
61sub feed_sdl_button_down_event { 65sub feed_sdl_button_down_event {
62 my ($ev) = @_; 66 my ($ev) = @_;
… …
71 check_tooltip; 75 check_tooltip;
72 } 76 }
73 77
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 79
76 if ($GRAB) { 80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 81 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 82}
81 83
82sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
83 my ($ev) = @_; 85 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
85 87
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 89
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 91
90 if ($GRAB) { 92 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 93 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 94
95 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 97 $grab->update if $grab;
98 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 115
116 check_tooltip; 116 check_tooltip;
117 } 117 }
118 118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 120 if $HOVER;
123} 121}
124 122
125# convert position array to integers 123# convert position array to integers
126sub harmonize { 124sub harmonize {
127 my ($vals) = @_; 125 my ($vals) = @_;
… …
131 for (@$vals) { 129 for (@$vals) {
132 my $i = int $_ + $rem; 130 my $i = int $_ + $rem;
133 $rem += $_ - $i; 131 $rem += $_ - $i;
134 $_ = $i; 132 $_ = $i;
135 } 133 }
134}
135
136sub full_refresh {
137 # make a copy, otherwise for complains about freed values.
138 my @widgets = values %WIDGET;
139
140 $_->update
141 for @widgets;
142}
143
144sub reconfigure_widgets {
145 # make a copy, otherwise C<for> complains about freed values.
146 my @widgets = values %WIDGET;
147
148 $_->reconfigure
149 for @widgets;
150}
151
152# call when resolution changes etc.
153sub rescale_widgets {
154 my ($sx, $sy) = @_;
155
156 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167 }
168
169 reconfigure_widgets;
136} 170}
137 171
138############################################################################# 172#############################################################################
139 173
140package CFClient::UI::Base; 174package CFClient::UI::Base;
… …
158 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
160 } 194 }
161 } 195 }
162 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
163 $self 199 $self
164} 200}
165 201
166sub destroy { 202sub destroy {
167 my ($self) = @_; 203 my ($self) = @_;
… …
170 %$self = (); 206 %$self = ();
171} 207}
172 208
173sub show { 209sub show {
174 my ($self) = @_; 210 my ($self) = @_;
175
176 return if $self->{parent}; 211 return if $self->{parent};
177 212
178 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
179} 214}
180 215
181sub hide { 216sub show_centered {
182 my ($self) = @_; 217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228
229sub set_invisible {
230 my ($self) = @_;
231
232 # broken show/hide model
233
234 delete $self->{visible};
183 235
184 undef $GRAB if $GRAB == $self; 236 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 237 undef $HOVER if $HOVER == $self;
238
239 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self;
241
242 $self->focus_out;
243}
244
245sub hide {
246 my ($self) = @_;
247
248 $self->set_invisible;
186 249
187 $self->{parent}->remove ($self) 250 $self->{parent}->remove ($self)
188 if $self->{parent}; 251 if $self->{parent};
189} 252}
190 253
… …
232 $self->{y} = $y; 295 $self->{y} = $y;
233 $self->update; 296 $self->update;
234 } 297 }
235 298
236 if ($self->{w} != $w || $self->{h} != $h) { 299 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 300 $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 } 301 }
244} 302}
245 303
246sub size_allocate { 304sub size_allocate {
247 # nothing to be done 305 # nothing to be done
248} 306}
249 307
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313}
314
250sub children { 315sub 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} 316}
264 317
265sub set_max_size { 318sub set_max_size {
266 my ($self, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
267 320
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 321 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 322 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 323}
271 324
272# return top left coordinates 325sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 326 my ($self, $tooltip) = @_;
275 327
276 $self->{parent} 328 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 329 $tooltip =~ s/\s+$//;
278 330
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 331 return if $self->{tooltip} eq $tooltip;
332
333 $self->{tooltip} = $tooltip;
334
335 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
336 delete $CFClient::UI::TOOLTIP->{owner};
337 CFClient::UI::check_tooltip;
338 }
280} 339}
281 340
282# translate global coordinates to local coordinate system 341# translate global coordinates to local coordinate system
283sub coord2local { 342sub coord2local {
284 my ($self, $x, $y) = @_; 343 my ($self, $x, $y) = @_;
285 344
286 my ($X, $Y) = $self->_topleft; 345 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 346}
289 347
290# translate local coordinates to global coordinate system 348# translate local coordinates to global coordinate system
291sub coord2global { 349sub coord2global {
292 my ($self, $x, $y) = @_; 350 my ($self, $x, $y) = @_;
293 351
294 my ($X, $Y) = $self->_topleft; 352 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 353}
297 354
298sub focus_in { 355sub focus_in {
299 my ($self) = @_; 356 my ($self) = @_;
300 357
301 return if $FOCUS == $self; 358 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 359 return unless $self->{can_focus};
303 360
304 my $focus = $FOCUS; $FOCUS = $self; 361 my $focus = $FOCUS; $FOCUS = $self;
305 362
306 $self->emit (focus_in => $focus); 363 $self->_emit (focus_in => $focus);
307 364
308 $focus->update if $focus; 365 $focus->update if $focus;
309 $FOCUS->update; 366 $FOCUS->update;
310} 367}
311 368
… …
314 371
315 return unless $FOCUS == $self; 372 return unless $FOCUS == $self;
316 373
317 my $focus = $FOCUS; undef $FOCUS; 374 my $focus = $FOCUS; undef $FOCUS;
318 375
319 $self->emit (focus_out => $focus); 376 $self->_emit (focus_out => $focus);
320 377
321 $focus->update if $focus; #? 378 $focus->update if $focus; #?
379
380 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
381 unless $FOCUS;
322} 382}
323 383
324sub mouse_motion { } 384sub mouse_motion { }
325sub button_up { } 385sub button_up { }
326sub key_down { } 386sub key_down { }
327sub key_up { } 387sub key_up { }
328 388
329sub button_down { 389sub button_down {
330 my ($self, $ev, $x, $y) = @_; 390 my ($self, $ev, $x, $y) = @_;
331 391
332 $self->focus_in; 392 $self->focus_in;
… …
366 if ($ENV{PCLIENT_DEBUG}) { 426 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix; 427 glPushMatrix;
368 glColor 1, 1, 0, 1; 428 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP; 430 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 431 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 432 glVertex $self->{w} - 1, 0;
373 glVertex $self->{w}, $self->{h}; 433 glVertex $self->{w} - 1, $self->{h} - 1;
374 glVertex 0 , $self->{h}; 434 glVertex 0 , $self->{h} - 1;
375 glEnd; 435 glEnd;
376 glPopMatrix; 436 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 437 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 438 }
379} 439}
380 440
381sub _draw { 441sub _draw {
382 my ($self) = @_; 442 my ($self) = @_;
… …
398 458
399sub set_parent { 459sub set_parent {
400 my ($self, $parent) = @_; 460 my ($self, $parent) = @_;
401 461
402 Scalar::Util::weaken ($self->{parent} = $parent); 462 Scalar::Util::weaken ($self->{parent} = $parent);
463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
403} 472}
404 473
405sub check_size { 474sub check_size {
406 my ($self) = @_; 475 my ($self, $forced) = @_;
407 476
408 $self->{parent} 477 $self->{force_alloc} = 1 if $forced;
409 or return 1; 478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429} 479}
430 480
431sub update { 481sub update {
432 my ($self) = @_; 482 my ($self) = @_;
433 483
… …
439 my ($self, $signal, $cb) = @_; 489 my ($self, $signal, $cb) = @_;
440 490
441 push @{ $self->{signal_cb}{$signal} }, $cb; 491 push @{ $self->{signal_cb}{$signal} }, $cb;
442} 492}
443 493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
444sub emit { 500sub emit {
445 my ($self, $signal, @args) = @_; 501 my ($self, $signal, @args) = @_;
446 502
447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
448} 505}
449 506
450sub DESTROY { 507sub DESTROY {
451 my ($self) = @_; 508 my ($self) = @_;
452 509
510 delete $WIDGET{$self+0};
453 #$self->deactivate; 511 #$self->deactivate;
454} 512}
455 513
456############################################################################# 514#############################################################################
457 515
… …
466 my $class = shift; 524 my $class = shift;
467 525
468 # range [value, low, high, page] 526 # range [value, low, high, page]
469 527
470 $class->SUPER::new ( 528 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 529 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 530 #active_bg => [1, 1, 1, 0.5],
473 @_ 531 @_
474 ) 532 )
475} 533}
476 534
477sub _draw { 535sub _draw {
478 my ($self) = @_; 536 my ($self) = @_;
479 537
538 my $color = $FOCUS == $self && $self->{active_bg}
539 ? $self->{active_bg}
540 : $self->{bg};
541
542 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 543 my ($w, $h) = @$self{qw(w h)};
481 544
482 glEnable GL_BLEND; 545 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 547 glColor @$color;
485 548
486 glBegin GL_QUADS; 549 glBegin GL_QUADS;
487 glVertex 0 , 0; 550 glVertex 0 , 0;
488 glVertex 0 , $h; 551 glVertex 0 , $h;
489 glVertex $w, $h; 552 glVertex $w, $h;
490 glVertex $w, 0; 553 glVertex $w, 0;
491 glEnd; 554 glEnd;
492 555
493 glDisable GL_BLEND; 556 glDisable GL_BLEND;
557 }
494} 558}
495 559
496############################################################################# 560#############################################################################
497 561
498package CFClient::UI::Empty; 562package CFClient::UI::Empty;
… …
530 594
531 $self 595 $self
532} 596}
533 597
534sub add { 598sub add {
535 my ($self, $child) = @_; 599 my ($self, @widgets) = @_;
536 600
537 $child->set_parent ($self); 601 $_->set_parent ($self)
602 for @widgets;
538 603
539 use sort 'stable'; 604 use sort 'stable';
540 605
541 $self->{children} = [ 606 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 607 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 608 @{$self->{children}}, @widgets
544 ]; 609 ];
545 610
546 $child->check_size; 611 $self->check_size (1);
547 $self->update; 612 $self->update;
548} 613}
549 614
550sub children { 615sub children {
551 @{ $_[0]{children} } 616 @{ $_[0]{children} }
… …
557 delete $child->{parent}; 622 delete $child->{parent};
558 $child->hide; 623 $child->hide;
559 624
560 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
561 626
562 $self->check_size; 627 $self->check_size (1);
563 $self->update; 628 $self->update;
564} 629}
565 630
566sub clear { 631sub clear {
567 my ($self) = @_; 632 my ($self) = @_;
… …
658} 723}
659 724
660sub update { 725sub update {
661 my ($self) = @_; 726 my ($self) = @_;
662 727
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 728 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 729 $self->SUPER::update;
665} 730}
666 731
667sub size_allocate { 732sub size_allocate {
668 my ($self, $w, $h) = @_; 733 my ($self, $w, $h) = @_;
… …
681 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 746 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
682 glClearColor 0, 0, 0, 0; 747 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT; 748 glClear GL_COLOR_BUFFER_BIT;
684 749
685 $self->_render; 750 $self->_render;
686# glColorMask 1, 1, 1, 0;
687# glEnable GL_BLEND;
688# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689# glRasterPos 0, 0;
690# glCopyPixels 0, 0, $self->{w}, $self->{h};
691# glDisable GL_BLEND;
692# glColorMask 1, 1, 1, 1;
693 }; 751 };
694} 752}
695 753
696sub _draw { 754sub _draw {
697 my ($self) = @_; 755 my ($self) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 757 my ($w, $h) = ($self->w, $self->h);
700 758
701 my $tex = $self->{texture} 759 my $tex = $self->{texture}
702 or return; 760 or return;
703 761
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 762 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 764 glColor 1, 1, 1, 1;
709 765
710 $tex->draw_quad (0, 0, $w, $h); 766 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 767
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 768 glDisable GL_TEXTURE_2D;
714} 769}
715 770
716############################################################################# 771#############################################################################
717 772
718package CFClient::UI::ViewPort; 773package CFClient::UI::ViewPort;
719 774
720our @ISA = CFClient::UI::Window::; 775our @ISA = CFClient::UI::Window::;
721 776
777sub new {
778 my $class = shift;
779
780 $class->SUPER::new (
781 scroll_x => 0,
782 scroll_y => 1,
783 @_,
784 )
785}
786
722sub size_request { 787sub size_request {
723 my ($self) = @_; 788 my ($self) = @_;
724 789
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 791
728 @$self{qw(child_w child_h)} 792 @$self{qw(child_w child_h)}
729} 793}
730 794
731sub size_allocate { 795sub size_allocate {
732 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
733 797
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
800
801 $self->child->configure (0, 0, $w, $h);
734 $self->update; 802 $self->update;
735} 803}
736 804
737sub set_offset { 805sub set_offset {
738 my ($self, $x, $y) = @_; 806 my ($self, $x, $y) = @_;
… …
741 $self->{view_y} = int $y; 809 $self->{view_y} = int $y;
742 810
743 $self->update; 811 $self->update;
744} 812}
745 813
746# hmm, this does not work for topleft of $self... but we should not aks for that 814# hmm, this does not work for topleft of $self... but we should not ask for that
747sub _topleft { 815sub coord2local {
748 my ($self, $x, $y) = @_; 816 my ($self, $x, $y) = @_;
749 817
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 818 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
819}
820
821sub coord2global {
822 my ($self, $x, $y) = @_;
823
824 $x = List::Util::min $self->{w}, $x - $self->{view_x};
825 $y = List::Util::min $self->{h}, $y - $self->{view_y};
826
827 $self->SUPER::coord2global ($x, $y)
751} 828}
752 829
753sub find_widget { 830sub find_widget {
754 my ($self, $x, $y) = @_; 831 my ($self, $x, $y) = @_;
755 832
… …
783 860
784 my $slider = new CFClient::UI::Slider 861 my $slider = new CFClient::UI::Slider
785 vertical => 1, 862 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix 863 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub { 864 connect_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 865 $self->{vp}->set_offset (0, $_[1]);
789 }, 866 },
790 ; 867 ;
791 868
792 $self = $class->SUPER::new ( 869 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort), 870 vp => (new CFClient::UI::ViewPort expand => 1),
794 slider => $slider, 871 slider => $slider,
795 @_, 872 @_,
796 ); 873 );
797 874
798 $self->{vp}->add ($self->{scrolled}); 875 $self->{vp}->add ($self->{scrolled});
… …
800 $self->add ($self->{slider}); 877 $self->add ($self->{slider});
801 878
802 $self 879 $self
803} 880}
804 881
882sub update {
883 my ($self) = @_;
884
885 $self->SUPER::update;
886
887 # todo: overwrite size_allocate of child
888 my $child = $self->{vp}->child;
889 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
890}
891
892sub size_allocate {
893 my ($self, $w, $h) = @_;
894
895 $self->SUPER::size_allocate ($w, $h);
896
897 my $child = $self->{vp}->child;
898 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
899}
900
805#TODO# update range on size_allocate depeneing on child 901#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 902# update viewport offset on scroll
807 903
808############################################################################# 904#############################################################################
809 905
810package CFClient::UI::Frame; 906package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 910use CFClient::OpenGL;
815 911
816sub new { 912sub new {
817 my $class = shift; 913 my $class = shift;
818 914
819 my $self = $class->SUPER::new ( 915 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 916 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 917 @_,
824 ); 918 )
825
826 $self
827} 919}
828 920
829sub _draw { 921sub _draw {
830 my ($self) = @_; 922 my ($self) = @_;
831 923
832 my ($w, $h) = ($self->{w}, $self->{h}); 924 if ($self->{bg}) {
925 my ($w, $h) = @$self{qw(w h)};
833 926
834 glEnable GL_BLEND; 927 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 928 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 929 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 930
839# glBegin GL_QUADS; 931 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 932 glVertex 0 , 0;
842# glVertex 0 , $h; 933 glVertex 0 , $h;
843# glVertex $w, $h; 934 glVertex $w, $h;
844# glVertex $w, 0; 935 glVertex $w, 0;
845# glEnd; 936 glEnd;
846 937
847
848 $self->child->draw;
849 glDisable GL_BLEND; 938 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 939 }
940
941 $self->SUPER::_draw;
851} 942}
852 943
853############################################################################# 944#############################################################################
854 945
855package CFClient::UI::FancyFrame; 946package CFClient::UI::FancyFrame;
… …
866 my $class = shift; 957 my $class = shift;
867 958
868 # TODO: user_x, user_y, overwrite moveto? 959 # TODO: user_x, user_y, overwrite moveto?
869 960
870 my $self = $class->SUPER::new ( 961 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 962 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 963 border_bg => [1, 1, 1, 1],
873 border => 0.6, 964 border => 0.6,
965 is_toplevel => 1,
874 can_events => 1, 966 can_events => 1,
875 @_ 967 @_
876 ); 968 );
877 969
878 $self->{title} &&= new CFClient::UI::Label 970 $self->{title} &&= new CFClient::UI::Label
879 align => 0, 971 align => 0,
… …
903 my ($self, $w, $h) = @_; 995 my ($self, $w, $h) = @_;
904 996
905 $h -= List::Util::max 0, $self->border * 2; 997 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 998 $w -= List::Util::max 0, $self->border * 2;
907 999
908 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1000 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
909 if $self->{title}; 1001 if $self->{title};
910 1002
911 $self->child->configure ($self->border, $self->border, $w, $h); 1003 $self->child->configure ($self->border, $self->border, $w, $h);
912} 1004}
913 1005
… …
971 my ($self) = @_; 1063 my ($self) = @_;
972 1064
973 my ($w, $h ) = ($self->{w}, $self->{h}); 1065 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 1067
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 1068 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 1070
981 my $border = $self->border; 1071 my $border = $self->border;
982 1072
983 glColor @{ $self->{border_bg} }; 1073 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988 1078
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1080 my $bg = $tex[0];
991 1081
992 # TODO: repeat texture not scale 1082 # TODO: repeat texture not scale
… …
996 glColor @{ $self->{bg} }; 1086 glColor @{ $self->{bg} };
997 1087
998 $bg->{s} = $rep_x; 1088 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y; 1089 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1; 1090 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 }
1002 1093
1003 glDisable GL_TEXTURE_2D; 1094 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1095
1007 $self->{title}->draw if $self->{title}; 1096 $self->{title}->draw if $self->{title};
1008 1097
1009 $self->child->draw; 1098 $self->child->draw;
1010} 1099}
… …
1022sub new { 1111sub new {
1023 my $class = shift; 1112 my $class = shift;
1024 1113
1025 $class->SUPER::new ( 1114 $class->SUPER::new (
1026 col_expand => [], 1115 col_expand => [],
1027 @_ 1116 @_,
1028 ) 1117 )
1118}
1119
1120sub children {
1121 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1029} 1122}
1030 1123
1031sub add { 1124sub add {
1032 my ($self, $x, $y, $child) = @_; 1125 my ($self, $x, $y, $child) = @_;
1033 1126
1034 $child->set_parent ($self); 1127 $child->set_parent ($self);
1035 $self->{children}[$y][$x] = $child; 1128 $self->{children}[$y][$x] = $child;
1036 1129
1037 $child->check_size; 1130 $self->check_size (1);
1038} 1131}
1039 1132
1040sub children {
1041 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1042}
1043
1044# TODO: move to container class maybe? send childs a signal on removal? 1133# TODO: move to container class maybe? send children a signal on removal?
1045sub clear { 1134sub clear {
1046 my ($self) = @_; 1135 my ($self) = @_;
1047 1136
1048 my @children = $self->children; 1137 my @children = $self->children;
1049 delete $self->{children}; 1138 delete $self->{children};
… …
1051 for (@children) { 1140 for (@children) {
1052 delete $_->{parent}; 1141 delete $_->{parent};
1053 $_->hide; 1142 $_->hide;
1054 } 1143 }
1055 1144
1145 $self->check_size (1);
1056 $self->update; 1146 $self->update;
1057} 1147}
1058 1148
1059sub get_wh { 1149sub get_wh {
1060 my ($self) = @_; 1150 my ($self) = @_;
… …
1092sub size_allocate { 1182sub size_allocate {
1093 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1094 1184
1095 my ($ws, $hs) = $self->get_wh; 1185 my ($ws, $hs) = $self->get_wh;
1096 1186
1097 my $req_w = sum @$ws; 1187 my $req_w = (sum @$ws) || 1;
1098 my $req_h = sum @$hs; 1188 my $req_h = (sum @$hs) || 1;
1099 1189
1100 # TODO: nicer code && do row_expand 1190 # TODO: nicer code && do row_expand
1101 my @col_expand = @{$self->{col_expand}}; 1191 my @col_expand = @{$self->{col_expand}};
1102 @col_expand = (1) x @$ws unless @col_expand; 1192 @col_expand = (1) x @$ws unless @col_expand;
1103 my $col_expand = (sum @col_expand) || 1; 1193 my $col_expand = (sum @col_expand) || 1;
… …
1237} 1327}
1238 1328
1239sub size_allocate { 1329sub size_allocate {
1240 my ($self, $w, $h) = @_; 1330 my ($self, $w, $h) = @_;
1241 1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1242 my $children = $self->{children}; 1334 my $children = $self->{children};
1243 1335
1244 my @h = map $_->{req_h}, @$children; 1336 my @h = map $_->{req_h}, @$children;
1245 1337
1246 my $req_h = List::Util::sum @h; 1338 my $req_h = List::Util::sum @h;
… …
1275 1367
1276############################################################################# 1368#############################################################################
1277 1369
1278package CFClient::UI::Label; 1370package CFClient::UI::Label;
1279 1371
1280our @ISA = CFClient::UI::Base::; 1372our @ISA = CFClient::UI::DrawBG::;
1281 1373
1282use CFClient::OpenGL; 1374use CFClient::OpenGL;
1283 1375
1284sub new { 1376sub new {
1285 my ($class, %arg) = @_; 1377 my ($class, %arg) = @_;
1286 1378
1287 my $self = $class->SUPER::new ( 1379 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1380 fg => [1, 1, 1],
1381 #bg => none
1382 #active_bg => none
1289 #font => default_font 1383 #font => default_font
1384 #text => initial text
1385 #markup => initial narkup
1386 #max_w => maximum pixel width
1387 ellipsise => 3, # end
1388 layout => (new CFClient::Layout),
1290 fontsize => 1, 1389 fontsize => 1,
1291 text => "",
1292 align => -1, 1390 align => -1,
1293 valign => -1, 1391 valign => -1,
1294 padding => 2, 1392 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1393 can_events => 0,
1297 %arg 1394 %arg
1298 ); 1395 );
1299 1396
1300 if (exists $self->{template}) { 1397 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1398 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1399 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1400 $self->{template} = $layout;
1304 } 1401 }
1305 1402
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1403 if (exists $self->{markup}) {
1307 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1404 $self->set_markup (delete $self->{markup});
1405 } else {
1406 $self->set_text (delete $self->{text});
1407 }
1308 1408
1309 $self 1409 $self
1310} 1410}
1311 1411
1312sub escape { 1412sub escape($) {
1313 local $_ = $_[1]; 1413 local $_ = $_[0];
1314 1414
1315 s/&/&amp;/g; 1415 s/&/&amp;/g;
1316 s/>/&gt;/g; 1416 s/>/&gt;/g;
1317 s/</&lt;/g; 1417 s/</&lt;/g;
1318 1418
1319 $_[1] 1419 $_
1320} 1420}
1321 1421
1322sub update { 1422sub update {
1323 my ($self) = @_; 1423 my ($self) = @_;
1324 1424
… …
1330 my ($self, $text) = @_; 1430 my ($self, $text) = @_;
1331 1431
1332 return if $self->{text} eq "T$text"; 1432 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1433 $self->{text} = "T$text";
1334 1434
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1436 $self->{layout}->set_text ($text);
1336 1437
1337 delete $self->{texture};
1338 $self->update; 1438 $self->update;
1339 $self->check_size; 1439 $self->check_size;
1340} 1440}
1341 1441
1342sub set_markup { 1442sub set_markup {
1343 my ($self, $markup) = @_; 1443 my ($self, $markup) = @_;
1344 1444
1345 return if $self->{text} eq "M$markup"; 1445 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1446 $self->{text} = "M$markup";
1347 1447
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1451 $self->{layout}->set_markup ($markup);
1349 1452
1350 delete $self->{texture};
1351 $self->update; 1453 $self->update;
1352 $self->check_size; 1454 $self->check_size;
1353} 1455}
1354 1456
1355sub size_request { 1457sub size_request {
1356 my ($self) = @_; 1458 my ($self) = @_;
1357 1459
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1460 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $self->{layout}->set_width ($self->{max_w} || -1); 1461 $self->{layout}->set_width ($self->{max_w} || -1);
1462 $self->{layout}->set_ellipsise ($self->{ellipsise});
1463 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1464 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1465
1362 my ($w, $h) = $self->{layout}->size; 1466 my ($w, $h) = $self->{layout}->size;
1363 1467
1364 if (exists $self->{template}) { 1468 if (exists $self->{template}) {
… …
1394} 1498}
1395 1499
1396sub _draw { 1500sub _draw {
1397 my ($self) = @_; 1501 my ($self) = @_;
1398 1502
1503 $self->SUPER::_draw; # draw background, if applicable
1504
1399 my $tex = $self->{texture} ||= do { 1505 my $tex = $self->{texture} ||= do {
1506 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1507 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1508 $self->{layout}->set_width ($self->{w});
1509 $self->{layout}->set_ellipsise ($self->{ellipsise});
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512
1403 new_from_layout CFClient::Texture $self->{layout} 1513 my $tex = new_from_layout CFClient::Texture $self->{layout};
1514
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1517 : ($self->{w} - $tex->{w}) * 0.5);
1518
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1521 : ($self->{h} - $tex->{h}) * 0.5);
1522
1523 $tex
1404 }; 1524 };
1405 1525
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1526 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1528
1529 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1530 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $tex->draw_quad ($self->{ox}, $self->{oy}); 1531 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1532 } else {
1533 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1534 }
1426 1535
1427 glDisable GL_TEXTURE_2D; 1536 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1537}
1430 1538
1431############################################################################# 1539#############################################################################
1432 1540
1433package CFClient::UI::EntryBase; 1541package CFClient::UI::EntryBase;
… …
1446 active_fg => [0, 0, 0], 1554 active_fg => [0, 0, 0],
1447 can_hover => 1, 1555 can_hover => 1,
1448 can_focus => 1, 1556 can_focus => 1,
1449 valign => 0, 1557 valign => 0,
1450 can_events => 1, 1558 can_events => 1,
1559 #text => ...
1451 @_ 1560 @_
1452 ) 1561 )
1453} 1562}
1454 1563
1455sub _set_text { 1564sub _set_text {
… …
1465 $self->{text} = $text; 1574 $self->{text} = $text;
1466 1575
1467 $text =~ s/./*/g if $self->{hidden}; 1576 $text =~ s/./*/g if $self->{hidden};
1468 $self->{layout}->set_text ("$text "); 1577 $self->{layout}->set_text ("$text ");
1469 1578
1470 $self->emit (changed => $self->{text}); 1579 $self->_emit (changed => $self->{text});
1471}
1472
1473sub get_text {
1474 $_[0]{text}
1475}
1476
1477sub size_request {
1478 my ($self) = @_;
1479
1480 my ($w, $h) = $self->SUPER::size_request;
1481
1482 ($w + 1, $h) # add 1 for cursor
1483}
1484
1485sub size_allocate {
1486 my ($self, $w, $h) = @_;
1487
1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489} 1580}
1490 1581
1491sub set_text { 1582sub set_text {
1492 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1493 1584
1494 $self->{cursor} = length $text; 1585 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1586 $self->_set_text ($text);
1496 $self->update; 1587 $self->update;
1588 $self->check_size;
1589}
1590
1591sub get_text {
1592 $_[0]{text}
1593}
1594
1595sub size_request {
1596 my ($self) = @_;
1597
1598 my ($w, $h) = $self->SUPER::size_request;
1599
1600 ($w + 1, $h) # add 1 for cursor
1497} 1601}
1498 1602
1499sub key_down { 1603sub key_down {
1500 my ($self, $ev) = @_; 1604 my ($self, $ev) = @_;
1501 1605
… …
1503 my $sym = $ev->{sym}; 1607 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1608 my $uni = $ev->{unicode};
1505 1609
1506 my $text = $self->get_text; 1610 my $text = $self->get_text;
1507 1611
1508 if ($sym == 8) { 1612 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1613 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1614 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1615 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1616 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1617 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1618 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1619 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1620 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1621 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1622 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1623 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1624 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1625 $self->_emit ('escape');
1522 } elsif ($uni) { 1626 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1627 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1628 }
1525 1629
1526 $self->_set_text ($text); 1630 $self->_set_text ($text);
1527 $self->update; 1631 $self->update;
1632 $self->check_size;
1528} 1633}
1529 1634
1530sub focus_in { 1635sub focus_in {
1531 my ($self) = @_; 1636 my ($self) = @_;
1532 1637
… …
1612 if ($sym == 13) { 1717 if ($sym == 13) {
1613 unshift @{$self->{history}}, 1718 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 1719 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1; 1720 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 1721 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 1722 $self->_emit (activate => $txt);
1618 $self->update; 1723 $self->update;
1619 1724
1620 } elsif ($sym == CFClient::SDLK_UP) { 1725 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 1726 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 1727 $self->{history_saveback} = $self->get_text;
… …
1661 my $class = shift; 1766 my $class = shift;
1662 1767
1663 $class->SUPER::new ( 1768 $class->SUPER::new (
1664 padding => 4, 1769 padding => 4,
1665 fg => [1, 1, 1], 1770 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1771 active_fg => [0, 0, 1],
1668 can_hover => 1, 1772 can_hover => 1,
1669 align => 0, 1773 align => 0,
1670 valign => 0, 1774 valign => 0,
1671 can_events => 1, 1775 can_events => 1,
1672 @_ 1776 @_
1673 ) 1777 )
1674} 1778}
1675 1779
1780sub activate { }
1781
1676sub button_up { 1782sub button_up {
1677 my ($self, $ev, $x, $y) = @_; 1783 my ($self, $ev, $x, $y) = @_;
1678 1784
1785 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 1786 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 1787 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate");
1682 }
1683} 1788}
1684 1789
1685sub _draw { 1790sub _draw {
1686 my ($self) = @_; 1791 my ($self) = @_;
1687 1792
… …
1689 1794
1690 if ($GRAB == $self) { 1795 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1796 $self->{fg} = $self->{active_fg};
1692 } 1797 }
1693 1798
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1799 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1801 glColor 0, 0, 0, 1;
1699 1802
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1803 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1804
1702 glDisable GL_TEXTURE_2D; 1805 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1806
1705 $self->SUPER::_draw; 1807 $self->SUPER::_draw;
1706} 1808}
1707 1809
1708############################################################################# 1810#############################################################################
… …
1722 1824
1723 $class->SUPER::new ( 1825 $class->SUPER::new (
1724 padding => 2, 1826 padding => 2,
1725 fg => [1, 1, 1], 1827 fg => [1, 1, 1],
1726 active_fg => [1, 1, 0], 1828 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5],
1727 state => 0, 1831 state => 0,
1728 can_hover => 1, 1832 can_hover => 1,
1729 @_ 1833 @_
1730 ) 1834 )
1731} 1835}
… …
1740 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1741 1845
1742 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1743 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1744 $self->{state} = !$self->{state}; 1848 $self->{state} = !$self->{state};
1745 $self->emit (changed => $self->{state}); 1849 $self->_emit (changed => $self->{state});
1746 } 1850 }
1747} 1851}
1748 1852
1749sub _draw { 1853sub _draw {
1750 my ($self) = @_; 1854 my ($self) = @_;
… …
1755 1859
1756 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1860 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1757 1861
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1863
1760 glEnable GL_BLEND; 1864 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865
1761 glEnable GL_TEXTURE_2D; 1866 glEnable GL_TEXTURE_2D;
1762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764 my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766 $tex->draw_quad (0, 0, $s, $s); 1867 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1868 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1869}
1771 1870
1772############################################################################# 1871#############################################################################
1773 1872
1774package CFClient::UI::Image; 1873package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1916 glTranslate 0, -$self->{w}, 0;
1818 1917
1819 ($w, $h) = ($h, $w); 1918 ($w, $h) = ($h, $w);
1820 } 1919 }
1821 1920
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1921 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1922 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1923
1827 $tex->draw_quad (0, 0, $w, $h); 1924 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1925
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1926 glDisable GL_TEXTURE_2D;
1831} 1927}
1832 1928
1833############################################################################# 1929#############################################################################
1834 1930
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2119 qw(s1_slider.png s1_slider_bg.png);
2024 2120
2025sub new { 2121sub new {
2026 my $class = shift; 2122 my $class = shift;
2027 2123
2028 # range [value, low, high, page] 2124 # range [value, low, high, page, unit]
2029 2125
2030 # TODO: 0-width page 2126 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2127 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2128 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2129 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2130 fg => [1, 1, 1],
2035 active_fg => [0, 0, 0], 2131 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5],
2036 range => [0, 0, 100, 10], 2134 range => [0, 0, 100, 10, 0],
2037 req_w => $::WIDTH / 80, 2135 req_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2136 req_h => $::WIDTH / 80,
2039 vertical => 0, 2137 vertical => 0,
2040 can_hover => 1, 2138 can_hover => 1,
2041 inner_pad => 5, 2139 inner_pad => 0.02,
2042 @_ 2140 @_
2043 ); 2141 );
2044 2142
2143 $self->set_value ($self->{range}[0]);
2144 $self->update;
2145
2045 $self 2146 $self
2147}
2148
2149sub set_range {
2150 my ($self, $range) = @_;
2151
2152 ($range, $self->{range}) = ($self->{range}, $range);
2153
2154 $self->update
2155 if "@$range" ne "@{$self->{range}}";
2156}
2157
2158sub set_value {
2159 my ($self, $value) = @_;
2160
2161 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2162
2163 $hi = $lo + 1 if $hi <= $lo;
2164
2165 $page = $hi - $lo if $page > $hi - $lo;
2166
2167 $value = $lo if $value < $lo;
2168 $value = $hi - $page if $value > $hi - $page;
2169
2170 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2171 if $unit;
2172
2173 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2174
2175 if ($value != $old_value) {
2176 $self->_emit (changed => $value);
2177 $self->update;
2178 }
2046} 2179}
2047 2180
2048sub size_request { 2181sub size_request {
2049 my ($self) = @_; 2182 my ($self) = @_;
2050 2183
… …
2056 2189
2057sub button_down { 2190sub button_down {
2058 my ($self, $ev, $x, $y) = @_; 2191 my ($self, $ev, $x, $y) = @_;
2059 2192
2060 $self->SUPER::button_down ($ev, $x, $y); 2193 $self->SUPER::button_down ($ev, $x, $y);
2194
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196
2061 $self->mouse_motion ($ev, $x, $y); 2197 $self->mouse_motion ($ev, $x, $y);
2062} 2198}
2063 2199
2064sub mouse_motion { 2200sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2201 my ($self, $ev, $x, $y) = @_;
2066 2202
2067 if ($GRAB == $self) { 2203 if ($GRAB == $self) {
2204 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2205
2206 my (undef, $lo, $hi, $page) = @{$self->{range}};
2207
2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209
2210 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2211 }
2212}
2213
2214sub update {
2215 my ($self) = @_;
2216
2217 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2218 $self->set_value ($self->{range}[0]);
2219
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2220 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100;
2069 2222
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2223 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2071 2224
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2225 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2073 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2226 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2074 2227
2075 $x -= $inner_pad_px; # substract the padding 2228 $value = ($value - $lo) / $range;
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2229 $value = $value * $self->{scale} + $self->{offset};
2077 $x = $lo if $x < $lo;
2078 $x = $hi - $page if $x > $hi - $page;
2079 $self->{range}[0] = $x;
2080 2230
2081 $self->emit (changed => $x); 2231 $self->{knob_x} = $value - $knob_w * 0.5;
2082 $self->update; 2232 $self->{knob_w} = $knob_w;
2083 } 2233 });
2084}
2085 2234
2086# the inner_* stuff is for generating a padding for the slider handle, 2235 $self->SUPER::update;
2087# so that the handle doesn't leave the texture. This calculation isn't 100%
2088# correct propably, but it does the job for now
2089sub _calc_inner_pad_px {
2090 my ($self, $w) = @_;
2091 ($w / 100) * $self->{inner_pad} # % to pixels
2092} 2236}
2093 2237
2094sub _draw { 2238sub _draw {
2095 my ($self) = @_; 2239 my ($self) = @_;
2096 2240
2097 $self->SUPER::_draw (); 2241 $self->SUPER::_draw ();
2098 2242
2099 my ($w, $h) = @$self{qw(w h)}; 2243 glScale $self->{w}, $self->{h};
2100 2244
2101 if ($self->{vertical}) { 2245 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2246 # draw a vertical slider like a rotated horizontal slider
2103 2247
2248 glTranslate 1, 0, 0;
2104 glRotate 90, 0, 0, 1; 2249 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2250 }
2109 2251
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2252 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2253 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2254
2113 my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115 $hi = $value + 1 if $lo == $hi;
2116
2117 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120 $page = int $page * $inner_w / ($hi - $lo);
2121 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123 $w -= $page;
2124 $page &= ~1;
2125 glTranslate $page * 0.5, 0, 0;
2126 $page ||= 2;
2127
2128 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131 glEnable GL_BLEND;
2132 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2257
2136 # draw background 2258 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2259 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2260
2139 # draw handle 2261 # draw handle
2140 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2262 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2141 2263
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2264 glDisable GL_TEXTURE_2D;
2144} 2265}
2266
2267#############################################################################
2268
2269package CFClient::UI::ValSlider;
2270
2271our @ISA = CFClient::UI::HBox::;
2272
2273sub new {
2274 my ($class, %arg) = @_;
2275
2276 my $range = delete $arg{range};
2277
2278 my $self = $class->SUPER::new (
2279 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2280 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2281 to_value => sub { shift },
2282 from_value => sub { shift },
2283 %arg,
2284 );
2285
2286 $self->{slider}->connect (changed => sub {
2287 my ($self, $value) = @_;
2288 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2289 $self->{parent}->emit (changed => $value);
2290 });
2291
2292# $self->{entry}->connect (changed => sub {
2293# my ($self, $value) = @_;
2294# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2295# $self->{parent}->emit (changed => $value);
2296# });
2297
2298 $self->add ($self->{slider}, $self->{entry});
2299
2300 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2301
2302 $self
2303}
2304
2305sub set_range { shift->{slider}->set_range (@_) }
2306sub set_value { shift->{slider}->set_value (@_) }
2145 2307
2146############################################################################# 2308#############################################################################
2147 2309
2148package CFClient::UI::TextView; 2310package CFClient::UI::TextView;
2149 2311
… …
2158 fontsize => 1, 2320 fontsize => 1,
2159 can_events => 0, 2321 can_events => 0,
2160 #font => default_font 2322 #font => default_font
2161 @_, 2323 @_,
2162 2324
2163 layout => (new CFClient::Layout), 2325 layout => (new CFClient::Layout 1),
2164 par => [], 2326 par => [],
2165 height => 0, 2327 height => 0,
2166 children => [ 2328 children => [
2167 (new CFClient::UI::Empty expand => 1), 2329 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2330 (new CFClient::UI::Slider vertical => 1),
… …
2179 2341
2180 $self->{fontsize} = $fontsize; 2342 $self->{fontsize} = $fontsize;
2181 $self->reflow; 2343 $self->reflow;
2182} 2344}
2183 2345
2184sub text_height {
2185 my ($self, $text) = @_;
2186
2187 my $layout = $self->{layout};
2188
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text);
2192
2193 ($layout->size)[1]
2194}
2195
2196sub reflow {
2197 my ($self) = @_;
2198
2199 $self->{need_reflow}++;
2200 $self->update;
2201}
2202
2203sub size_allocate { 2346sub size_allocate {
2204 my ($self, $w, $h) = @_; 2347 my ($self, $w, $h) = @_;
2205 2348
2206 $self->SUPER::size_allocate ($w, $h); 2349 $self->SUPER::size_allocate ($w, $h);
2207 2350
… …
2210 $self->{layout}->set_width ($self->{children}[0]{w}); 2353 $self->{layout}->set_width ($self->{children}[0]{w});
2211 2354
2212 $self->reflow; 2355 $self->reflow;
2213} 2356}
2214 2357
2358sub text_size {
2359 my ($self, $text, $indent) = @_;
2360
2361 my $layout = $self->{layout};
2362
2363 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2364 $layout->set_width ($self->{children}[0]{w} - $indent);
2365 $layout->set_markup ($text);
2366
2367 $layout->size
2368}
2369
2370sub reflow {
2371 my ($self) = @_;
2372
2373 $self->{need_reflow}++;
2374 $self->update;
2375}
2376
2377sub set_offset {
2378 my ($self, $offset) = @_;
2379
2380 # todo: base offset on lines or so, not on pixels
2381 $self->{children}[1]->set_value ($offset);
2382}
2383
2384sub clear {
2385 my ($self) = @_;
2386
2387 $self->{par} = [];
2388 $self->{height} = 0;
2389 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2390}
2391
2215sub add_paragraph { 2392sub add_paragraph {
2216 my ($self, $color, $text) = @_; 2393 my ($self, $color, $text, $indent) = @_;
2217 2394
2218 #TODO: intelligently "reformat" paragraph 2395 for my $line (split /\n/, $text) {
2219 2396 my ($w, $h) = $self->text_size ($line);
2220 my $height = $self->text_height ($text);
2221
2222 $self->{height} += $height; 2397 $self->{height} += $h;
2398 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2399 }
2223 2400
2224 push @{$self->{par}}, [$height, $color, $text];
2225
2226 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2401 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2227 $self->{children}[1]->update;
2228} 2402}
2229 2403
2230sub update { 2404sub update {
2231 my ($self) = @_; 2405 my ($self) = @_;
2232 2406
… …
2234 2408
2235 return unless $self->{h} > 0; 2409 return unless $self->{h} > 0;
2236 2410
2237 delete $self->{texture}; 2411 delete $self->{texture};
2238 2412
2239 $ROOT->on_refresh ($self, sub { 2413 $ROOT->on_post_alloc ($self, sub {
2414 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2415
2240 if (delete $self->{need_reflow}) { 2416 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2417 my $height = 0;
2242 2418
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2419 my $layout = $self->{layout};
2420
2421 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2422
2244 for @{$self->{par}}; 2423 for (@{$self->{par}}) {
2424 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2425 $layout->set_width ($W - $_->[3]);
2426 $layout->set_markup ($_->[4]);
2427 my ($w, $h) = $layout->size;
2428 $_->[0] = $w + $_->[3];
2429 $_->[1] = $h;
2430 }
2431
2432 $height += $_->[1];
2433 }
2245 2434
2246 $self->{height} = $height; 2435 $self->{height} = $height;
2247 2436
2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2437 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2249 2438
2250 delete $self->{texture}; 2439 delete $self->{texture};
2251 } 2440 }
2252 2441
2253 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2442 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2254 glClearColor 0, 0, 0, 0; 2443 glClearColor 0.5, 0.5, 0.5, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2444 glClear GL_COLOR_BUFFER_BIT;
2256 2445
2446 my $top = int $self->{children}[1]{range}[0];
2447
2448 my $y0 = $top;
2449 my $y1 = $top + $H;
2450
2451 my $y = 0;
2452
2453 my $layout = $self->{layout};
2454
2455 $layout->set_font ($self->{font}) if $self->{font};
2456
2257 glEnable GL_BLEND; 2457 glEnable GL_BLEND;
2458 #TODO# not correct in windows where rgba is forced off
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2459 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0];
2263
2264 my $y0 = $top;
2265 my $y1 = $top + $self->{h};
2266
2267 my $y = 0;
2268
2269 my $layout = $self->{layout};
2270
2271 $layout->set_font ($self->{font}) if $self->{font};
2272 2460
2273 for my $par (@{$self->{par}}) { 2461 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2462 my $h = $par->[1];
2275 2463
2276 if ($y0 < $y + $h && $y < $y1) { 2464 if ($y0 < $y + $h && $y < $y1) {
2465 $layout->set_foreground (@{ $par->[2] });
2466 $layout->set_width ($W - $par->[3]);
2277 $layout->set_text ($par->[2]); 2467 $layout->set_markup ($par->[4]);
2278 2468
2279 glColor @{ $par->[1] }; 2469 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 my ($W, $H) = $layout->size; 2470
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2471 glRasterPos $par->[3], $y - $y0;
2472 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282 } 2473 }
2283 2474
2284 $y += $h; 2475 $y += $h;
2285 } 2476 }
2286 2477
2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND; 2478 glDisable GL_BLEND;
2289 }; 2479 };
2290 }); 2480 });
2291} 2481}
2292 2482
2293sub _draw { 2483sub _draw {
2294 my ($self) = @_; 2484 my ($self) = @_;
2295 2485
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2486 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2488 glColor 1, 1, 1, 1;
2301 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2489 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2302 glDisable GL_TEXTURE_2D; 2490 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2491
2305 $self->{children}[1]->draw; 2492 $self->{children}[1]->draw;
2306 2493
2307} 2494}
2308 2495
… …
2376 2563
2377 # TODO: use animation 2564 # TODO: use animation
2378 if ($self->{state} = !$self->{state}) { 2565 if ($self->{state} = !$self->{state}) {
2379 $CFClient::UI::ROOT->add ($self->{other}); 2566 $CFClient::UI::ROOT->add ($self->{other});
2380 $self->{other}->move ($self->coord2global (0, $self->{h})); 2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2381 $self->emit ("open"); 2568 $self->_emit ("open");
2382 } else { 2569 } else {
2383 $CFClient::UI::ROOT->remove ($self->{other}); 2570 $CFClient::UI::ROOT->remove ($self->{other});
2384 $self->emit ("close"); 2571 $self->_emit ("close");
2385 } 2572 }
2386 2573
2387 $self->emit (changed => $self->{state}); 2574 $self->_emit (changed => $self->{state});
2388} 2575}
2389 2576
2390############################################################################# 2577#############################################################################
2391 2578
2392package CFClient::UI::Tooltip; 2579package CFClient::UI::Tooltip;
… …
2402 @_, 2589 @_,
2403 can_events => 0, 2590 can_events => 0,
2404 ) 2591 )
2405} 2592}
2406 2593
2407sub set_markup { 2594sub set_tooltip_from {
2408 my ($self, $text) = @_; 2595 my ($self, $widget) = @_;
2409 2596
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2597 $self->add (new CFClient::UI::Label
2411 $self->{label}->set_markup ($text); 2598 markup => $widget->{tooltip},
2412 $self->add ($self->{label}); 2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8,
2601 fg => [0, 0, 0, 1],
2602 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP),
2604 );
2413} 2605}
2414 2606
2415sub size_request { 2607sub size_request {
2416 my ($self) = @_; 2608 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2609
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2610 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2611
2422 ($w + 4, $h + 4) 2612 ($w + 4, $h + 4)
2423} 2613}
… …
2429} 2619}
2430 2620
2431sub _draw { 2621sub _draw {
2432 my ($self) = @_; 2622 my ($self) = @_;
2433 2623
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2624 glTranslate 0.375, 0.375;
2436 2625
2437 my ($w, $h) = @$self{qw(w h)}; 2626 my ($w, $h) = @$self{qw(w h)};
2438 2627
2439 glColor 1, 0.8, 0.4; 2628 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2639 glVertex 0 , $h;
2451 glVertex $w, $h; 2640 glVertex $w, $h;
2452 glVertex $w, 0; 2641 glVertex $w, 0;
2453 glEnd; 2642 glEnd;
2454 2643
2455 glPopMatrix; 2644 glTranslate 2 - 0.375, 2 - 0.375;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2645 $self->SUPER::_draw;
2459} 2646}
2460 2647
2461############################################################################# 2648#############################################################################
2462 2649
… …
2467use CFClient::OpenGL; 2654use CFClient::OpenGL;
2468 2655
2469sub new { 2656sub new {
2470 my $class = shift; 2657 my $class = shift;
2471 2658
2472 $class->SUPER::new ( 2659 my $self = $class->SUPER::new (
2473 aspect => 1, 2660 aspect => 1,
2661 can_events => 0,
2474 @_, 2662 @_,
2475 ) 2663 );
2664
2665 if ($self->{anim} && $self->{animspeed}) {
2666 Scalar::Util::weaken (my $widget = $self);
2667
2668 $self->{timer} = Event->timer (
2669 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2670 hard => 1,
2671 interval => $self->{animspeed},
2672 cb => sub {
2673 ++$widget->{frame};
2674 $widget->update;
2675 },
2676 );
2677 }
2678
2679 $self
2476} 2680}
2477 2681
2478sub size_request { 2682sub size_request {
2479 (32, 8) 2683 (32, 8)
2480} 2684}
2481 2685
2686sub update {
2687 my ($self) = @_;
2688
2689 return unless $self->{visible};
2690
2691 $self->SUPER::update;
2692}
2693
2482sub _draw { 2694sub _draw {
2483 my ($self) = @_; 2695 my ($self) = @_;
2484 2696
2485 return unless $::CONN;#d# manage and cache textures differently 2697 return unless $::CONN;
2698
2699 my $face;
2700
2701 if ($self->{frame}) {
2702 my $anim = $::CONN->{anim}[$self->{anim}];
2703
2704 $face = $anim->[ $self->{frame} % @$anim ]
2705 if $anim && @$anim;
2706 }
2707
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2708 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487 2709
2488 # TODO animation
2489 if ($tex) { 2710 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2711 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2713 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2714 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2715 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2716 }
2717}
2718
2719sub DESTROY {
2720 my ($self) = @_;
2721
2722 $self->{timer}->cancel
2723 if $self->{timer};
2724
2725 $self->SUPER::DESTROY;
2499} 2726}
2500 2727
2501############################################################################# 2728#############################################################################
2502 2729
2503package CFClient::UI::InventoryItem; 2730package CFClient::UI::Inventory;
2504 2731
2505our @ISA = CFClient::UI::HBox::; 2732our @ISA = CFClient::UI::ScrolledWindow::;
2506 2733
2507sub new { 2734sub new {
2508 my $class = shift; 2735 my $class = shift;
2509 2736
2510 my %args = @_;
2511
2512 my $item = $args{item};
2513
2514 my $desc = $item->{nrof} < 2
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518
2519 my $self = $class->SUPER::new ( 2737 my $self = $class->SUPER::new (
2520 can_hover => 1, 2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2521 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_;
2526
2527 # todo: maybe put examine on 1? but should just be a tooltip :(
2528 if ($ev->{button} == 1) {
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2543 ],
2544 )->popup ($ev);
2545 }
2546
2547 1
2548 },
2549 %args
2550 );
2551 $self->add(new CFClient::UI::Face
2552 can_events => 0,
2553 face => $item->{face},
2554 anim => $item->{anim},
2555 animspeed => $item->{animspeed});
2556 $self->add(new CFClient::UI::Label
2557 can_events => 0,
2558 text => $desc);
2559
2560 $self
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Inventory;
2566
2567our @ISA = CFClient::UI::ScrolledWindow::;
2568
2569sub new {
2570 my $class = shift;
2571
2572 my $self = $class->SUPER::new (
2573 scrolled => (new CFClient::UI::VBox),
2574 @_, 2739 @_,
2575 ); 2740 );
2576 2741
2577 $self 2742 $self
2578} 2743}
… …
2581 my ($self, $items) = @_; 2746 my ($self, $items) = @_;
2582 2747
2583 $self->{scrolled}->clear; 2748 $self->{scrolled}->clear;
2584 return unless $items; 2749 return unless $items;
2585 2750
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2751 my @items = sort {
2752 ($a->{type} <=> $b->{type})
2753 or ($a->{name} cmp $b->{name})
2754 } @$items;
2587 2755
2588 $self->{real_items} = \@items; 2756 $self->{real_items} = \@items;
2589 2757
2758 my $row = 0;
2590 for my $item (@items) { 2759 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2 2760 CFClient::Item::update_widgets $item;
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594 2761
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2596 } 2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2597 2765
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2766 $row++;
2767 }
2599} 2768}
2600 2769
2601sub size_request { 2770sub size_request {
2602 my ($self) = @_; 2771 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h}); 2772 ($self->{req_w}, $self->{req_h});
… …
2643 2812
2644# popup given the event (must be a mouse button down event currently) 2813# popup given the event (must be a mouse button down event currently)
2645sub popup { 2814sub popup {
2646 my ($self, $ev) = @_; 2815 my ($self, $ev) = @_;
2647 2816
2648 $self->emit ("popdown"); 2817 $self->_emit ("popdown");
2649 2818
2650 # maybe save $GRAB? must be careful about events... 2819 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 2820 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 2821 $self->{button} = $ev->{button};
2653 2822
… …
2668 2837
2669 if ($ev->{button} == $self->{button}) { 2838 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 2839 undef $GRAB;
2671 $self->hide; 2840 $self->hide;
2672 2841
2673 $self->emit ("popdown"); 2842 $self->_emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 2843 $self->{hover}[1]->() if $self->{hover};
2675 } 2844 }
2676} 2845}
2677 2846
2678############################################################################# 2847#############################################################################
2679 2848
2849package CFClient::UI::Statusbox;
2850
2851our @ISA = CFClient::UI::VBox::;
2852
2853sub new {
2854 my $class = shift;
2855
2856 $class->SUPER::new (
2857 fontsize => 0.8,
2858 @_,
2859 )
2860}
2861
2862sub reorder {
2863 my ($self) = @_;
2864 my $NOW = time;
2865
2866 while (my ($k, $v) = each %{ $self->{item} }) {
2867 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2868 }
2869
2870 my @widgets;
2871
2872 my @items = sort {
2873 $a->{pri} <=> $b->{pri}
2874 or $b->{id} <=> $a->{id}
2875 } values %{ $self->{item} };
2876
2877 my $count = 10 + 1;
2878 for my $item (@items) {
2879 last unless --$count;
2880
2881 push @widgets, $item->{label} ||= do {
2882 # TODO: doesn't handle markup well (read as: at all)
2883 my $short = $item->{count} > 1
2884 ? "<b>$item->{count} ×</b> $item->{text}"
2885 : $item->{text};
2886
2887 for ($short) {
2888 s/^\s+//;
2889 s/\s+/ /g;
2890 }
2891
2892 new CFClient::UI::Label
2893 markup => $short,
2894 tooltip => $item->{tooltip},
2895 tooltip_font => $::FONT_PROP,
2896 tooltip_width => 0.67,
2897 fontsize => $item->{fontsize} || $self->{fontsize},
2898 max_w => $::WIDTH * 0.44,
2899 fg => $item->{fg},
2900 can_events => 1,
2901 can_hover => 1
2902 };
2903 }
2904
2905 $self->clear;
2906 $self->SUPER::add (reverse @widgets);
2907}
2908
2909sub add {
2910 my ($self, $text, %arg) = @_;
2911
2912 $text =~ s/^\s+//;
2913 $text =~ s/\s+$//;
2914
2915 return unless $text;
2916
2917 my $timeout = time + ((delete $arg{timeout}) || 60);
2918
2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2920
2921 if (my $item = $self->{item}{$group}) {
2922 if ($item->{text} eq $text) {
2923 $item->{count}++;
2924 } else {
2925 $item->{count} = 1;
2926 $item->{text} = $item->{tooltip} = $text;
2927 }
2928 $item->{id} = ++$self->{id};
2929 $item->{timeout} = $timeout;
2930 delete $item->{label};
2931 } else {
2932 $self->{item}{$group} = {
2933 id => ++$self->{id},
2934 text => $text,
2935 timeout => $timeout,
2936 tooltip => $text,
2937 fg => [0.8, 0.8, 0.8, 0.8],
2938 pri => 0,
2939 count => 1,
2940 %arg,
2941 };
2942 }
2943
2944 $self->reorder;
2945}
2946
2947sub reconfigure {
2948 my ($self) = @_;
2949
2950 delete $_->{label}
2951 for values %{ $self->{item} || {} };
2952
2953 $self->reorder;
2954 $self->SUPER::reconfigure;
2955}
2956
2957#############################################################################
2958
2680package CFClient::UI::Root; 2959package CFClient::UI::Root;
2681 2960
2682our @ISA = CFClient::UI::Container::; 2961our @ISA = CFClient::UI::Container::;
2683 2962
2684use CFClient::OpenGL; 2963use CFClient::OpenGL;
2685 2964
2965sub new {
2966 my $class = shift;
2967
2968 $class->SUPER::new (
2969 @_,
2970 )
2971}
2972
2973sub configure {
2974 my ($self, $x, $y, $w, $h) = @_;
2975
2976 $self->{w} = $w;
2977 $self->{h} = $h;
2978}
2979
2686sub check_size { 2980sub check_size {
2687 my ($self) = @_; 2981 my ($self) = @_;
2688 2982
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 2983 $self->size_allocate ($self->{w}, $self->{h})
2984 if $self->{w};
2690} 2985}
2691 2986
2692sub size_request { 2987sub size_request {
2693 my ($self) = @_; 2988 my ($self) = @_;
2694 2989
… …
2696} 2991}
2697 2992
2698sub size_allocate { 2993sub size_allocate {
2699 my ($self, $w, $h) = @_; 2994 my ($self, $w, $h) = @_;
2700 2995
2701 my $old_w = $self->{old_w};
2702 my $old_h = $self->{old_h};
2703
2704 if ($old_w && $old_h) {
2705 for my $child ($self->children) {
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2722 my ($self, $x, $y, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725
2726 for my $child ($self->children) { 2996 for my $child ($self->children) {
2727 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2728 2998
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3000 if exists $child->{req_x};
3001
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3003 if exists $child->{req_y};
3004
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2730 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007
2731 $child->configure ($X, $Y, $W, $H); 3008 $child->configure ($X, $Y, $W, $H);
2732 } 3009 }
2733} 3010}
2734 3011
2735sub _topleft { 3012sub coord2local {
2736 my ($self, $x, $y) = @_; 3013 my ($self, $x, $y) = @_;
2737 3014
2738 ($x, $y) 3015 ($x, $y)
2739} 3016}
2740 3017
3018sub coord2global {
3019 my ($self, $x, $y) = @_;
3020
3021 ($x, $y)
3022}
3023
2741sub update { 3024sub update {
2742 my ($self) = @_; 3025 my ($self) = @_;
2743 3026
2744 $self->check_size; 3027 $self->check_size;
2745 ::refresh (); 3028 $::WANT_REFRESH++;
2746} 3029}
2747 3030
2748sub add { 3031sub add {
2749 my ($self, $child) = @_; 3032 my ($self, @children) = @_;
2750 3033
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3040 for my $child (@children) {
3041 $child->{is_toplevel} = 1;
3042
2751 # integerize window positions 3043 # integerise window positions
2752 $child->{x} = int $child->{x}; 3044 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 3045 $child->{y} = int $child->{y};
3046 }
2754 3047
2755 $self->SUPER::add ($child); 3048 $self->SUPER::add (@children);
3049}
3050
3051sub remove {
3052 my ($self, @children) = @_;
3053
3054 $self->SUPER::remove (@children);
3055
3056 while (@children) {
3057 my $w = pop @children;
3058 push @children, $w->children;
3059 $w->set_invisible;
3060 }
2756} 3061}
2757 3062
2758sub on_refresh { 3063sub on_refresh {
2759 my ($self, $id, $cb) = @_; 3064 my ($self, $id, $cb) = @_;
2760 3065
2761 $self->{refresh_hook}{$id} = $cb; 3066 $self->{refresh_hook}{$id} = $cb;
2762} 3067}
2763 3068
3069sub on_post_alloc {
3070 my ($self, $id, $cb) = @_;
3071
3072 $self->{post_alloc_hook}{$id} = $cb;
3073}
3074
2764sub draw { 3075sub draw {
2765 my ($self) = @_; 3076 my ($self) = @_;
2766 3077
2767 while (my $rcb = delete $self->{refresh_hook}) { 3078 while ($self->{refresh_hook}) {
2768 $_->() for values %$rcb; 3079 $_->()
3080 for values %{delete $self->{refresh_hook}};
3081 }
3082
3083 if ($self->{check_size}) {
3084 my @queue = ([], []);
3085
3086 for (;;) {
3087 if ($self->{check_size}) {
3088 # heuristic: check containers last
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3090 for values %{delete $self->{check_size}}
3091 }
3092
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3094
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3096 ? @$widget{qw(user_w user_h)}
3097 : $widget->size_request;
3098
3099 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102
3103 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h;
3105
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3107
3108 $widget->{parent}->check_size
3109 if $widget->{parent};
3110 }
3111 }
3112 }
3113
3114 while ($self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) {
3116 my ($widget, $w, $h) = @$_;
3117
3118 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0;
3120
3121 $widget->{w} = $w;
3122 $widget->{h} = $h;
3123 $widget->emit (size_allocate => $w, $h);
3124 }
3125 }
3126
3127 while ($self->{post_alloc_hook}) {
3128 $_->()
3129 for values %{delete $self->{post_alloc_hook}};
2769 } 3130 }
2770 3131
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3132 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3134 glClear GL_COLOR_BUFFER_BIT;
2774 3135
2775 glMatrixMode GL_PROJECTION; 3136 glMatrixMode GL_PROJECTION;
2776 glLoadIdentity; 3137 glLoadIdentity;
2777 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778 glMatrixMode GL_MODELVIEW; 3139 glMatrixMode GL_MODELVIEW;
2779 glLoadIdentity; 3140 glLoadIdentity;
2780 3141
2781 $self->_draw; 3142 $self->_draw;
2782} 3143}
… …
2784############################################################################# 3145#############################################################################
2785 3146
2786package CFClient::UI; 3147package CFClient::UI;
2787 3148
2788$ROOT = new CFClient::UI::Root; 3149$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3150$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3151
27911 31521
2792 3153

Diff Legend

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