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.177 by root, Tue Apr 25 13:08:17 2006 UTC vs.
Revision 1.232 by root, Thu May 25 02:23:14 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 } 300 }
243} 301}
244 302
245sub size_allocate { 303sub size_allocate {
246 # nothing to be done 304 # nothing to be done
247} 305}
248 306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
249sub children { 314sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 315}
261 316
262sub set_max_size { 317sub set_max_size {
263 my ($self, $w, $h) = @_; 318 my ($self, $w, $h) = @_;
264 319
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 322}
268 323
269# return top left coordinates 324sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 325 my ($self, $tooltip) = @_;
272 326
273 $self->{parent} 327 $self->{tooltip} = $tooltip;
274 or Carp::confess "no parent widget in _topleft\n";#d#
275 328
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 329 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner};
331 CFClient::UI::check_tooltip;
332 }
277} 333}
278 334
279# translate global coordinates to local coordinate system 335# translate global coordinates to local coordinate system
280sub coord2local { 336sub coord2local {
281 my ($self, $x, $y) = @_; 337 my ($self, $x, $y) = @_;
282 338
283 my ($X, $Y) = $self->_topleft; 339 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 340}
286 341
287# translate local coordinates to global coordinate system 342# translate local coordinates to global coordinate system
288sub coord2global { 343sub coord2global {
289 my ($self, $x, $y) = @_; 344 my ($self, $x, $y) = @_;
290 345
291 my ($X, $Y) = $self->_topleft; 346 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 347}
294 348
295sub focus_in { 349sub focus_in {
296 my ($self) = @_; 350 my ($self) = @_;
297 351
298 return if $FOCUS == $self; 352 return if $FOCUS == $self;
299 return unless $self->{can_focus}; 353 return unless $self->{can_focus};
300 354
301 my $focus = $FOCUS; $FOCUS = $self; 355 my $focus = $FOCUS; $FOCUS = $self;
302 356
303 $self->emit (focus_in => $focus); 357 $self->_emit (focus_in => $focus);
304 358
305 $focus->update if $focus; 359 $focus->update if $focus;
306 $FOCUS->update; 360 $FOCUS->update;
307} 361}
308 362
… …
311 365
312 return unless $FOCUS == $self; 366 return unless $FOCUS == $self;
313 367
314 my $focus = $FOCUS; undef $FOCUS; 368 my $focus = $FOCUS; undef $FOCUS;
315 369
316 $self->emit (focus_out => $focus); 370 $self->_emit (focus_out => $focus);
317 371
318 $focus->update if $focus; #? 372 $focus->update if $focus; #?
373
374 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
375 unless $FOCUS;
319} 376}
320 377
321sub mouse_motion { } 378sub mouse_motion { }
322sub button_up { } 379sub button_up { }
323sub key_down { } 380sub key_down { }
324sub key_up { } 381sub key_up { }
325 382
326sub button_down { 383sub button_down {
327 my ($self, $ev, $x, $y) = @_; 384 my ($self, $ev, $x, $y) = @_;
328 385
329 $self->focus_in; 386 $self->focus_in;
… …
369 glVertex $self->{w}, 0; 426 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h}; 427 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h}; 428 glVertex 0 , $self->{h};
372 glEnd; 429 glEnd;
373 glPopMatrix; 430 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 } 432 }
376} 433}
377 434
378sub _draw { 435sub _draw {
379 my ($self) = @_; 436 my ($self) = @_;
… …
395 452
396sub set_parent { 453sub set_parent {
397 my ($self, $parent) = @_; 454 my ($self, $parent) = @_;
398 455
399 Scalar::Util::weaken ($self->{parent} = $parent); 456 Scalar::Util::weaken ($self->{parent} = $parent);
457
458 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size
460 unless exists $self->{req_w};
461
462 $self->show;
400} 463}
401 464
402sub check_size { 465sub check_size {
403 my ($self) = @_; 466 my ($self, $forced) = @_;
404 467
405 $self->{parent} 468 $self->{force_alloc} = 1 if $forced;
406 or return 1; 469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 470}
427 471
428sub update { 472sub update {
429 my ($self) = @_; 473 my ($self) = @_;
430 474
… …
436 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
437 481
438 push @{ $self->{signal_cb}{$signal} }, $cb; 482 push @{ $self->{signal_cb}{$signal} }, $cb;
439} 483}
440 484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
441sub emit { 491sub emit {
442 my ($self, $signal, @args) = @_; 492 my ($self, $signal, @args) = @_;
443 493
444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
445} 496}
446 497
447sub DESTROY { 498sub DESTROY {
448 my ($self) = @_; 499 my ($self) = @_;
449 500
501 delete $WIDGET{$self+0};
450 #$self->deactivate; 502 #$self->deactivate;
451} 503}
452 504
453############################################################################# 505#############################################################################
454 506
… …
463 my $class = shift; 515 my $class = shift;
464 516
465 # range [value, low, high, page] 517 # range [value, low, high, page]
466 518
467 $class->SUPER::new ( 519 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 520 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 521 #active_bg => [1, 1, 1, 0.5],
470 @_ 522 @_
471 ) 523 )
472} 524}
473 525
474sub _draw { 526sub _draw {
475 my ($self) = @_; 527 my ($self) = @_;
476 528
529 my $color = $FOCUS == $self && $self->{active_bg}
530 ? $self->{active_bg}
531 : $self->{bg};
532
533 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 534 my ($w, $h) = @$self{qw(w h)};
478 535
479 glEnable GL_BLEND; 536 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 538 glColor @$color;
482 539
483 glBegin GL_QUADS; 540 glBegin GL_QUADS;
484 glVertex 0 , 0; 541 glVertex 0 , 0;
485 glVertex 0 , $h; 542 glVertex 0 , $h;
486 glVertex $w, $h; 543 glVertex $w, $h;
487 glVertex $w, 0; 544 glVertex $w, 0;
488 glEnd; 545 glEnd;
489 546
490 glDisable GL_BLEND; 547 glDisable GL_BLEND;
548 }
491} 549}
492 550
493############################################################################# 551#############################################################################
494 552
495package CFClient::UI::Empty; 553package CFClient::UI::Empty;
… …
527 585
528 $self 586 $self
529} 587}
530 588
531sub add { 589sub add {
532 my ($self, $child) = @_; 590 my ($self, @widgets) = @_;
533 591
534 $child->set_parent ($self); 592 $_->set_parent ($self)
593 for @widgets;
535 594
536 use sort 'stable'; 595 use sort 'stable';
537 596
538 $self->{children} = [ 597 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 598 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 599 @{$self->{children}}, @widgets
541 ]; 600 ];
542 601
543 $child->check_size; 602 $self->check_size (1);
603 $self->update;
544} 604}
545 605
546sub children { 606sub children {
547 @{ $_[0]{children} } 607 @{ $_[0]{children} }
548} 608}
… …
567 627
568 for (@$children) { 628 for (@$children) {
569 delete $_->{parent}; 629 delete $_->{parent};
570 $_->hide; 630 $_->hide;
571 } 631 }
632
633 $self->check_size;
634 $self->update;
572} 635}
573 636
574sub find_widget { 637sub find_widget {
575 my ($self, $x, $y) = @_; 638 my ($self, $x, $y) = @_;
576 639
… …
651} 714}
652 715
653sub update { 716sub update {
654 my ($self) = @_; 717 my ($self) = @_;
655 718
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 719 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 720 $self->SUPER::update;
658} 721}
659 722
660sub size_allocate { 723sub size_allocate {
661 my ($self, $w, $h) = @_; 724 my ($self, $w, $h) = @_;
662 725
663 $self->SUPER::size_allocate ($w, $h); 726 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 727 $self->update;
728}
729
730sub _render {
731 $_[0]{children}[0]->draw;
665} 732}
666 733
667sub render_child { 734sub render_child {
668 my ($self) = @_; 735 my ($self) = @_;
669 736
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 737 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 738 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 739 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 740
674# glColorMask 1, 1, 1, 0; 741 $self->_render;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
681 }; 742 };
682} 743}
683 744
684sub _draw { 745sub _draw {
685 my ($self) = @_; 746 my ($self) = @_;
… …
687 my ($w, $h) = ($self->w, $self->h); 748 my ($w, $h) = ($self->w, $self->h);
688 749
689 my $tex = $self->{texture} 750 my $tex = $self->{texture}
690 or return; 751 or return;
691 752
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 753 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 755 glColor 1, 1, 1, 1;
697 756
698 $tex->draw_quad (0, 0, $w, $h); 757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 758
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
702} 760}
703 761
704############################################################################# 762#############################################################################
705 763
706package CFClient::UI::ViewPort; 764package CFClient::UI::ViewPort;
707 765
708our @ISA = CFClient::UI::Window::; 766our @ISA = CFClient::UI::Window::;
709 767
710sub new { die }
711
712sub size_request { 768sub size_request {
713 my ($self) = @_; 769 my ($self) = @_;
714 770
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717 772
718 @$self{qw(child_w child_h)} 773 @$self{qw(child_w child_h)}
719} 774}
720 775
721sub _draw { 776sub size_allocate {
722 my ($self) = @_; 777 my ($self, $w, $h) = @_;
723 778
724 $self->{children}[1]->draw; 779 my ($cw, $ch) = @$self{qw(child_w child_h)};
780# $w = $self->{w};
781 $self->child->configure (0, 0, $cw, $ch);
782 $self->update;
725} 783}
726 784
785sub set_offset {
786 my ($self, $x, $y) = @_;
787
788 $self->{view_x} = int $x;
789 $self->{view_y} = int $y;
790
791 $self->update;
792}
793
794# hmm, this does not work for topleft of $self... but we should not ask for that
795sub coord2local {
796 my ($self, $x, $y) = @_;
797
798 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
799}
800
801sub coord2global {
802 my ($self, $x, $y) = @_;
803
804 $x = List::Util::min $self->{w}, $x - $self->{view_x};
805 $y = List::Util::min $self->{h}, $y - $self->{view_y};
806
807 $self->SUPER::coord2global ($x, $y)
808}
809
810sub find_widget {
811 my ($self, $x, $y) = @_;
812
813 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
814 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
815 ) {
816 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
817 } else {
818 $self->CFClient::UI::Base::find_widget ($x, $y)
819 }
820}
821
822sub _render {
823 my ($self) = @_;
824
825 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
826
827 $self->SUPER::_render;
828}
727 829
728############################################################################# 830#############################################################################
729 831
730package CFClient::UI::Frame; 832package CFClient::UI::ScrolledWindow;
731 833
732our @ISA = CFClient::UI::Bin::; 834our @ISA = CFClient::UI::HBox::;
733
734use CFClient::OpenGL;
735 835
736sub new { 836sub new {
737 my $class = shift; 837 my $class = shift;
738 838
839 my $self;
840
841 my $slider = new CFClient::UI::Slider
842 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]);
846 },
847 ;
848
739 my $self = $class->SUPER::new ( 849 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 850 vp => (new CFClient::UI::ViewPort expand => 1),
741 border_bg => [1, 1, 1, 1], 851 slider => $slider,
742 border => 0.8,
743 @_ 852 @_,
744 ); 853 );
745 854
855 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp});
857 $self->add ($self->{slider});
858
746 $self 859 $self
747} 860}
748 861
862sub size_allocate {
863 my ($self, $w, $h) = @_;
864
865 $self->SUPER::size_allocate ($w, $h);
866
867 my $child = $self->{vp}->child;
868 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
869}
870
871#TODO# update range on size_allocate depending on child
872# update viewport offset on scroll
873
874#############################################################################
875
876package CFClient::UI::Frame;
877
878our @ISA = CFClient::UI::Bin::;
879
880use CFClient::OpenGL;
881
882sub new {
883 my $class = shift;
884
885 $class->SUPER::new (
886 bg => undef,
887 @_,
888 )
889}
890
749sub _draw { 891sub _draw {
750 my ($self) = @_; 892 my ($self) = @_;
751 893
752 my ($w, $h) = ($self->{w}, $self->{h}); 894 if ($self->{bg}) {
895 my ($w, $h) = @$self{qw(w h)};
753 896
754 glEnable GL_BLEND; 897 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 898 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 899 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 900
759# glBegin GL_QUADS; 901 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 902 glVertex 0 , 0;
762# glVertex 0 , $h; 903 glVertex 0 , $h;
763# glVertex $w, $h; 904 glVertex $w, $h;
764# glVertex $w, 0; 905 glVertex $w, 0;
765# glEnd; 906 glEnd;
766 907
767
768 $self->child->draw;
769 glDisable GL_BLEND; 908 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 909 }
910
911 $self->SUPER::_draw;
771} 912}
772 913
773############################################################################# 914#############################################################################
774 915
775package CFClient::UI::FancyFrame; 916package CFClient::UI::FancyFrame;
… …
786 my $class = shift; 927 my $class = shift;
787 928
788 # TODO: user_x, user_y, overwrite moveto? 929 # TODO: user_x, user_y, overwrite moveto?
789 930
790 my $self = $class->SUPER::new ( 931 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 932 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 933 border_bg => [1, 1, 1, 1],
793 border => 0.6, 934 border => 0.6,
935 is_toplevel => 1,
794 can_events => 1, 936 can_events => 1,
795 @_ 937 @_
796 ); 938 );
797 939
798 $self->{title} &&= new CFClient::UI::Label 940 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 941 align => 0,
… …
823 my ($self, $w, $h) = @_; 965 my ($self, $w, $h) = @_;
824 966
825 $h -= List::Util::max 0, $self->border * 2; 967 $h -= List::Util::max 0, $self->border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 968 $w -= List::Util::max 0, $self->border * 2;
827 969
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
829 if $self->{title}; 971 if $self->{title};
830 972
831 $self->child->configure ($self->border, $self->border, $w, $h); 973 $self->child->configure ($self->border, $self->border, $w, $h);
832} 974}
833 975
… …
891 my ($self) = @_; 1033 my ($self) = @_;
892 1034
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1035 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 1037
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1038 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1040
901 my $border = $self->border; 1041 my $border = $self->border;
902 1042
903 glColor @{ $self->{border_bg} }; 1043 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1048
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1050 my $bg = $tex[0];
911 1051
912 # TODO: repeat texture not scale 1052 # TODO: repeat texture not scale
… …
916 glColor @{ $self->{bg} }; 1056 glColor @{ $self->{bg} };
917 1057
918 $bg->{s} = $rep_x; 1058 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y; 1059 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1; 1060 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 }
922 1063
923 glDisable GL_TEXTURE_2D; 1064 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1065
927 $self->{title}->draw if $self->{title}; 1066 $self->{title}->draw if $self->{title};
928 1067
929 $self->child->draw; 1068 $self->child->draw;
930} 1069}
… …
1157} 1296}
1158 1297
1159sub size_allocate { 1298sub size_allocate {
1160 my ($self, $w, $h) = @_; 1299 my ($self, $w, $h) = @_;
1161 1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1162 my $children = $self->{children}; 1303 my $children = $self->{children};
1163 1304
1164 my @h = map $_->{req_h}, @$children; 1305 my @h = map $_->{req_h}, @$children;
1165 1306
1166 my $req_h = List::Util::sum @h; 1307 my $req_h = List::Util::sum @h;
… …
1195 1336
1196############################################################################# 1337#############################################################################
1197 1338
1198package CFClient::UI::Label; 1339package CFClient::UI::Label;
1199 1340
1200our @ISA = CFClient::UI::Base::; 1341our @ISA = CFClient::UI::DrawBG::;
1201 1342
1202use CFClient::OpenGL; 1343use CFClient::OpenGL;
1203 1344
1204sub new { 1345sub new {
1205 my ($class, %arg) = @_; 1346 my ($class, %arg) = @_;
1206 1347
1207 my $self = $class->SUPER::new ( 1348 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1349 fg => [1, 1, 1],
1350 #bg => none
1351 #active_bg => none
1209 #font => default_font 1352 #font => default_font
1353 #text => initial text
1354 #markup => initial narkup
1355 #max_w => maximum pixel width
1356 ellipsise => 3, # end
1357 layout => (new CFClient::Layout),
1210 fontsize => 1, 1358 fontsize => 1,
1211 text => "",
1212 align => -1, 1359 align => -1,
1213 valign => -1, 1360 valign => -1,
1214 padding => 2, 1361 padding => 2,
1215 layout => new CFClient::Layout,
1216 can_events => 0, 1362 can_events => 0,
1217 %arg 1363 %arg
1218 ); 1364 );
1219 1365
1220 if (exists $self->{template}) { 1366 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1367 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1368 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1369 $self->{template} = $layout;
1224 } 1370 }
1225 1371
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1372 if (exists $self->{markup}) {
1227 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1373 $self->set_markup (delete $self->{markup});
1374 } else {
1375 $self->set_text (delete $self->{text});
1376 }
1228 1377
1229 $self 1378 $self
1230} 1379}
1231 1380
1232sub escape { 1381sub escape($) {
1233 local $_ = $_[1]; 1382 local $_ = $_[0];
1234 1383
1235 s/&/&amp;/g; 1384 s/&/&amp;/g;
1236 s/>/&gt;/g; 1385 s/>/&gt;/g;
1237 s/</&lt;/g; 1386 s/</&lt;/g;
1238 1387
1239 $_[1] 1388 $_
1240} 1389}
1241 1390
1242sub update { 1391sub update {
1243 my ($self) = @_; 1392 my ($self) = @_;
1244 1393
1245 delete $self->{texture}; 1394 delete $self->{texture};
1246 $self->SUPER::update; 1395 $self->SUPER::update;
1247} 1396}
1248 1397
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1398sub set_text {
1256 my ($self, $text) = @_; 1399 my ($self, $text) = @_;
1257 1400
1258 return if $self->{text} eq "T$text"; 1401 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1402 $self->{text} = "T$text";
1260 1403
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1405 $self->{layout}->set_text ($text);
1262 1406
1263 delete $self->{texture};
1264 $self->update; 1407 $self->update;
1265 $self->check_size; 1408 $self->check_size;
1266} 1409}
1267 1410
1268sub set_markup { 1411sub set_markup {
1269 my ($self, $markup) = @_; 1412 my ($self, $markup) = @_;
1270 1413
1271 return if $self->{text} eq "M$markup"; 1414 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1415 $self->{text} = "M$markup";
1273 1416
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1420 $self->{layout}->set_markup ($markup);
1275 1421
1276 delete $self->{texture};
1277 $self->update; 1422 $self->update;
1278 $self->check_size; 1423 $self->check_size;
1279} 1424}
1280 1425
1281sub size_request { 1426sub size_request {
1282 my ($self) = @_; 1427 my ($self) = @_;
1283 1428
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1429 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $self->{layout}->set_width ($self->{max_w} || -1); 1430 $self->{layout}->set_width ($self->{max_w} || -1);
1431 $self->{layout}->set_ellipsise ($self->{ellipsise});
1432 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1433 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1434
1288 my ($w, $h) = $self->{layout}->size; 1435 my ($w, $h) = $self->{layout}->size;
1289 1436
1290 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1312sub set_fontsize { 1459sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1460 my ($self, $fontsize) = @_;
1314 1461
1315 $self->{fontsize} = $fontsize; 1462 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1463 delete $self->{texture};
1464
1465 $self->update;
1317 $self->check_size; 1466 $self->check_size;
1318 $self->update;
1319} 1467}
1320 1468
1321sub _draw { 1469sub _draw {
1322 my ($self) = @_; 1470 my ($self) = @_;
1323 1471
1472 $self->SUPER::_draw; # draw background, if applicable
1473
1324 my $tex = $self->{texture} ||= do { 1474 my $tex = $self->{texture} ||= do {
1475 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1476 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $self->{layout}->set_width ($self->{w}); 1477 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481
1328 new_from_layout CFClient::Texture $self->{layout} 1482 my $tex = new_from_layout CFClient::Texture $self->{layout};
1483
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1486 : ($self->{w} - $tex->{w}) * 0.5);
1487
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1490 : ($self->{h} - $tex->{h}) * 0.5);
1491
1492 $tex
1329 }; 1493 };
1330 1494
1331 glEnable GL_BLEND;
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333 glEnable GL_TEXTURE_2D; 1495 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1497
1498 if ($tex->{format} == GL_ALPHA) {
1336 glColor @{$self->{fg}}; 1499 glColor @{$self->{fg}};
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $tex->draw_quad ($self->{ox}, $self->{oy}); 1500 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1501 } else {
1502 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1503 }
1351 1504
1352 glDisable GL_TEXTURE_2D; 1505 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1506}
1355 1507
1356############################################################################# 1508#############################################################################
1357 1509
1358package CFClient::UI::EntryBase; 1510package CFClient::UI::EntryBase;
… …
1371 active_fg => [0, 0, 0], 1523 active_fg => [0, 0, 0],
1372 can_hover => 1, 1524 can_hover => 1,
1373 can_focus => 1, 1525 can_focus => 1,
1374 valign => 0, 1526 valign => 0,
1375 can_events => 1, 1527 can_events => 1,
1528 #text => ...
1376 @_ 1529 @_
1377 ) 1530 )
1378} 1531}
1379 1532
1380sub _set_text { 1533sub _set_text {
… …
1390 $self->{text} = $text; 1543 $self->{text} = $text;
1391 1544
1392 $text =~ s/./*/g if $self->{hidden}; 1545 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 1546 $self->{layout}->set_text ("$text ");
1394 1547
1395 $self->emit (changed => $self->{text}); 1548 $self->_emit (changed => $self->{text});
1396}
1397
1398sub get_text {
1399 $_[0]{text}
1400}
1401
1402sub size_request {
1403 my ($self) = @_;
1404
1405 my ($w, $h) = $self->SUPER::size_request;
1406
1407 ($w + 1, $h) # add 1 for cursor
1408}
1409
1410sub size_allocate {
1411 my ($self, $w, $h) = @_;
1412
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414} 1549}
1415 1550
1416sub set_text { 1551sub set_text {
1417 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1418 1553
1419 $self->{cursor} = length $text; 1554 $self->{cursor} = length $text;
1420 $self->_set_text ($text); 1555 $self->_set_text ($text);
1421 $self->update; 1556 $self->update;
1557 $self->check_size;
1558}
1559
1560sub get_text {
1561 $_[0]{text}
1562}
1563
1564sub size_request {
1565 my ($self) = @_;
1566
1567 my ($w, $h) = $self->SUPER::size_request;
1568
1569 ($w + 1, $h) # add 1 for cursor
1422} 1570}
1423 1571
1424sub key_down { 1572sub key_down {
1425 my ($self, $ev) = @_; 1573 my ($self, $ev) = @_;
1426 1574
… …
1428 my $sym = $ev->{sym}; 1576 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1577 my $uni = $ev->{unicode};
1430 1578
1431 my $text = $self->get_text; 1579 my $text = $self->get_text;
1432 1580
1433 if ($sym == 8) { 1581 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1582 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1583 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1584 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1585 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1586 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1587 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1588 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1589 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1590 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1591 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1592 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1593 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1594 $self->_emit ('escape');
1447 } elsif ($uni) { 1595 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1596 substr $text, $self->{cursor}++, 0, chr $uni;
1449 } 1597 }
1450 1598
1451 $self->_set_text ($text); 1599 $self->_set_text ($text);
1452 $self->update; 1600 $self->update;
1601 $self->check_size;
1453} 1602}
1454 1603
1455sub focus_in { 1604sub focus_in {
1456 my ($self) = @_; 1605 my ($self) = @_;
1457 1606
… …
1537 if ($sym == 13) { 1686 if ($sym == 13) {
1538 unshift @{$self->{history}}, 1687 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 1688 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1; 1689 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 1690 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 1691 $self->_emit (activate => $txt);
1543 $self->update; 1692 $self->update;
1544 1693
1545 } elsif ($sym == CFClient::SDLK_UP) { 1694 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 1695 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 1696 $self->{history_saveback} = $self->get_text;
… …
1586 my $class = shift; 1735 my $class = shift;
1587 1736
1588 $class->SUPER::new ( 1737 $class->SUPER::new (
1589 padding => 4, 1738 padding => 4,
1590 fg => [1, 1, 1], 1739 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 1740 active_fg => [0, 0, 1],
1593 can_hover => 1, 1741 can_hover => 1,
1594 align => 0, 1742 align => 0,
1595 valign => 0, 1743 valign => 0,
1596 can_events => 1, 1744 can_events => 1,
1597 @_ 1745 @_
1598 ) 1746 )
1599} 1747}
1600 1748
1749sub activate { }
1750
1601sub button_up { 1751sub button_up {
1602 my ($self, $ev, $x, $y) = @_; 1752 my ($self, $ev, $x, $y) = @_;
1603 1753
1754 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 1755 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 1756 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate");
1607 }
1608} 1757}
1609 1758
1610sub _draw { 1759sub _draw {
1611 my ($self) = @_; 1760 my ($self) = @_;
1612 1761
… …
1614 1763
1615 if ($GRAB == $self) { 1764 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg}; 1765 $self->{fg} = $self->{active_fg};
1617 } 1766 }
1618 1767
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1768 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1770 glColor 0, 0, 0, 1;
1624 1771
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1772 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1773
1627 glDisable GL_TEXTURE_2D; 1774 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1775
1630 $self->SUPER::_draw; 1776 $self->SUPER::_draw;
1631} 1777}
1632 1778
1633############################################################################# 1779#############################################################################
… …
1647 1793
1648 $class->SUPER::new ( 1794 $class->SUPER::new (
1649 padding => 2, 1795 padding => 2,
1650 fg => [1, 1, 1], 1796 fg => [1, 1, 1],
1651 active_fg => [1, 1, 0], 1797 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5],
1652 state => 0, 1800 state => 0,
1653 can_hover => 1, 1801 can_hover => 1,
1654 @_ 1802 @_
1655 ) 1803 )
1656} 1804}
… …
1665 my ($self, $ev, $x, $y) = @_; 1813 my ($self, $ev, $x, $y) = @_;
1666 1814
1667 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1668 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1669 $self->{state} = !$self->{state}; 1817 $self->{state} = !$self->{state};
1670 $self->emit (changed => $self->{state}); 1818 $self->_emit (changed => $self->{state});
1671 } 1819 }
1672} 1820}
1673 1821
1674sub _draw { 1822sub _draw {
1675 my ($self) = @_; 1823 my ($self) = @_;
… …
1680 1828
1681 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1682 1830
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1832
1685 glEnable GL_BLEND; 1833 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834
1686 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1836 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1837 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1838}
1696 1839
1697############################################################################# 1840#############################################################################
1698 1841
1699package CFClient::UI::Image; 1842package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 1885 glTranslate 0, -$self->{w}, 0;
1743 1886
1744 ($w, $h) = ($h, $w); 1887 ($w, $h) = ($h, $w);
1745 } 1888 }
1746 1889
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 1890 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1891 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 1892
1752 $tex->draw_quad (0, 0, $w, $h); 1893 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 1894
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 1895 glDisable GL_TEXTURE_2D;
1756} 1896}
1757 1897
1758############################################################################# 1898#############################################################################
1759 1899
… …
1948 qw(s1_slider.png s1_slider_bg.png); 2088 qw(s1_slider.png s1_slider_bg.png);
1949 2089
1950sub new { 2090sub new {
1951 my $class = shift; 2091 my $class = shift;
1952 2092
1953 # range [value, low, high, page] 2093 # range [value, low, high, page, unit]
1954 2094
1955 # TODO: 0-width page 2095 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2096 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2097 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2098 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2099 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2100 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5],
1961 range => [0, 0, 100, 10], 2103 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2104 req_w => $::WIDTH / 80,
1963 req_h => 20, 2105 req_h => $::WIDTH / 80,
1964 vertical => 0, 2106 vertical => 0,
1965 can_hover => 1, 2107 can_hover => 1,
1966 inner_pad => 5, 2108 inner_pad => 0.02,
1967 @_ 2109 @_
1968 ); 2110 );
1969 2111
2112 $self->set_value ($self->{range}[0]);
2113 $self->update;
2114
1970 $self 2115 $self
2116}
2117
2118sub set_range {
2119 my ($self, $range) = @_;
2120
2121 $self->{range} = $range;
2122
2123 $self->update;
2124}
2125
2126sub set_value {
2127 my ($self, $value) = @_;
2128
2129 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2130
2131 $hi = $lo + 1 if $hi <= $lo;
2132
2133 $page = $hi - $lo if $page > $hi - $lo;
2134
2135 $value = $lo if $value < $lo;
2136 $value = $hi - $page if $value > $hi - $page;
2137
2138 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2139 if $unit;
2140
2141 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2142
2143 if ($value != $old_value) {
2144 $self->_emit (changed => $value);
2145 $self->update;
2146 }
1971} 2147}
1972 2148
1973sub size_request { 2149sub size_request {
1974 my ($self) = @_; 2150 my ($self) = @_;
1975 2151
… …
1981 2157
1982sub button_down { 2158sub button_down {
1983 my ($self, $ev, $x, $y) = @_; 2159 my ($self, $ev, $x, $y) = @_;
1984 2160
1985 $self->SUPER::button_down ($ev, $x, $y); 2161 $self->SUPER::button_down ($ev, $x, $y);
2162
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164
1986 $self->mouse_motion ($ev, $x, $y); 2165 $self->mouse_motion ($ev, $x, $y);
1987} 2166}
1988 2167
1989sub mouse_motion { 2168sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2169 my ($self, $ev, $x, $y) = @_;
1991 2170
1992 if ($GRAB == $self) { 2171 if ($GRAB == $self) {
2172 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2173
2174 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177
2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2179 }
2180}
2181
2182sub update {
2183 my ($self) = @_;
2184
2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2186 $self->set_value ($self->{range}[0]);
2187
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2188 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100;
1994 2190
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2191 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2192
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2193 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2194 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2195
2000 $x -= $inner_pad_px; # substract the padding 2196 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2197 $value = $value * $self->{scale} + $self->{offset};
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2198
2006 $self->emit (changed => $x); 2199 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2200 $self->{knob_w} = $knob_w;
2008 } 2201 });
2009}
2010 2202
2011# the inner_* stuff is for generating a padding for the slider handle, 2203 $self->SUPER::update;
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017} 2204}
2018 2205
2019sub _draw { 2206sub _draw {
2020 my ($self) = @_; 2207 my ($self) = @_;
2021 2208
2022 $self->SUPER::_draw (); 2209 $self->SUPER::_draw ();
2023 2210
2024 my ($w, $h) = @$self{qw(w h)}; 2211 glScale $self->{w}, $self->{h};
2025 2212
2026 if ($self->{vertical}) { 2213 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2214 # draw a vertical slider like a rotated horizontal slider
2028 2215
2216 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2217 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2218 }
2034 2219
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2220 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2221 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2222
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2223 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2225
2061 # draw background 2226 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2227 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2228
2064 # draw handle 2229 # draw handle
2065 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2230 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2066 2231
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2232 glDisable GL_TEXTURE_2D;
2069} 2233}
2234
2235#############################################################################
2236
2237package CFClient::UI::ValSlider;
2238
2239our @ISA = CFClient::UI::HBox::;
2240
2241sub new {
2242 my ($class, %arg) = @_;
2243
2244 my $range = delete $arg{range};
2245
2246 my $self = $class->SUPER::new (
2247 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2248 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2249 to_value => sub { shift },
2250 from_value => sub { shift },
2251 %arg,
2252 );
2253
2254 $self->{slider}->connect (changed => sub {
2255 my ($self, $value) = @_;
2256 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2257 $self->{parent}->emit (changed => $value);
2258 });
2259
2260# $self->{entry}->connect (changed => sub {
2261# my ($self, $value) = @_;
2262# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2263# $self->{parent}->emit (changed => $value);
2264# });
2265
2266 $self->add ($self->{slider}, $self->{entry});
2267
2268 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2269
2270 $self
2271}
2272
2273sub set_range { shift->{slider}->set_range (@_) }
2274sub set_value { shift->{slider}->set_value (@_) }
2070 2275
2071############################################################################# 2276#############################################################################
2072 2277
2073package CFClient::UI::TextView; 2278package CFClient::UI::TextView;
2074 2279
… …
2083 fontsize => 1, 2288 fontsize => 1,
2084 can_events => 0, 2289 can_events => 0,
2085 #font => default_font 2290 #font => default_font
2086 @_, 2291 @_,
2087 2292
2088 layout => (new CFClient::Layout), 2293 layout => (new CFClient::Layout 1),
2089 par => [], 2294 par => [],
2090 height => 0, 2295 height => 0,
2091 children => [ 2296 children => [
2092 (new CFClient::UI::Empty expand => 1), 2297 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2298 (new CFClient::UI::Slider vertical => 1),
… …
2104 2309
2105 $self->{fontsize} = $fontsize; 2310 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2311 $self->reflow;
2107} 2312}
2108 2313
2109sub text_height {
2110 my ($self, $text) = @_;
2111
2112 my $layout = $self->{layout};
2113
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text);
2117
2118 ($layout->size)[1]
2119}
2120
2121sub reflow {
2122 my ($self) = @_;
2123
2124 $self->{need_reflow}++;
2125 $self->update;
2126}
2127
2128sub size_allocate { 2314sub size_allocate {
2129 my ($self, $w, $h) = @_; 2315 my ($self, $w, $h) = @_;
2130 2316
2131 $self->SUPER::size_allocate ($w, $h); 2317 $self->SUPER::size_allocate ($w, $h);
2132 2318
… …
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 2321 $self->{layout}->set_width ($self->{children}[0]{w});
2136 2322
2137 $self->reflow; 2323 $self->reflow;
2138} 2324}
2139 2325
2326sub text_size {
2327 my ($self, $text, $indent) = @_;
2328
2329 my $layout = $self->{layout};
2330
2331 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2332 $layout->set_width ($self->{children}[0]{w} - $indent);
2333 $layout->set_markup ($text);
2334
2335 $layout->size
2336}
2337
2338sub reflow {
2339 my ($self) = @_;
2340
2341 $self->{need_reflow}++;
2342 $self->update;
2343}
2344
2345sub set_offset {
2346 my ($self, $offset) = @_;
2347
2348 # todo: base offset on lines or so, not on pixels
2349 $self->{children}[1]->set_value ($offset);
2350}
2351
2352sub clear {
2353 my ($self) = @_;
2354
2355 $self->{par} = [];
2356 $self->{height} = 0;
2357 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2358}
2359
2140sub add_paragraph { 2360sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2361 my ($self, $color, $text, $indent) = @_;
2142 2362
2143 #TODO: intelligently "reformat" paragraph 2363 for my $line (split /\n/, $text) {
2144 2364 my ($w, $h) = $self->text_size ($line);
2145 my $height = $self->text_height ($text);
2146
2147 $self->{height} += $height; 2365 $self->{height} += $h;
2366 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2367 }
2148 2368
2149 push @{$self->{par}}, [$height, $color, $text];
2150
2151 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2369 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2152 $self->{children}[1]->update;
2153} 2370}
2154 2371
2155sub update { 2372sub update {
2156 my ($self) = @_; 2373 my ($self) = @_;
2157 2374
… …
2159 2376
2160 return unless $self->{h} > 0; 2377 return unless $self->{h} > 0;
2161 2378
2162 delete $self->{texture}; 2379 delete $self->{texture};
2163 2380
2164 $ROOT->on_refresh ($self, sub { 2381 $ROOT->on_post_alloc ($self, sub {
2382 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2383
2165 if (delete $self->{need_reflow}) { 2384 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2385 my $height = 0;
2167 2386
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390
2169 for @{$self->{par}}; 2391 for (@{$self->{par}}) {
2392 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2393 $layout->set_width ($W - $_->[3]);
2394 $layout->set_markup ($_->[4]);
2395 my ($w, $h) = $layout->size;
2396 $_->[0] = $w + $_->[3];
2397 $_->[1] = $h;
2398 }
2399
2400 $height += $_->[1];
2401 }
2170 2402
2171 $self->{height} = $height; 2403 $self->{height} = $height;
2172 2404
2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2405 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174 2406
2175 delete $self->{texture}; 2407 delete $self->{texture};
2176 } 2408 }
2177 2409
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2410 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2179 glClearColor 0, 0, 0, 0; 2411 glClearColor 0.5, 0.5, 0.5, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2412 glClear GL_COLOR_BUFFER_BIT;
2181 2413
2414 my $top = int $self->{children}[1]{range}[0];
2415
2416 my $y0 = $top;
2417 my $y1 = $top + $H;
2418
2419 my $y = 0;
2420
2421 my $layout = $self->{layout};
2422
2423 $layout->set_font ($self->{font}) if $self->{font};
2424
2182 glEnable GL_BLEND; 2425 glEnable GL_BLEND;
2426 #TODO# not correct in windows where rgba is forced off
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2427 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187 my $top = int $self->{children}[1]{range}[0];
2188
2189 my $y0 = $top;
2190 my $y1 = $top + $self->{h};
2191
2192 my $y = 0;
2193
2194 my $layout = $self->{layout};
2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197 2428
2198 for my $par (@{$self->{par}}) { 2429 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2430 my $h = $par->[1];
2200 2431
2201 if ($y0 < $y + $h && $y < $y1) { 2432 if ($y0 < $y + $h && $y < $y1) {
2433 $layout->set_foreground (@{ $par->[2] });
2434 $layout->set_width ($W - $par->[3]);
2202 $layout->set_text ($par->[2]); 2435 $layout->set_markup ($par->[4]);
2203 2436
2204 glColor @{ $par->[1] }; 2437 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205 my ($W, $H) = $layout->size; 2438
2206 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2439 glRasterPos $par->[3], $y - $y0;
2440 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2207 } 2441 }
2208 2442
2209 $y += $h; 2443 $y += $h;
2210 } 2444 }
2211 2445
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND; 2446 glDisable GL_BLEND;
2214 }; 2447 };
2215 }); 2448 });
2216} 2449}
2217 2450
2218sub _draw { 2451sub _draw {
2219 my ($self) = @_; 2452 my ($self) = @_;
2220 2453
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2454 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2456 glColor 1, 1, 1, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2457 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2458 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2459
2230 $self->{children}[1]->draw; 2460 $self->{children}[1]->draw;
2231 2461
2232} 2462}
2233 2463
… …
2301 2531
2302 # TODO: use animation 2532 # TODO: use animation
2303 if ($self->{state} = !$self->{state}) { 2533 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other}); 2534 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h})); 2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open"); 2536 $self->_emit ("open");
2307 } else { 2537 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other}); 2538 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close"); 2539 $self->_emit ("close");
2310 } 2540 }
2311 2541
2312 $self->emit (changed => $self->{state}); 2542 $self->_emit (changed => $self->{state});
2313} 2543}
2314 2544
2315############################################################################# 2545#############################################################################
2316 2546
2317package CFClient::UI::Tooltip; 2547package CFClient::UI::Tooltip;
… …
2327 @_, 2557 @_,
2328 can_events => 0, 2558 can_events => 0,
2329 ) 2559 )
2330} 2560}
2331 2561
2332sub set_markup { 2562sub set_tooltip_from {
2333 my ($self, $text) = @_; 2563 my ($self, $widget) = @_;
2334 2564
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2565 $self->add (new CFClient::UI::Label
2336 $self->{label}->set_markup ($text); 2566 markup => $widget->{tooltip},
2337 $self->add ($self->{label}); 2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568 fontsize => 0.8,
2569 fg => [0, 0, 0, 1],
2570 ellipsise => 0,
2571 font => ($widget->{tooltip_font} || $::FONT_PROP),
2572 );
2338} 2573}
2339 2574
2340sub size_request { 2575sub size_request {
2341 my ($self) = @_; 2576 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2577
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2578 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2579
2347 ($w + 4, $h + 4) 2580 ($w + 4, $h + 4)
2348} 2581}
… …
2354} 2587}
2355 2588
2356sub _draw { 2589sub _draw {
2357 my ($self) = @_; 2590 my ($self) = @_;
2358 2591
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2592 glTranslate 0.375, 0.375;
2361 2593
2362 my ($w, $h) = @$self{qw(w h)}; 2594 my ($w, $h) = @$self{qw(w h)};
2363 2595
2364 glColor 1, 0.8, 0.4; 2596 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2607 glVertex 0 , $h;
2376 glVertex $w, $h; 2608 glVertex $w, $h;
2377 glVertex $w, 0; 2609 glVertex $w, 0;
2378 glEnd; 2610 glEnd;
2379 2611
2380 glPopMatrix; 2612 glTranslate 2 - 0.375, 2 - 0.375;
2381
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2613 $self->SUPER::_draw;
2384} 2614}
2385 2615
2386############################################################################# 2616#############################################################################
2387 2617
… …
2392use CFClient::OpenGL; 2622use CFClient::OpenGL;
2393 2623
2394sub new { 2624sub new {
2395 my $class = shift; 2625 my $class = shift;
2396 2626
2397 $class->SUPER::new ( 2627 my $self = $class->SUPER::new (
2398 aspect => 1, 2628 aspect => 1,
2399 @_, 2629 @_,
2400 ) 2630 );
2631
2632 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self);
2634
2635 $self->{timer} = Event->timer (
2636 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2637 hard => 1,
2638 interval => $self->{animspeed},
2639 cb => sub {
2640 ++$widget->{frame};
2641 $widget->update;
2642 },
2643 );
2644 }
2645
2646 $self
2401} 2647}
2402 2648
2403sub size_request { 2649sub size_request {
2404 (32, 8) 2650 (32, 8)
2405} 2651}
2406 2652
2653sub update {
2654 my ($self) = @_;
2655
2656 return unless $self->{visible};
2657
2658 $self->SUPER::update;
2659}
2660
2407sub draw { 2661sub _draw {
2408 my ($self) = @_; 2662 my ($self) = @_;
2409 2663
2664 return unless $::CONN;
2665
2666 my $face;
2667
2668 if ($self->{frame}) {
2669 my $anim = $::CONN->{anim}[$self->{anim}];
2670
2671 $face = $anim->[ $self->{frame} % @$anim ]
2672 if $anim && @$anim;
2673 }
2674
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2675 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2676
2412 if ($tex) { 2677 if ($tex) {
2413 glEnable GL_BLEND;
2414 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2415 glEnable GL_TEXTURE_2D; 2678 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1; 2680 glColor 1, 1, 1, 1;
2418 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2681 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D; 2682 glDisable GL_TEXTURE_2D;
2420 glDisable GL_BLEND;
2421 } 2683 }
2684}
2685
2686sub DESTROY {
2687 my ($self) = @_;
2688
2689 $self->{timer}->cancel
2690 if $self->{timer};
2691
2692 $self->SUPER::DESTROY;
2422} 2693}
2423 2694
2424############################################################################# 2695#############################################################################
2425 2696
2697package CFClient::UI::InventoryItem;
2698
2699our @ISA = CFClient::UI::HBox::;
2700
2701sub _item_to_desc {
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726
2727sub new {
2728 my $class = shift;
2729
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table),
2818 @_,
2819 );
2820
2821 $self
2822}
2823
2824sub set_items {
2825 my ($self, $items) = @_;
2826
2827 $self->{scrolled}->clear;
2828 return unless $items;
2829
2830 my @items = sort {
2831 ($a->{type} <=> $b->{type})
2832 or ($a->{name} cmp $b->{name})
2833 } @$items;
2834
2835 $self->{real_items} = \@items;
2836
2837 for my $item (@items) {
2838 $item->{item} = $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842
2843 my $i = 0;
2844 for (@items) {
2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2851}
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2856}
2857
2858#############################################################################
2859
2860package CFClient::UI::Menu;
2861
2862our @ISA = CFClient::UI::FancyFrame::;
2863
2864use CFClient::OpenGL;
2865
2866sub new {
2867 my $class = shift;
2868
2869 my $self = $class->SUPER::new (
2870 items => [],
2871 z => 100,
2872 @_,
2873 );
2874
2875 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2876
2877 for my $item (@{ $self->{items} }) {
2878 my ($widget, $cb) = @$item;
2879
2880 # handle various types of items, only text for now
2881 if (!ref $widget) {
2882 $widget = new CFClient::UI::Label
2883 can_hover => 1,
2884 can_events => 1,
2885 text => $widget;
2886 }
2887
2888 $self->{item}{$widget} = $item;
2889
2890 $self->{vbox}->add ($widget);
2891 }
2892
2893 $self
2894}
2895
2896# popup given the event (must be a mouse button down event currently)
2897sub popup {
2898 my ($self, $ev) = @_;
2899
2900 $self->_emit ("popdown");
2901
2902 # maybe save $GRAB? must be careful about events...
2903 $GRAB = $self;
2904 $self->{button} = $ev->{button};
2905
2906 $self->show;
2907 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2908}
2909
2910sub mouse_motion {
2911 my ($self, $ev, $x, $y) = @_;
2912
2913 # TODO: should use vbox->find_widget or so
2914 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2915 $self->{hover} = $self->{item}{$HOVER};
2916}
2917
2918sub button_up {
2919 my ($self, $ev, $x, $y) = @_;
2920
2921 if ($ev->{button} == $self->{button}) {
2922 undef $GRAB;
2923 $self->hide;
2924
2925 $self->_emit ("popdown");
2926 $self->{hover}[1]->() if $self->{hover};
2927 }
2928}
2929
2930#############################################################################
2931
2932package CFClient::UI::Statusbox;
2933
2934our @ISA = CFClient::UI::VBox::;
2935
2936sub new {
2937 my $class = shift;
2938
2939 $class->SUPER::new (
2940 fontsize => 0.8,
2941 @_,
2942 )
2943}
2944
2945sub reorder {
2946 my ($self) = @_;
2947 my $NOW = time;
2948
2949 while (my ($k, $v) = each %{ $self->{item} }) {
2950 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2951 }
2952
2953 my @widgets;
2954
2955 my @items = sort {
2956 $a->{pri} <=> $b->{pri}
2957 or $b->{id} <=> $a->{id}
2958 } values %{ $self->{item} };
2959
2960 my $count = 10 + 1;
2961 for my $item (@items) {
2962 last unless --$count;
2963
2964 push @widgets, $item->{label} ||= do {
2965 # TODO: doesn't handle markup well (read as: at all)
2966 my $short = $item->{count} > 1
2967 ? "<b>$item->{count} ×</b> $item->{text}"
2968 : $item->{text};
2969
2970 for ($short) {
2971 s/^\s+//;
2972 s/\s+/ /g;
2973 }
2974
2975 new CFClient::UI::Label
2976 markup => $short,
2977 tooltip => $item->{tooltip},
2978 tooltip_font => $::FONT_PROP,
2979 tooltip_width => 0.67,
2980 fontsize => $item->{fontsize} || $self->{fontsize},
2981 max_w => $::WIDTH * 0.44,
2982 fg => $item->{fg},
2983 can_events => 1,
2984 can_hover => 1
2985 };
2986 }
2987
2988 $self->clear;
2989 $self->SUPER::add (reverse @widgets);
2990}
2991
2992sub add {
2993 my ($self, $text, %arg) = @_;
2994
2995 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//;
2997
2998 my $timeout = time + ((delete $arg{timeout}) || 60);
2999
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001
3002 if (my $item = $self->{item}{$group}) {
3003 if ($item->{text} eq $text) {
3004 $item->{count}++;
3005 } else {
3006 $item->{count} = 1;
3007 $item->{text} = $item->{tooltip} = $text;
3008 }
3009 $item->{id} = ++$self->{id};
3010 $item->{timeout} = $timeout;
3011 delete $item->{label};
3012 } else {
3013 $self->{item}{$group} = {
3014 id => ++$self->{id},
3015 text => $text,
3016 timeout => $timeout,
3017 tooltip => $text,
3018 fg => [0.8, 0.8, 0.8, 0.8],
3019 pri => 0,
3020 count => 1,
3021 %arg,
3022 };
3023 }
3024
3025 $self->reorder;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 delete $_->{label}
3032 for values %{ $self->{item} || {} };
3033
3034 $self->reorder;
3035 $self->SUPER::reconfigure;
3036}
3037
3038#############################################################################
3039
2426package CFClient::UI::Root; 3040package CFClient::UI::Root;
2427 3041
2428our @ISA = CFClient::UI::Container::; 3042our @ISA = CFClient::UI::Container::;
2429 3043
2430use CFClient::OpenGL; 3044use CFClient::OpenGL;
2431 3045
2432sub check_size { 3046sub new {
2433 my ($self) = @_; 3047 my $class = shift;
2434 3048
2435 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3049 $class->SUPER::new (
2436} 3050 @_,
2437 3051 )
2438sub size_request {
2439 ($::WIDTH, $::HEIGHT)
2440} 3052}
2441 3053
2442sub configure { 3054sub configure {
2443 my ($self, $x, $y, $w, $h) = @_; 3055 my ($self, $x, $y, $w, $h) = @_;
2444 3056
2445 $self->SUPER::configure ($x, $y, $w, $h); 3057 $self->{w} = $w;
3058 $self->{h} = $h;
3059}
2446 3060
3061sub check_size {
3062 my ($self) = @_;
3063
3064 $self->size_allocate ($self->{w}, $self->{h})
3065 if $self->{w};
3066}
3067
3068sub size_request {
3069 my ($self) = @_;
3070
3071 ($self->{w}, $self->{h})
3072}
3073
3074sub size_allocate {
3075 my ($self, $w, $h) = @_;
3076
2447 for my $child (@{$self->{children}}) { 3077 for my $child ($self->children) {
2448 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2449 3079
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3081 if exists $child->{req_x};
3082
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3084 if exists $child->{req_y};
3085
2450 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3086 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2451 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3087 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088
2452 $child->configure ($X, $Y, $W,$H); 3089 $child->configure ($X, $Y, $W, $H);
2453 } 3090 }
2454} 3091}
2455 3092
2456sub _topleft { 3093sub coord2local {
2457 my ($self, $x, $y) = @_; 3094 my ($self, $x, $y) = @_;
2458 3095
2459 ($x, $y) 3096 ($x, $y)
2460} 3097}
2461 3098
3099sub coord2global {
3100 my ($self, $x, $y) = @_;
3101
3102 ($x, $y)
3103}
3104
2462sub update { 3105sub update {
2463 my ($self) = @_; 3106 my ($self) = @_;
2464 3107
2465 $self->check_size; 3108 $self->check_size;
2466 ::refresh (); 3109 $::WANT_REFRESH++;
2467} 3110}
2468 3111
2469sub add { 3112sub add {
2470 my ($self, $child) = @_; 3113 my ($self, @children) = @_;
2471 3114
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120
3121 for my $child (@children) {
3122 $child->{is_toplevel} = 1;
3123
2472 # integerize window positions 3124 # integerise window positions
2473 $child->{x} = int $child->{x}; 3125 $child->{x} = int $child->{x};
2474 $child->{y} = int $child->{y}; 3126 $child->{y} = int $child->{y};
3127 }
2475 3128
2476 $self->SUPER::add ($child); 3129 $self->SUPER::add (@children);
3130}
3131
3132sub remove {
3133 my ($self, @children) = @_;
3134
3135 $self->SUPER::remove (@children);
3136
3137 while (@children) {
3138 my $w = pop @children;
3139 push @children, $w->children;
3140 $w->set_invisible;
3141 }
2477} 3142}
2478 3143
2479sub on_refresh { 3144sub on_refresh {
2480 my ($self, $id, $cb) = @_; 3145 my ($self, $id, $cb) = @_;
2481 3146
2482 $self->{refresh_hook}{$id} = $cb; 3147 $self->{refresh_hook}{$id} = $cb;
2483} 3148}
2484 3149
3150sub on_post_alloc {
3151 my ($self, $id, $cb) = @_;
3152
3153 $self->{post_alloc_hook}{$id} = $cb;
3154}
3155
2485sub draw { 3156sub draw {
2486 my ($self) = @_; 3157 my ($self) = @_;
2487 3158
2488 while (my $rcb = delete $self->{refresh_hook}) { 3159 while ($self->{refresh_hook}) {
2489 $_->() for values %$rcb; 3160 $_->()
3161 for values %{delete $self->{refresh_hook}};
3162 }
3163
3164 if ($self->{check_size}) {
3165 my @queue = ([], []);
3166
3167 for (;;) {
3168 if ($self->{check_size}) {
3169 # heuristic: check containers last
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3171 for values %{delete $self->{check_size}}
3172 }
3173
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3175
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3177 ? @$widget{qw(user_w user_h)}
3178 : $widget->size_request;
3179
3180 if (delete $widget->{force_alloc}
3181 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3183
3184 $widget->{req_w} = $w;
3185 $widget->{req_h} = $h;
3186
3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3188
3189 $widget->{parent}->check_size
3190 if $widget->{parent};
3191 }
3192 }
3193 }
3194
3195 while ($self->{size_alloc}) {
3196 for (values %{delete $self->{size_alloc}}) {
3197 my ($widget, $w, $h) = @$_;
3198
3199 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0;
3201
3202 $widget->{w} = $w;
3203 $widget->{h} = $h;
3204 $widget->emit (size_allocate => $w, $h);
3205 }
3206 }
3207
3208 while ($self->{post_alloc_hook}) {
3209 $_->()
3210 for values %{delete $self->{post_alloc_hook}};
2490 } 3211 }
2491 3212
2492 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3213 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2493 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2494 glClear GL_COLOR_BUFFER_BIT; 3215 glClear GL_COLOR_BUFFER_BIT;
2495 3216
2496 glMatrixMode GL_PROJECTION; 3217 glMatrixMode GL_PROJECTION;
2497 glLoadIdentity; 3218 glLoadIdentity;
2498 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2499 glMatrixMode GL_MODELVIEW; 3220 glMatrixMode GL_MODELVIEW;
2500 glLoadIdentity; 3221 glLoadIdentity;
2501 3222
2502 $self->_draw; 3223 $self->_draw;
2503} 3224}
… …
2505############################################################################# 3226#############################################################################
2506 3227
2507package CFClient::UI; 3228package CFClient::UI;
2508 3229
2509$ROOT = new CFClient::UI::Root; 3230$ROOT = new CFClient::UI::Root;
2510$TOOLTIP = new CFClient::UI::Tooltip; 3231$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2511 3232
25121 32331
2513 3234

Diff Legend

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