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.189 by root, Mon May 8 22:17:24 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->_check_size; 477 $self->{force_alloc} = 1 if $forced;
409 return;
410 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
411
412 $check_size->{$self} = $self;
413
414 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
415 while (%$check_size) {
416 my @widgets = values %$check_size;
417 $_->_check_size
418 for @widgets;
419 }
420 });
421}
422
423sub _check_size {
424 my ($self) = @_;
425
426 delete $CFClient::UI::ROOT->{_check_size}{$self}; 478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
427
428 $self->{parent}
429 or return 1;
430
431 my ($w, $h) = $self->{user_w} && $self->{user_h}
432 ? @$self{qw(user_w user_h)}
433 : $self->size_request;
434
435 if ($w != $self->{req_w} || $h != $self->{req_h}) {
436 $self->{req_w} = $w;
437 $self->{req_h} = $h;
438
439 $self->{parent}->_check_size
440 or $self->size_allocate (
441 (List::Util::max $self->{w}, $w),
442 (List::Util::max $self->{h}, $h),
443 );
444
445 1
446 } else {
447 0
448 }
449} 479}
450 480
451sub update { 481sub update {
452 my ($self) = @_; 482 my ($self) = @_;
453 483
454 my $update = $CFClient::UI::ROOT->{_update} ||= {}; 484 $self->{parent}->update
455 485 if $self->{parent};
456 $update->{$self} = $self;
457
458 $CFClient::UI::ROOT->on_refresh (_update => sub {
459 while (%$update) {
460 my @widgets = values %$update;
461 %$update = ();
462
463 $_->{parent} && $_->{parent}->update
464 for @widgets;
465 }
466 });
467} 486}
468 487
469sub connect { 488sub connect {
470 my ($self, $signal, $cb) = @_; 489 my ($self, $signal, $cb) = @_;
471 490
472 push @{ $self->{signal_cb}{$signal} }, $cb; 491 push @{ $self->{signal_cb}{$signal} }, $cb;
473} 492}
474 493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
475sub emit { 500sub emit {
476 my ($self, $signal, @args) = @_; 501 my ($self, $signal, @args) = @_;
477 502
478 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
479} 505}
480 506
481sub DESTROY { 507sub DESTROY {
482 my ($self) = @_; 508 my ($self) = @_;
483 509
510 delete $WIDGET{$self+0};
484 #$self->deactivate; 511 #$self->deactivate;
485} 512}
486 513
487############################################################################# 514#############################################################################
488 515
… …
497 my $class = shift; 524 my $class = shift;
498 525
499 # range [value, low, high, page] 526 # range [value, low, high, page]
500 527
501 $class->SUPER::new ( 528 $class->SUPER::new (
502 bg => [0, 0, 0, 0.2], 529 #bg => [0, 0, 0, 0.2],
503 active_bg => [1, 1, 1, 0.5], 530 #active_bg => [1, 1, 1, 0.5],
504 @_ 531 @_
505 ) 532 )
506} 533}
507 534
508sub _draw { 535sub _draw {
509 my ($self) = @_; 536 my ($self) = @_;
510 537
538 my $color = $FOCUS == $self && $self->{active_bg}
539 ? $self->{active_bg}
540 : $self->{bg};
541
542 if ($color && (@$color < 4 || $color->[3])) {
511 my ($w, $h) = @$self{qw(w h)}; 543 my ($w, $h) = @$self{qw(w h)};
512 544
513 glEnable GL_BLEND; 545 glEnable GL_BLEND;
514 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
515 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 547 glColor @$color;
516 548
517 glBegin GL_QUADS; 549 glBegin GL_QUADS;
518 glVertex 0 , 0; 550 glVertex 0 , 0;
519 glVertex 0 , $h; 551 glVertex 0 , $h;
520 glVertex $w, $h; 552 glVertex $w, $h;
521 glVertex $w, 0; 553 glVertex $w, 0;
522 glEnd; 554 glEnd;
523 555
524 glDisable GL_BLEND; 556 glDisable GL_BLEND;
557 }
525} 558}
526 559
527############################################################################# 560#############################################################################
528 561
529package CFClient::UI::Empty; 562package CFClient::UI::Empty;
… …
573 $self->{children} = [ 606 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 607 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 608 @{$self->{children}}, @widgets
576 ]; 609 ];
577 610
578 $_->check_size 611 $self->check_size (1);
579 for @widgets;
580
581 $self->update; 612 $self->update;
582} 613}
583 614
584sub children { 615sub children {
585 @{ $_[0]{children} } 616 @{ $_[0]{children} }
… …
591 delete $child->{parent}; 622 delete $child->{parent};
592 $child->hide; 623 $child->hide;
593 624
594 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
595 626
596 $self->check_size; 627 $self->check_size (1);
597 $self->update; 628 $self->update;
598} 629}
599 630
600sub clear { 631sub clear {
601 my ($self) = @_; 632 my ($self) = @_;
… …
692} 723}
693 724
694sub update { 725sub update {
695 my ($self) = @_; 726 my ($self) = @_;
696 727
697 $ROOT->on_refresh ($self => sub { $self->render_child }); 728 $ROOT->on_post_alloc ($self => sub { $self->render_child });
698 $self->SUPER::update; 729 $self->SUPER::update;
699} 730}
700 731
701sub size_allocate { 732sub size_allocate {
702 my ($self, $w, $h) = @_; 733 my ($self, $w, $h) = @_;
… …
715 $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 {
716 glClearColor 0, 0, 0, 0; 747 glClearColor 0, 0, 0, 0;
717 glClear GL_COLOR_BUFFER_BIT; 748 glClear GL_COLOR_BUFFER_BIT;
718 749
719 $self->_render; 750 $self->_render;
720# glColorMask 1, 1, 1, 0;
721# glEnable GL_BLEND;
722# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
723# glRasterPos 0, 0;
724# glCopyPixels 0, 0, $self->{w}, $self->{h};
725# glDisable GL_BLEND;
726# glColorMask 1, 1, 1, 1;
727 }; 751 };
728} 752}
729 753
730sub _draw { 754sub _draw {
731 my ($self) = @_; 755 my ($self) = @_;
… …
733 my ($w, $h) = ($self->w, $self->h); 757 my ($w, $h) = ($self->w, $self->h);
734 758
735 my $tex = $self->{texture} 759 my $tex = $self->{texture}
736 or return; 760 or return;
737 761
738 glEnable GL_BLEND;
739 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
740 glEnable GL_TEXTURE_2D; 762 glEnable GL_TEXTURE_2D;
741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
742 glColor 0, 0, 0, 1; 764 glColor 1, 1, 1, 1;
743 765
744 $tex->draw_quad (0, 0, $w, $h); 766 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
745 767
746 glDisable GL_BLEND;
747 glDisable GL_TEXTURE_2D; 768 glDisable GL_TEXTURE_2D;
748} 769}
749 770
750############################################################################# 771#############################################################################
751 772
752package CFClient::UI::ViewPort; 773package CFClient::UI::ViewPort;
753 774
754our @ISA = CFClient::UI::Window::; 775our @ISA = CFClient::UI::Window::;
755 776
777sub new {
778 my $class = shift;
779
780 $class->SUPER::new (
781 scroll_x => 0,
782 scroll_y => 1,
783 @_,
784 )
785}
786
756sub size_request { 787sub size_request {
757 my ($self) = @_; 788 my ($self) = @_;
758 789
759 @$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)};
760 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
761 791
762 @$self{qw(child_w child_h)} 792 @$self{qw(child_w child_h)}
763} 793}
764 794
765sub size_allocate { 795sub size_allocate {
766 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
767 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);
768 $self->update; 802 $self->update;
769} 803}
770 804
771sub set_offset { 805sub set_offset {
772 my ($self, $x, $y) = @_; 806 my ($self, $x, $y) = @_;
… …
775 $self->{view_y} = int $y; 809 $self->{view_y} = int $y;
776 810
777 $self->update; 811 $self->update;
778} 812}
779 813
780# 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
781sub _topleft { 815sub coord2local {
782 my ($self, $x, $y) = @_; 816 my ($self, $x, $y) = @_;
783 817
784 $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)
785} 828}
786 829
787sub find_widget { 830sub find_widget {
788 my ($self, $x, $y) = @_; 831 my ($self, $x, $y) = @_;
789 832
… …
817 860
818 my $slider = new CFClient::UI::Slider 861 my $slider = new CFClient::UI::Slider
819 vertical => 1, 862 vertical => 1,
820 range => [0, 0, 1, 0.01], # HACK fix 863 range => [0, 0, 1, 0.01], # HACK fix
821 connect_changed => sub { 864 connect_changed => sub {
822 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 865 $self->{vp}->set_offset (0, $_[1]);
823 }, 866 },
824 ; 867 ;
825 868
826 $self = $class->SUPER::new ( 869 $self = $class->SUPER::new (
827 vp => (new CFClient::UI::ViewPort), 870 vp => (new CFClient::UI::ViewPort expand => 1),
828 slider => $slider, 871 slider => $slider,
829 @_, 872 @_,
830 ); 873 );
831 874
832 $self->{vp}->add ($self->{scrolled}); 875 $self->{vp}->add ($self->{scrolled});
… …
834 $self->add ($self->{slider}); 877 $self->add ($self->{slider});
835 878
836 $self 879 $self
837} 880}
838 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
839#TODO# update range on size_allocate depeneing on child 901#TODO# update range on size_allocate depending on child
840# update viewport offset on scroll 902# update viewport offset on scroll
841 903
842############################################################################# 904#############################################################################
843 905
844package CFClient::UI::Frame; 906package CFClient::UI::Frame;
… …
848use CFClient::OpenGL; 910use CFClient::OpenGL;
849 911
850sub new { 912sub new {
851 my $class = shift; 913 my $class = shift;
852 914
853 my $self = $class->SUPER::new ( 915 $class->SUPER::new (
854 bg => [1, 1, 1, 1], 916 bg => undef,
855 border_bg => [1, 1, 1, 1],
856 border => 0.8,
857 @_ 917 @_,
858 ); 918 )
859
860 $self
861} 919}
862 920
863sub _draw { 921sub _draw {
864 my ($self) = @_; 922 my ($self) = @_;
865 923
866 my ($w, $h) = ($self->{w}, $self->{h}); 924 if ($self->{bg}) {
925 my ($w, $h) = @$self{qw(w h)};
867 926
868 glEnable GL_BLEND; 927 glEnable GL_BLEND;
869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 928 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870 glEnable GL_TEXTURE_2D; 929 glColor @{ $self->{bg} };
871 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
872 930
873# glBegin GL_QUADS; 931 glBegin GL_QUADS;
874# glColor 0, 0, 0, 0;
875# glVertex 0 , 0; 932 glVertex 0 , 0;
876# glVertex 0 , $h; 933 glVertex 0 , $h;
877# glVertex $w, $h; 934 glVertex $w, $h;
878# glVertex $w, 0; 935 glVertex $w, 0;
879# glEnd; 936 glEnd;
880 937
881
882 $self->child->draw;
883 glDisable GL_BLEND; 938 glDisable GL_BLEND;
884 glDisable GL_TEXTURE_2D; 939 }
940
941 $self->SUPER::_draw;
885} 942}
886 943
887############################################################################# 944#############################################################################
888 945
889package CFClient::UI::FancyFrame; 946package CFClient::UI::FancyFrame;
… …
900 my $class = shift; 957 my $class = shift;
901 958
902 # TODO: user_x, user_y, overwrite moveto? 959 # TODO: user_x, user_y, overwrite moveto?
903 960
904 my $self = $class->SUPER::new ( 961 my $self = $class->SUPER::new (
905 bg => [1, 1, 1, 1], 962 bg => [1, 1, 1, 1],
906 border_bg => [1, 1, 1, 1], 963 border_bg => [1, 1, 1, 1],
907 border => 0.6, 964 border => 0.6,
965 is_toplevel => 1,
908 can_events => 1, 966 can_events => 1,
909 @_ 967 @_
910 ); 968 );
911 969
912 $self->{title} &&= new CFClient::UI::Label 970 $self->{title} &&= new CFClient::UI::Label
913 align => 0, 971 align => 0,
… …
937 my ($self, $w, $h) = @_; 995 my ($self, $w, $h) = @_;
938 996
939 $h -= List::Util::max 0, $self->border * 2; 997 $h -= List::Util::max 0, $self->border * 2;
940 $w -= List::Util::max 0, $self->border * 2; 998 $w -= List::Util::max 0, $self->border * 2;
941 999
942 $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)
943 if $self->{title}; 1001 if $self->{title};
944 1002
945 $self->child->configure ($self->border, $self->border, $w, $h); 1003 $self->child->configure ($self->border, $self->border, $w, $h);
946} 1004}
947 1005
… …
1005 my ($self) = @_; 1063 my ($self) = @_;
1006 1064
1007 my ($w, $h ) = ($self->{w}, $self->{h}); 1065 my ($w, $h ) = ($self->{w}, $self->{h});
1008 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1009 1067
1010 glEnable GL_BLEND;
1011 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1012 glEnable GL_TEXTURE_2D; 1068 glEnable GL_TEXTURE_2D;
1013 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1014 1070
1015 my $border = $self->border; 1071 my $border = $self->border;
1016 1072
1017 glColor @{ $self->{border_bg} }; 1073 glColor @{ $self->{border_bg} };
1018 $tex[1]->draw_quad (0, 0, $w, $border); 1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
1019 $tex[3]->draw_quad (0, $border, $border, $ch); 1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1020 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1021 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1022 1078
1023 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1024 my $bg = $tex[0]; 1080 my $bg = $tex[0];
1025 1081
1026 # TODO: repeat texture not scale 1082 # TODO: repeat texture not scale
… …
1030 glColor @{ $self->{bg} }; 1086 glColor @{ $self->{bg} };
1031 1087
1032 $bg->{s} = $rep_x; 1088 $bg->{s} = $rep_x;
1033 $bg->{t} = $rep_y; 1089 $bg->{t} = $rep_y;
1034 $bg->{wrap_mode} = 1; 1090 $bg->{wrap_mode} = 1;
1035 $bg->draw_quad ($border, $border, $cw, $ch); 1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 }
1036 1093
1037 glDisable GL_TEXTURE_2D; 1094 glDisable GL_TEXTURE_2D;
1038 glDisable GL_BLEND;
1039 }
1040 1095
1041 $self->{title}->draw if $self->{title}; 1096 $self->{title}->draw if $self->{title};
1042 1097
1043 $self->child->draw; 1098 $self->child->draw;
1044} 1099}
… …
1056sub new { 1111sub new {
1057 my $class = shift; 1112 my $class = shift;
1058 1113
1059 $class->SUPER::new ( 1114 $class->SUPER::new (
1060 col_expand => [], 1115 col_expand => [],
1061 @_ 1116 @_,
1062 ) 1117 )
1118}
1119
1120sub children {
1121 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1063} 1122}
1064 1123
1065sub add { 1124sub add {
1066 my ($self, $x, $y, $child) = @_; 1125 my ($self, $x, $y, $child) = @_;
1067 1126
1068 $child->set_parent ($self); 1127 $child->set_parent ($self);
1069 $self->{children}[$y][$x] = $child; 1128 $self->{children}[$y][$x] = $child;
1070 1129
1071 $child->check_size; 1130 $self->check_size (1);
1072} 1131}
1073 1132
1074sub children {
1075 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1076}
1077
1078# 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?
1079sub clear { 1134sub clear {
1080 my ($self) = @_; 1135 my ($self) = @_;
1081 1136
1082 my @children = $self->children; 1137 my @children = $self->children;
1083 delete $self->{children}; 1138 delete $self->{children};
… …
1085 for (@children) { 1140 for (@children) {
1086 delete $_->{parent}; 1141 delete $_->{parent};
1087 $_->hide; 1142 $_->hide;
1088 } 1143 }
1089 1144
1145 $self->check_size (1);
1090 $self->update; 1146 $self->update;
1091} 1147}
1092 1148
1093sub get_wh { 1149sub get_wh {
1094 my ($self) = @_; 1150 my ($self) = @_;
… …
1126sub size_allocate { 1182sub size_allocate {
1127 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1128 1184
1129 my ($ws, $hs) = $self->get_wh; 1185 my ($ws, $hs) = $self->get_wh;
1130 1186
1131 my $req_w = sum @$ws; 1187 my $req_w = (sum @$ws) || 1;
1132 my $req_h = sum @$hs; 1188 my $req_h = (sum @$hs) || 1;
1133 1189
1134 # TODO: nicer code && do row_expand 1190 # TODO: nicer code && do row_expand
1135 my @col_expand = @{$self->{col_expand}}; 1191 my @col_expand = @{$self->{col_expand}};
1136 @col_expand = (1) x @$ws unless @col_expand; 1192 @col_expand = (1) x @$ws unless @col_expand;
1137 my $col_expand = (sum @col_expand) || 1; 1193 my $col_expand = (sum @col_expand) || 1;
… …
1271} 1327}
1272 1328
1273sub size_allocate { 1329sub size_allocate {
1274 my ($self, $w, $h) = @_; 1330 my ($self, $w, $h) = @_;
1275 1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1276 my $children = $self->{children}; 1334 my $children = $self->{children};
1277 1335
1278 my @h = map $_->{req_h}, @$children; 1336 my @h = map $_->{req_h}, @$children;
1279 1337
1280 my $req_h = List::Util::sum @h; 1338 my $req_h = List::Util::sum @h;
… …
1309 1367
1310############################################################################# 1368#############################################################################
1311 1369
1312package CFClient::UI::Label; 1370package CFClient::UI::Label;
1313 1371
1314our @ISA = CFClient::UI::Base::; 1372our @ISA = CFClient::UI::DrawBG::;
1315 1373
1316use CFClient::OpenGL; 1374use CFClient::OpenGL;
1317 1375
1318sub new { 1376sub new {
1319 my ($class, %arg) = @_; 1377 my ($class, %arg) = @_;
1320 1378
1321 my $self = $class->SUPER::new ( 1379 my $self = $class->SUPER::new (
1322 fg => [1, 1, 1], 1380 fg => [1, 1, 1],
1381 #bg => none
1382 #active_bg => none
1323 #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),
1324 fontsize => 1, 1389 fontsize => 1,
1325 text => "",
1326 align => -1, 1390 align => -1,
1327 valign => -1, 1391 valign => -1,
1328 padding => 2, 1392 padding => 2,
1329 layout => new CFClient::Layout,
1330 can_events => 0, 1393 can_events => 0,
1331 %arg 1394 %arg
1332 ); 1395 );
1333 1396
1334 if (exists $self->{template}) { 1397 if (exists $self->{template}) {
1335 my $layout = new CFClient::Layout; 1398 my $layout = new CFClient::Layout;
1336 $layout->set_text (delete $self->{template}); 1399 $layout->set_text (delete $self->{template});
1337 $self->{template} = $layout; 1400 $self->{template} = $layout;
1338 } 1401 }
1339 1402
1340 $self->set_text (delete $self->{text}) if exists $self->{text}; 1403 if (exists $self->{markup}) {
1341 $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 }
1342 1408
1343 $self 1409 $self
1344} 1410}
1345 1411
1346sub escape { 1412sub escape($) {
1347 local $_ = $_[1]; 1413 local $_ = $_[0];
1348 1414
1349 s/&/&amp;/g; 1415 s/&/&amp;/g;
1350 s/>/&gt;/g; 1416 s/>/&gt;/g;
1351 s/</&lt;/g; 1417 s/</&lt;/g;
1352 1418
1353 $_[1] 1419 $_
1354} 1420}
1355 1421
1356sub update { 1422sub update {
1357 my ($self) = @_; 1423 my ($self) = @_;
1358 1424
… …
1364 my ($self, $text) = @_; 1430 my ($self, $text) = @_;
1365 1431
1366 return if $self->{text} eq "T$text"; 1432 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1433 $self->{text} = "T$text";
1368 1434
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1369 $self->{layout}->set_text ($text); 1436 $self->{layout}->set_text ($text);
1370 1437
1371 delete $self->{texture};
1372 $self->update; 1438 $self->update;
1373 $self->check_size; 1439 $self->check_size;
1374} 1440}
1375 1441
1376sub set_markup { 1442sub set_markup {
1377 my ($self, $markup) = @_; 1443 my ($self, $markup) = @_;
1378 1444
1379 return if $self->{text} eq "M$markup"; 1445 return if $self->{text} eq "M$markup";
1380 $self->{text} = "M$markup"; 1446 $self->{text} = "M$markup";
1381 1447
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1382 $self->{layout}->set_markup ($markup); 1451 $self->{layout}->set_markup ($markup);
1383 1452
1384 delete $self->{texture};
1385 $self->update; 1453 $self->update;
1386 $self->check_size; 1454 $self->check_size;
1387} 1455}
1388 1456
1389sub size_request { 1457sub size_request {
1390 my ($self) = @_; 1458 my ($self) = @_;
1391 1459
1392 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1460 $self->{layout}->set_font ($self->{font}) if $self->{font};
1393 $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});
1394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1464 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1395 1465
1396 my ($w, $h) = $self->{layout}->size; 1466 my ($w, $h) = $self->{layout}->size;
1397 1467
1398 if (exists $self->{template}) { 1468 if (exists $self->{template}) {
… …
1428} 1498}
1429 1499
1430sub _draw { 1500sub _draw {
1431 my ($self) = @_; 1501 my ($self) = @_;
1432 1502
1503 $self->SUPER::_draw; # draw background, if applicable
1504
1433 my $tex = $self->{texture} ||= do { 1505 my $tex = $self->{texture} ||= do {
1506 $self->{layout}->set_foreground (@{$self->{fg}});
1434 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1507 $self->{layout}->set_font ($self->{font}) if $self->{font};
1435 $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});
1436 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512
1437 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
1438 }; 1524 };
1439 1525
1440 glEnable GL_BLEND;
1441 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1442 glEnable GL_TEXTURE_2D; 1526 glEnable GL_TEXTURE_2D;
1443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1444 1528
1529 if ($tex->{format} == GL_ALPHA) {
1445 glColor @{$self->{fg}}; 1530 glColor @{$self->{fg}};
1446
1447 $self->{ox} = int (
1448 $self->{align} < 0 ? $self->{padding}
1449 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1450 : ($self->{w} - $tex->{w}) * 0.5
1451 );
1452
1453 $self->{oy} = int (
1454 $self->{valign} < 0 ? $self->{padding}
1455 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1456 : ($self->{h} - $tex->{h}) * 0.5
1457 );
1458
1459 $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 }
1460 1535
1461 glDisable GL_TEXTURE_2D; 1536 glDisable GL_TEXTURE_2D;
1462 glDisable GL_BLEND;
1463} 1537}
1464 1538
1465############################################################################# 1539#############################################################################
1466 1540
1467package CFClient::UI::EntryBase; 1541package CFClient::UI::EntryBase;
… …
1480 active_fg => [0, 0, 0], 1554 active_fg => [0, 0, 0],
1481 can_hover => 1, 1555 can_hover => 1,
1482 can_focus => 1, 1556 can_focus => 1,
1483 valign => 0, 1557 valign => 0,
1484 can_events => 1, 1558 can_events => 1,
1559 #text => ...
1485 @_ 1560 @_
1486 ) 1561 )
1487} 1562}
1488 1563
1489sub _set_text { 1564sub _set_text {
… …
1499 $self->{text} = $text; 1574 $self->{text} = $text;
1500 1575
1501 $text =~ s/./*/g if $self->{hidden}; 1576 $text =~ s/./*/g if $self->{hidden};
1502 $self->{layout}->set_text ("$text "); 1577 $self->{layout}->set_text ("$text ");
1503 1578
1504 $self->emit (changed => $self->{text}); 1579 $self->_emit (changed => $self->{text});
1505}
1506
1507sub get_text {
1508 $_[0]{text}
1509}
1510
1511sub size_request {
1512 my ($self) = @_;
1513
1514 my ($w, $h) = $self->SUPER::size_request;
1515
1516 ($w + 1, $h) # add 1 for cursor
1517}
1518
1519sub size_allocate {
1520 my ($self, $w, $h) = @_;
1521
1522 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1523} 1580}
1524 1581
1525sub set_text { 1582sub set_text {
1526 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1527 1584
1528 $self->{cursor} = length $text; 1585 $self->{cursor} = length $text;
1529 $self->_set_text ($text); 1586 $self->_set_text ($text);
1530 $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
1531} 1601}
1532 1602
1533sub key_down { 1603sub key_down {
1534 my ($self, $ev) = @_; 1604 my ($self, $ev) = @_;
1535 1605
… …
1537 my $sym = $ev->{sym}; 1607 my $sym = $ev->{sym};
1538 my $uni = $ev->{unicode}; 1608 my $uni = $ev->{unicode};
1539 1609
1540 my $text = $self->get_text; 1610 my $text = $self->get_text;
1541 1611
1542 if ($sym == 8) { 1612 if ($uni == 8) {
1543 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1613 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1544 } elsif ($sym == 127) { 1614 } elsif ($uni == 127) {
1545 substr $text, $self->{cursor}, 1, ""; 1615 substr $text, $self->{cursor}, 1, "";
1546 } elsif ($sym == CFClient::SDLK_LEFT) { 1616 } elsif ($sym == CFClient::SDLK_LEFT) {
1547 --$self->{cursor} if $self->{cursor}; 1617 --$self->{cursor} if $self->{cursor};
1548 } elsif ($sym == CFClient::SDLK_RIGHT) { 1618 } elsif ($sym == CFClient::SDLK_RIGHT) {
1549 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1619 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1550 } elsif ($sym == CFClient::SDLK_HOME) { 1620 } elsif ($sym == CFClient::SDLK_HOME) {
1551 $self->{cursor} = 0; 1621 $self->{cursor} = 0;
1552 } elsif ($sym == CFClient::SDLK_END) { 1622 } elsif ($sym == CFClient::SDLK_END) {
1553 $self->{cursor} = length $text; 1623 $self->{cursor} = length $text;
1554 } elsif ($sym == 27) { 1624 } elsif ($uni == 27) {
1555 $self->emit ('escape'); 1625 $self->_emit ('escape');
1556 } elsif ($uni) { 1626 } elsif ($uni) {
1557 substr $text, $self->{cursor}++, 0, chr $uni; 1627 substr $text, $self->{cursor}++, 0, chr $uni;
1558 } 1628 }
1559 1629
1560 $self->_set_text ($text); 1630 $self->_set_text ($text);
1561 $self->update; 1631 $self->update;
1632 $self->check_size;
1562} 1633}
1563 1634
1564sub focus_in { 1635sub focus_in {
1565 my ($self) = @_; 1636 my ($self) = @_;
1566 1637
… …
1646 if ($sym == 13) { 1717 if ($sym == 13) {
1647 unshift @{$self->{history}}, 1718 unshift @{$self->{history}},
1648 my $txt = $self->get_text; 1719 my $txt = $self->get_text;
1649 $self->{history_pointer} = -1; 1720 $self->{history_pointer} = -1;
1650 $self->{history_saveback} = ''; 1721 $self->{history_saveback} = '';
1651 $self->emit (activate => $txt); 1722 $self->_emit (activate => $txt);
1652 $self->update; 1723 $self->update;
1653 1724
1654 } elsif ($sym == CFClient::SDLK_UP) { 1725 } elsif ($sym == CFClient::SDLK_UP) {
1655 if ($self->{history_pointer} < 0) { 1726 if ($self->{history_pointer} < 0) {
1656 $self->{history_saveback} = $self->get_text; 1727 $self->{history_saveback} = $self->get_text;
… …
1695 my $class = shift; 1766 my $class = shift;
1696 1767
1697 $class->SUPER::new ( 1768 $class->SUPER::new (
1698 padding => 4, 1769 padding => 4,
1699 fg => [1, 1, 1], 1770 fg => [1, 1, 1],
1700 bg => [1, 1, 1, 0.2],
1701 active_fg => [0, 0, 1], 1771 active_fg => [0, 0, 1],
1702 can_hover => 1, 1772 can_hover => 1,
1703 align => 0, 1773 align => 0,
1704 valign => 0, 1774 valign => 0,
1705 can_events => 1, 1775 can_events => 1,
1706 @_ 1776 @_
1707 ) 1777 )
1708} 1778}
1709 1779
1780sub activate { }
1781
1710sub button_up { 1782sub button_up {
1711 my ($self, $ev, $x, $y) = @_; 1783 my ($self, $ev, $x, $y) = @_;
1712 1784
1785 $self->emit ("activate")
1713 if ($x >= 0 && $x < $self->{w} 1786 if $x >= 0 && $x < $self->{w}
1714 && $y >= 0 && $y < $self->{h}) { 1787 && $y >= 0 && $y < $self->{h};
1715 $self->emit ("activate");
1716 }
1717} 1788}
1718 1789
1719sub _draw { 1790sub _draw {
1720 my ($self) = @_; 1791 my ($self) = @_;
1721 1792
… …
1723 1794
1724 if ($GRAB == $self) { 1795 if ($GRAB == $self) {
1725 $self->{fg} = $self->{active_fg}; 1796 $self->{fg} = $self->{active_fg};
1726 } 1797 }
1727 1798
1728 glEnable GL_BLEND;
1729 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1730 glEnable GL_TEXTURE_2D; 1799 glEnable GL_TEXTURE_2D;
1731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1732 glColor 0, 0, 0, 1; 1801 glColor 0, 0, 0, 1;
1733 1802
1734 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1803 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1735 1804
1736 glDisable GL_TEXTURE_2D; 1805 glDisable GL_TEXTURE_2D;
1737 glDisable GL_BLEND;
1738 1806
1739 $self->SUPER::_draw; 1807 $self->SUPER::_draw;
1740} 1808}
1741 1809
1742############################################################################# 1810#############################################################################
… …
1756 1824
1757 $class->SUPER::new ( 1825 $class->SUPER::new (
1758 padding => 2, 1826 padding => 2,
1759 fg => [1, 1, 1], 1827 fg => [1, 1, 1],
1760 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],
1761 state => 0, 1831 state => 0,
1762 can_hover => 1, 1832 can_hover => 1,
1763 @_ 1833 @_
1764 ) 1834 )
1765} 1835}
… …
1774 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1775 1845
1776 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1777 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1778 $self->{state} = !$self->{state}; 1848 $self->{state} = !$self->{state};
1779 $self->emit (changed => $self->{state}); 1849 $self->_emit (changed => $self->{state});
1780 } 1850 }
1781} 1851}
1782 1852
1783sub _draw { 1853sub _draw {
1784 my ($self) = @_; 1854 my ($self) = @_;
… …
1789 1859
1790 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;
1791 1861
1792 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1793 1863
1794 glEnable GL_BLEND; 1864 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865
1795 glEnable GL_TEXTURE_2D; 1866 glEnable GL_TEXTURE_2D;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797
1798 my $tex = $self->{state} ? $tex[1] : $tex[0];
1799
1800 $tex->draw_quad (0, 0, $s, $s); 1867 $tex->draw_quad_alpha (0, 0, $s, $s);
1801
1802 glDisable GL_TEXTURE_2D; 1868 glDisable GL_TEXTURE_2D;
1803 glDisable GL_BLEND;
1804} 1869}
1805 1870
1806############################################################################# 1871#############################################################################
1807 1872
1808package CFClient::UI::Image; 1873package CFClient::UI::Image;
… …
1851 glTranslate 0, -$self->{w}, 0; 1916 glTranslate 0, -$self->{w}, 0;
1852 1917
1853 ($w, $h) = ($h, $w); 1918 ($w, $h) = ($h, $w);
1854 } 1919 }
1855 1920
1856 glEnable GL_BLEND;
1857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1858 glEnable GL_TEXTURE_2D; 1921 glEnable GL_TEXTURE_2D;
1859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1922 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1860 1923
1861 $tex->draw_quad (0, 0, $w, $h); 1924 $tex->draw_quad_alpha (0, 0, $w, $h);
1862 1925
1863 glDisable GL_BLEND;
1864 glDisable GL_TEXTURE_2D; 1926 glDisable GL_TEXTURE_2D;
1865} 1927}
1866 1928
1867############################################################################# 1929#############################################################################
1868 1930
… …
2057 qw(s1_slider.png s1_slider_bg.png); 2119 qw(s1_slider.png s1_slider_bg.png);
2058 2120
2059sub new { 2121sub new {
2060 my $class = shift; 2122 my $class = shift;
2061 2123
2062 # range [value, low, high, page] 2124 # range [value, low, high, page, unit]
2063 2125
2064 # TODO: 0-width page 2126 # TODO: 0-width page
2065 # TODO: req_w/h are wrong with vertical 2127 # TODO: req_w/h are wrong with vertical
2066 # TODO: calculations are off 2128 # TODO: calculations are off
2067 my $self = $class->SUPER::new ( 2129 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2130 fg => [1, 1, 1],
2069 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],
2070 range => [0, 0, 100, 10], 2134 range => [0, 0, 100, 10, 0],
2071 req_w => $::WIDTH / 80, 2135 req_w => $::WIDTH / 80,
2072 req_h => $::WIDTH / 80, 2136 req_h => $::WIDTH / 80,
2073 vertical => 0, 2137 vertical => 0,
2074 can_hover => 1, 2138 can_hover => 1,
2075 inner_pad => 5, 2139 inner_pad => 0.02,
2076 @_ 2140 @_
2077 ); 2141 );
2078 2142
2143 $self->set_value ($self->{range}[0]);
2144 $self->update;
2145
2079 $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 }
2080} 2179}
2081 2180
2082sub size_request { 2181sub size_request {
2083 my ($self) = @_; 2182 my ($self) = @_;
2084 2183
… …
2090 2189
2091sub button_down { 2190sub button_down {
2092 my ($self, $ev, $x, $y) = @_; 2191 my ($self, $ev, $x, $y) = @_;
2093 2192
2094 $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
2095 $self->mouse_motion ($ev, $x, $y); 2197 $self->mouse_motion ($ev, $x, $y);
2096} 2198}
2097 2199
2098sub mouse_motion { 2200sub mouse_motion {
2099 my ($self, $ev, $x, $y) = @_; 2201 my ($self, $ev, $x, $y) = @_;
2100 2202
2101 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
2102 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2220 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100;
2103 2222
2104 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2223 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2105 2224
2106 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2225 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2107 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2226 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2108 2227
2109 $x -= $inner_pad_px; # substract the padding 2228 $value = ($value - $lo) / $range;
2110 $x = $x * ($hi - $lo) / $inner_w + $lo; 2229 $value = $value * $self->{scale} + $self->{offset};
2111 $x = $lo if $x < $lo;
2112 $x = $hi - $page if $x > $hi - $page;
2113 $self->{range}[0] = $x;
2114 2230
2115 $self->emit (changed => $x); 2231 $self->{knob_x} = $value - $knob_w * 0.5;
2116 $self->update; 2232 $self->{knob_w} = $knob_w;
2117 } 2233 });
2118}
2119 2234
2120# the inner_* stuff is for generating a padding for the slider handle, 2235 $self->SUPER::update;
2121# so that the handle doesn't leave the texture. This calculation isn't 100%
2122# correct propably, but it does the job for now
2123sub _calc_inner_pad_px {
2124 my ($self, $w) = @_;
2125 ($w / 100) * $self->{inner_pad} # % to pixels
2126} 2236}
2127 2237
2128sub _draw { 2238sub _draw {
2129 my ($self) = @_; 2239 my ($self) = @_;
2130 2240
2131 $self->SUPER::_draw (); 2241 $self->SUPER::_draw ();
2132 2242
2133 my ($w, $h) = @$self{qw(w h)}; 2243 glScale $self->{w}, $self->{h};
2134 2244
2135 if ($self->{vertical}) { 2245 if ($self->{vertical}) {
2136 # draw a vertical slider like a rotated horizontal slider 2246 # draw a vertical slider like a rotated horizontal slider
2137 2247
2248 glTranslate 1, 0, 0;
2138 glRotate 90, 0, 0, 1; 2249 glRotate 90, 0, 0, 1;
2139 glTranslate 0, -$self->{w}, 0;
2140
2141 ($w, $h) = ($h, $w);
2142 } 2250 }
2143 2251
2144 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2252 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2145 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2253 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2146 2254
2147 my ($value, $lo, $hi, $page) = @{$self->{range}};
2148
2149 $hi = $value + 1 if $lo == $hi;
2150
2151 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2152 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2153
2154 $page = int $page * $inner_w / ($hi - $lo);
2155 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2156
2157 $w -= $page;
2158 $page &= ~1;
2159 glTranslate $page * 0.5, 0, 0;
2160 $page ||= 2;
2161
2162 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2163 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2164
2165 glEnable GL_BLEND;
2166 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2167 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
2168 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2169 2257
2170 # draw background 2258 # draw background
2171 $tex[1]->draw_quad (0, 0, $w, $h); 2259 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2172 2260
2173 # draw handle 2261 # draw handle
2174 $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);
2175 2263
2176 glDisable GL_BLEND;
2177 glDisable GL_TEXTURE_2D; 2264 glDisable GL_TEXTURE_2D;
2178} 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 (@_) }
2179 2307
2180############################################################################# 2308#############################################################################
2181 2309
2182package CFClient::UI::TextView; 2310package CFClient::UI::TextView;
2183 2311
… …
2192 fontsize => 1, 2320 fontsize => 1,
2193 can_events => 0, 2321 can_events => 0,
2194 #font => default_font 2322 #font => default_font
2195 @_, 2323 @_,
2196 2324
2197 layout => (new CFClient::Layout), 2325 layout => (new CFClient::Layout 1),
2198 par => [], 2326 par => [],
2199 height => 0, 2327 height => 0,
2200 children => [ 2328 children => [
2201 (new CFClient::UI::Empty expand => 1), 2329 (new CFClient::UI::Empty expand => 1),
2202 (new CFClient::UI::Slider vertical => 1), 2330 (new CFClient::UI::Slider vertical => 1),
… …
2213 2341
2214 $self->{fontsize} = $fontsize; 2342 $self->{fontsize} = $fontsize;
2215 $self->reflow; 2343 $self->reflow;
2216} 2344}
2217 2345
2218sub text_height {
2219 my ($self, $text) = @_;
2220
2221 my $layout = $self->{layout};
2222
2223 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2224 $layout->set_width ($self->{children}[0]{w});
2225 $layout->set_text ($text);
2226
2227 ($layout->size)[1]
2228}
2229
2230sub reflow {
2231 my ($self) = @_;
2232
2233 $self->{need_reflow}++;
2234 $self->update;
2235}
2236
2237sub size_allocate { 2346sub size_allocate {
2238 my ($self, $w, $h) = @_; 2347 my ($self, $w, $h) = @_;
2239 2348
2240 $self->SUPER::size_allocate ($w, $h); 2349 $self->SUPER::size_allocate ($w, $h);
2241 2350
… …
2244 $self->{layout}->set_width ($self->{children}[0]{w}); 2353 $self->{layout}->set_width ($self->{children}[0]{w});
2245 2354
2246 $self->reflow; 2355 $self->reflow;
2247} 2356}
2248 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
2249sub add_paragraph { 2392sub add_paragraph {
2250 my ($self, $color, $text) = @_; 2393 my ($self, $color, $text, $indent) = @_;
2251 2394
2252 #TODO: intelligently "reformat" paragraph 2395 for my $line (split /\n/, $text) {
2253 2396 my ($w, $h) = $self->text_size ($line);
2254 my $height = $self->text_height ($text);
2255
2256 $self->{height} += $height; 2397 $self->{height} += $h;
2398 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2399 }
2257 2400
2258 push @{$self->{par}}, [$height, $color, $text];
2259
2260 $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]);
2261 $self->{children}[1]->update;
2262} 2402}
2263 2403
2264sub update { 2404sub update {
2265 my ($self) = @_; 2405 my ($self) = @_;
2266 2406
… …
2268 2408
2269 return unless $self->{h} > 0; 2409 return unless $self->{h} > 0;
2270 2410
2271 delete $self->{texture}; 2411 delete $self->{texture};
2272 2412
2273 $ROOT->on_refresh ($self, sub { 2413 $ROOT->on_post_alloc ($self, sub {
2414 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2415
2274 if (delete $self->{need_reflow}) { 2416 if (delete $self->{need_reflow}) {
2275 my $height = 0; 2417 my $height = 0;
2276 2418
2277 $height += $_->[0] = $self->text_height ($_->[2]) 2419 my $layout = $self->{layout};
2420
2421 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2422
2278 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 }
2279 2434
2280 $self->{height} = $height; 2435 $self->{height} = $height;
2281 2436
2282 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2437 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2283 2438
2284 delete $self->{texture}; 2439 delete $self->{texture};
2285 } 2440 }
2286 2441
2287 $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 {
2288 glClearColor 0, 0, 0, 0; 2443 glClearColor 0.5, 0.5, 0.5, 0;
2289 glClear GL_COLOR_BUFFER_BIT; 2444 glClear GL_COLOR_BUFFER_BIT;
2290 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
2291 glEnable GL_BLEND; 2457 glEnable GL_BLEND;
2458 #TODO# not correct in windows where rgba is forced off
2292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2459 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2293 glEnable GL_TEXTURE_2D;
2294 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2295
2296 my $top = int $self->{children}[1]{range}[0];
2297
2298 my $y0 = $top;
2299 my $y1 = $top + $self->{h};
2300
2301 my $y = 0;
2302
2303 my $layout = $self->{layout};
2304
2305 $layout->set_font ($self->{font}) if $self->{font};
2306 2460
2307 for my $par (@{$self->{par}}) { 2461 for my $par (@{$self->{par}}) {
2308 my $h = $par->[0]; 2462 my $h = $par->[1];
2309 2463
2310 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]);
2311 $layout->set_text ($par->[2]); 2467 $layout->set_markup ($par->[4]);
2312 2468
2313 glColor @{ $par->[1] }; 2469 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 my ($W, $H) = $layout->size; 2470
2315 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;
2316 } 2473 }
2317 2474
2318 $y += $h; 2475 $y += $h;
2319 } 2476 }
2320 2477
2321 glDisable GL_TEXTURE_2D;
2322 glDisable GL_BLEND; 2478 glDisable GL_BLEND;
2323 }; 2479 };
2324 }); 2480 });
2325} 2481}
2326 2482
2327sub _draw { 2483sub _draw {
2328 my ($self) = @_; 2484 my ($self) = @_;
2329 2485
2330 glEnable GL_BLEND;
2331 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2332 glEnable GL_TEXTURE_2D; 2486 glEnable GL_TEXTURE_2D;
2333 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2334 glColor 1, 1, 1, 1; 2488 glColor 1, 1, 1, 1;
2335 $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});
2336 glDisable GL_TEXTURE_2D; 2490 glDisable GL_TEXTURE_2D;
2337 glDisable GL_BLEND;
2338 2491
2339 $self->{children}[1]->draw; 2492 $self->{children}[1]->draw;
2340 2493
2341} 2494}
2342 2495
… …
2410 2563
2411 # TODO: use animation 2564 # TODO: use animation
2412 if ($self->{state} = !$self->{state}) { 2565 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other}); 2566 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h})); 2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open"); 2568 $self->_emit ("open");
2416 } else { 2569 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other}); 2570 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close"); 2571 $self->_emit ("close");
2419 } 2572 }
2420 2573
2421 $self->emit (changed => $self->{state}); 2574 $self->_emit (changed => $self->{state});
2422} 2575}
2423 2576
2424############################################################################# 2577#############################################################################
2425 2578
2426package CFClient::UI::Tooltip; 2579package CFClient::UI::Tooltip;
… …
2436 @_, 2589 @_,
2437 can_events => 0, 2590 can_events => 0,
2438 ) 2591 )
2439} 2592}
2440 2593
2441sub set_markup { 2594sub set_tooltip_from {
2442 my ($self, $text) = @_; 2595 my ($self, $widget) = @_;
2443 2596
2444 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2597 $self->add (new CFClient::UI::Label
2445 $self->{label}->set_markup ($text); 2598 markup => $widget->{tooltip},
2446 $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 );
2447} 2605}
2448 2606
2449sub size_request { 2607sub size_request {
2450 my ($self) = @_; 2608 my ($self) = @_;
2451
2452 $self->child->set_max_size ($::WIDTH * 0.3);
2453 2609
2454 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2610 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2455 2611
2456 ($w + 4, $h + 4) 2612 ($w + 4, $h + 4)
2457} 2613}
… …
2463} 2619}
2464 2620
2465sub _draw { 2621sub _draw {
2466 my ($self) = @_; 2622 my ($self) = @_;
2467 2623
2468 glPushMatrix;
2469 glTranslate 0.375, 0.375; 2624 glTranslate 0.375, 0.375;
2470 2625
2471 my ($w, $h) = @$self{qw(w h)}; 2626 my ($w, $h) = @$self{qw(w h)};
2472 2627
2473 glColor 1, 0.8, 0.4; 2628 glColor 1, 0.8, 0.4;
… …
2484 glVertex 0 , $h; 2639 glVertex 0 , $h;
2485 glVertex $w, $h; 2640 glVertex $w, $h;
2486 glVertex $w, 0; 2641 glVertex $w, 0;
2487 glEnd; 2642 glEnd;
2488 2643
2489 glPopMatrix; 2644 glTranslate 2 - 0.375, 2 - 0.375;
2490
2491 glTranslate 2, 2;
2492 $self->SUPER::_draw; 2645 $self->SUPER::_draw;
2493} 2646}
2494 2647
2495############################################################################# 2648#############################################################################
2496 2649
… …
2501use CFClient::OpenGL; 2654use CFClient::OpenGL;
2502 2655
2503sub new { 2656sub new {
2504 my $class = shift; 2657 my $class = shift;
2505 2658
2506 $class->SUPER::new ( 2659 my $self = $class->SUPER::new (
2507 aspect => 1, 2660 aspect => 1,
2661 can_events => 0,
2508 @_, 2662 @_,
2509 ) 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
2510} 2680}
2511 2681
2512sub size_request { 2682sub size_request {
2513 (32, 8) 2683 (32, 8)
2514} 2684}
2515 2685
2686sub update {
2687 my ($self) = @_;
2688
2689 return unless $self->{visible};
2690
2691 $self->SUPER::update;
2692}
2693
2516sub _draw { 2694sub _draw {
2517 my ($self) = @_; 2695 my ($self) = @_;
2518 2696
2519 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
2520 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2708 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2521 2709
2522 # TODO animation
2523 if ($tex) { 2710 if ($tex) {
2524 glEnable GL_BLEND;
2525 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2526 glEnable GL_TEXTURE_2D; 2711 glEnable GL_TEXTURE_2D;
2527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2528 glColor 1, 1, 1, 1; 2713 glColor 1, 1, 1, 1;
2529 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2714 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2530 glDisable GL_TEXTURE_2D; 2715 glDisable GL_TEXTURE_2D;
2531 glDisable GL_BLEND;
2532 } 2716 }
2717}
2718
2719sub DESTROY {
2720 my ($self) = @_;
2721
2722 $self->{timer}->cancel
2723 if $self->{timer};
2724
2725 $self->SUPER::DESTROY;
2533} 2726}
2534 2727
2535############################################################################# 2728#############################################################################
2536 2729
2537package CFClient::UI::InventoryItem; 2730package CFClient::UI::Inventory;
2538 2731
2539our @ISA = CFClient::UI::HBox::; 2732our @ISA = CFClient::UI::ScrolledWindow::;
2540 2733
2541sub new { 2734sub new {
2542 my $class = shift; 2735 my $class = shift;
2543 2736
2544 my %args = @_;
2545
2546 my $item = $args{item};
2547
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552
2553 my $self = $class->SUPER::new ( 2737 my $self = $class->SUPER::new (
2554 can_hover => 1, 2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2555 can_events => 1,
2556 tooltip => (CFClient::UI::Label->escape ($desc)
2557 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2558 connect_button_down => sub {
2559 my ($self, $ev, $x, $y) = @_;
2560
2561 # todo: maybe put examine on 1? but should just be a tooltip :(
2562 if ($ev->{button} == 1) {
2563 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2564 } elsif ($ev->{button} == 2) {
2565 $::CONN->send ("apply $item->{tag}");
2566 } elsif ($ev->{button} == 3) {
2567 CFClient::UI::Menu->new (
2568 items => [
2569 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2570 [
2571 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2572 sub { $::CONN->send ("lock $item->{tag}") },
2573 ],
2574 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2575 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2576 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2577 ],
2578 )->popup ($ev);
2579 }
2580
2581 1
2582 },
2583 %args
2584 );
2585 $self->add(new CFClient::UI::Face
2586 can_events => 0,
2587 face => $item->{face},
2588 anim => $item->{anim},
2589 animspeed => $item->{animspeed});
2590 $self->add(new CFClient::UI::Label
2591 can_events => 0,
2592 text => $desc);
2593
2594 $self
2595}
2596
2597#############################################################################
2598
2599package CFClient::UI::Inventory;
2600
2601our @ISA = CFClient::UI::ScrolledWindow::;
2602
2603sub new {
2604 my $class = shift;
2605
2606 my $self = $class->SUPER::new (
2607 scrolled => (new CFClient::UI::VBox),
2608 @_, 2739 @_,
2609 ); 2740 );
2610 2741
2611 $self 2742 $self
2612} 2743}
… …
2615 my ($self, $items) = @_; 2746 my ($self, $items) = @_;
2616 2747
2617 $self->{scrolled}->clear; 2748 $self->{scrolled}->clear;
2618 return unless $items; 2749 return unless $items;
2619 2750
2620 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;
2621 2755
2622 $self->{real_items} = \@items; 2756 $self->{real_items} = \@items;
2623 2757
2758 my $row = 0;
2624 for my $item (@items) { 2759 for my $item (@items) {
2625 my $desc = $item->{nrof} < 2 2760 CFClient::Item::update_widgets $item;
2626 ? $item->{name}
2627 : "$item->{nrof} $item->{name_pl}";
2628 2761
2629 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2630 } 2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2631 2765
2632# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2766 $row++;
2767 }
2633} 2768}
2634 2769
2635sub size_request { 2770sub size_request {
2636 my ($self) = @_; 2771 my ($self) = @_;
2637 ($self->{req_w}, $self->{req_h}); 2772 ($self->{req_w}, $self->{req_h});
… …
2677 2812
2678# 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)
2679sub popup { 2814sub popup {
2680 my ($self, $ev) = @_; 2815 my ($self, $ev) = @_;
2681 2816
2682 $self->emit ("popdown"); 2817 $self->_emit ("popdown");
2683 2818
2684 # maybe save $GRAB? must be careful about events... 2819 # maybe save $GRAB? must be careful about events...
2685 $GRAB = $self; 2820 $GRAB = $self;
2686 $self->{button} = $ev->{button}; 2821 $self->{button} = $ev->{button};
2687 2822
… …
2702 2837
2703 if ($ev->{button} == $self->{button}) { 2838 if ($ev->{button} == $self->{button}) {
2704 undef $GRAB; 2839 undef $GRAB;
2705 $self->hide; 2840 $self->hide;
2706 2841
2707 $self->emit ("popdown"); 2842 $self->_emit ("popdown");
2708 $self->{hover}[1]->() if $self->{hover}; 2843 $self->{hover}[1]->() if $self->{hover};
2709 } 2844 }
2710} 2845}
2711 2846
2712############################################################################# 2847#############################################################################
2713 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
2714package CFClient::UI::Root; 2959package CFClient::UI::Root;
2715 2960
2716our @ISA = CFClient::UI::Container::; 2961our @ISA = CFClient::UI::Container::;
2717 2962
2718use CFClient::OpenGL; 2963use CFClient::OpenGL;
2719 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
2720sub check_size { 2980sub check_size {
2721 my ($self) = @_; 2981 my ($self) = @_;
2722 2982
2723 $self->configure (0, 0, $self->{w}, $self->{h}); 2983 $self->size_allocate ($self->{w}, $self->{h})
2984 if $self->{w};
2724} 2985}
2725 2986
2726sub size_request { 2987sub size_request {
2727 my ($self) = @_; 2988 my ($self) = @_;
2728 2989
… …
2730} 2991}
2731 2992
2732sub size_allocate { 2993sub size_allocate {
2733 my ($self, $w, $h) = @_; 2994 my ($self, $w, $h) = @_;
2734 2995
2735 my $old_w = $self->{old_w};
2736 my $old_h = $self->{old_h};
2737
2738 if ($old_w && $old_h) {
2739 for my $child ($self->children) {
2740 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2741 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2742 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2743 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2744 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2745 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2746 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2747 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2748 }
2749 }
2750
2751 $self->{old_w} = $w;
2752 $self->{old_h} = $h;
2753}
2754
2755sub configure {
2756 my ($self, $x, $y, $w, $h) = @_;
2757
2758 $self->SUPER::configure ($x, $y, $w, $h);
2759
2760 for my $child ($self->children) { 2996 for my $child ($self->children) {
2761 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)};
2762 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
2763 $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;
2764 $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
2765 $child->configure ($X, $Y, $W, $H); 3008 $child->configure ($X, $Y, $W, $H);
2766 } 3009 }
2767} 3010}
2768 3011
2769sub _topleft { 3012sub coord2local {
2770 my ($self, $x, $y) = @_; 3013 my ($self, $x, $y) = @_;
2771 3014
2772 ($x, $y) 3015 ($x, $y)
2773} 3016}
2774 3017
3018sub coord2global {
3019 my ($self, $x, $y) = @_;
3020
3021 ($x, $y)
3022}
3023
2775sub update { 3024sub update {
2776 my ($self) = @_; 3025 my ($self) = @_;
2777 3026
2778 $self->check_size; 3027 $self->check_size;
2779 ::refresh (); 3028 $::WANT_REFRESH++;
2780} 3029}
2781 3030
2782sub add { 3031sub add {
2783 my ($self, $child) = @_; 3032 my ($self, @children) = @_;
2784 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
2785 # integerize window positions 3043 # integerise window positions
2786 $child->{x} = int $child->{x}; 3044 $child->{x} = int $child->{x};
2787 $child->{y} = int $child->{y}; 3045 $child->{y} = int $child->{y};
3046 }
2788 3047
2789 $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 }
2790} 3061}
2791 3062
2792sub on_refresh { 3063sub on_refresh {
2793 my ($self, $id, $cb) = @_; 3064 my ($self, $id, $cb) = @_;
2794 3065
2795 $self->{refresh_hook}{$id} = $cb; 3066 $self->{refresh_hook}{$id} = $cb;
2796} 3067}
2797 3068
3069sub on_post_alloc {
3070 my ($self, $id, $cb) = @_;
3071
3072 $self->{post_alloc_hook}{$id} = $cb;
3073}
3074
2798sub draw { 3075sub draw {
2799 my ($self) = @_; 3076 my ($self) = @_;
2800 3077
2801 while (my $rcb = delete $self->{refresh_hook}) { 3078 while ($self->{refresh_hook}) {
2802 $_->() 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}};
2803 } 3130 }
2804 3131
2805 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3132 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807 glClear GL_COLOR_BUFFER_BIT; 3134 glClear GL_COLOR_BUFFER_BIT;
2808 3135
2809 glMatrixMode GL_PROJECTION; 3136 glMatrixMode GL_PROJECTION;
2810 glLoadIdentity; 3137 glLoadIdentity;
2811 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2812 glMatrixMode GL_MODELVIEW; 3139 glMatrixMode GL_MODELVIEW;
2813 glLoadIdentity; 3140 glLoadIdentity;
2814 3141
2815 $self->_draw; 3142 $self->_draw;
2816} 3143}
… …
2818############################################################################# 3145#############################################################################
2819 3146
2820package CFClient::UI; 3147package CFClient::UI;
2821 3148
2822$ROOT = new CFClient::UI::Root; 3149$ROOT = new CFClient::UI::Root;
2823$TOOLTIP = new CFClient::UI::Tooltip; 3150$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2824 3151
28251 31521
2826 3153

Diff Legend

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