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

Diff Legend

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