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.246 by root, Sun May 28 00:40:51 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->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
183 }
184 }
185
186 reconfigure_widgets;
136} 187}
137 188
138############################################################################# 189#############################################################################
139 190
140package CFClient::UI::Base; 191package CFClient::UI::Base;
… …
153 can_events => 1, 204 can_events => 1,
154 @_ 205 @_
155 }, $class; 206 }, $class;
156 207
157 for (keys %$self) { 208 for (keys %$self) {
158 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
160 } 211 }
161 } 212 }
162 213
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
163 $self 223 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
164} 234}
165 235
166sub destroy { 236sub destroy {
167 my ($self) = @_; 237 my ($self) = @_;
168 238
… …
170 %$self = (); 240 %$self = ();
171} 241}
172 242
173sub show { 243sub show {
174 my ($self) = @_; 244 my ($self) = @_;
175
176 return if $self->{parent}; 245 return if $self->{parent};
177 246
178 $CFClient::UI::ROOT->add ($self); 247 $CFClient::UI::ROOT->add ($self);
179} 248}
180 249
181sub hide { 250sub show_centered {
182 my ($self) = @_; 251 my ($self) = @_;
252 return if $self->{parent};
253
254 $self->show;
255
256 $CFClient::UI::ROOT->on_post_alloc (
257 "centered $self" => sub {
258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
259 },
260 );
261}
262
263sub set_visible {
264 my ($self) = @_;
265
266 return if $self->{visible};
267
268 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1;
270
271 $self->emit (visibility_change => 1)
272}
273
274sub set_invisible {
275 my ($self) = @_;
276
277 return unless $self->{visible};
278
279 # broken show/hide model
280
281 delete $self->{root};
282 delete $self->{visible};
183 283
184 undef $GRAB if $GRAB == $self; 284 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 285 undef $HOVER if $HOVER == $self;
286
287 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self;
289
290 $self->focus_out;
291
292 $self->emit (visibility_change => 0);
293}
294
295sub hide {
296 my ($self) = @_;
297
298 $self->set_invisible;
186 299
187 $self->{parent}->remove ($self) 300 $self->{parent}->remove ($self)
188 if $self->{parent}; 301 if $self->{parent};
189} 302}
190 303
… …
199} 312}
200 313
201sub set_size { 314sub set_size {
202 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
203 316
204 $self->{user_w} = $w; 317 $self->{def_w} = $w;
205 $self->{user_h} = $h; 318 $self->{def_h} = $h;
206 319
207 $self->check_size; 320 $self->check_size;
208} 321}
209 322
210sub size_request { 323sub size_request {
… …
232 $self->{y} = $y; 345 $self->{y} = $y;
233 $self->update; 346 $self->update;
234 } 347 }
235 348
236 if ($self->{w} != $w || $self->{h} != $h) { 349 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 350 $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 } 351 }
244} 352}
245 353
246sub size_allocate { 354sub size_allocate {
247 # nothing to be done 355 # nothing to be done
248} 356}
249 357
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363}
364
250sub children { 365sub 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} 366}
264 367
265sub set_max_size { 368sub set_max_size {
266 my ($self, $w, $h) = @_; 369 my ($self, $w, $h) = @_;
267 370
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 371 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 372 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 373}
271 374
272# return top left coordinates 375sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 376 my ($self, $tooltip) = @_;
275 377
276 $self->{parent} 378 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 379 $tooltip =~ s/\s+$//;
278 380
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 381 return if $self->{tooltip} eq $tooltip;
382
383 $self->{tooltip} = $tooltip;
384
385 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
386 delete $CFClient::UI::TOOLTIP->{owner};
387 CFClient::UI::check_tooltip;
388 }
280} 389}
281 390
282# translate global coordinates to local coordinate system 391# translate global coordinates to local coordinate system
283sub coord2local { 392sub coord2local {
284 my ($self, $x, $y) = @_; 393 my ($self, $x, $y) = @_;
285 394
286 my ($X, $Y) = $self->_topleft; 395 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 396}
289 397
290# translate local coordinates to global coordinate system 398# translate local coordinates to global coordinate system
291sub coord2global { 399sub coord2global {
292 my ($self, $x, $y) = @_; 400 my ($self, $x, $y) = @_;
293 401
294 my ($X, $Y) = $self->_topleft; 402 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 403}
297 404
298sub focus_in { 405sub focus_in {
299 my ($self) = @_; 406 my ($self) = @_;
300 407
301 return if $FOCUS == $self; 408 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 409 return unless $self->{can_focus};
303 410
304 my $focus = $FOCUS; $FOCUS = $self; 411 my $focus = $FOCUS; $FOCUS = $self;
305 412
306 $self->emit (focus_in => $focus); 413 $self->_emit (focus_in => $focus);
307 414
308 $focus->update if $focus; 415 $focus->update if $focus;
309 $FOCUS->update; 416 $FOCUS->update;
310} 417}
311 418
… …
314 421
315 return unless $FOCUS == $self; 422 return unless $FOCUS == $self;
316 423
317 my $focus = $FOCUS; undef $FOCUS; 424 my $focus = $FOCUS; undef $FOCUS;
318 425
319 $self->emit (focus_out => $focus); 426 $self->_emit (focus_out => $focus);
320 427
321 $focus->update if $focus; #? 428 $focus->update if $focus; #?
429
430 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
431 unless $FOCUS;
322} 432}
323 433
324sub mouse_motion { } 434sub mouse_motion { }
325sub button_up { } 435sub button_up { }
326sub key_down { } 436sub key_down { }
327sub key_up { } 437sub key_up { }
328 438
329sub button_down { 439sub button_down {
330 my ($self, $ev, $x, $y) = @_; 440 my ($self, $ev, $x, $y) = @_;
331 441
332 $self->focus_in; 442 $self->focus_in;
… …
366 if ($ENV{PCLIENT_DEBUG}) { 476 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix; 477 glPushMatrix;
368 glColor 1, 1, 0, 1; 478 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP; 480 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 481 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 482 glVertex $self->{w} - 1, 0;
373 glVertex $self->{w}, $self->{h}; 483 glVertex $self->{w} - 1, $self->{h} - 1;
374 glVertex 0 , $self->{h}; 484 glVertex 0 , $self->{h} - 1;
375 glEnd; 485 glEnd;
376 glPopMatrix; 486 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 488 }
379} 489}
380 490
381sub _draw { 491sub _draw {
382 my ($self) = @_; 492 my ($self) = @_;
… …
398 508
399sub set_parent { 509sub set_parent {
400 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
401 511
402 Scalar::Util::weaken ($self->{parent} = $parent); 512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible;
515
516 $self->check_size;
517 $self->show;
403} 518}
404 519
405sub check_size { 520sub check_size {
406 my ($self) = @_; 521 my ($self, $forced) = @_;
407 522
408 $self->{parent} 523 $self->{force_alloc} = 1 if $forced;
409 or return 1; 524 $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} 525}
430 526
431sub update { 527sub update {
432 my ($self) = @_; 528 my ($self) = @_;
433 529
… …
439 my ($self, $signal, $cb) = @_; 535 my ($self, $signal, $cb) = @_;
440 536
441 push @{ $self->{signal_cb}{$signal} }, $cb; 537 push @{ $self->{signal_cb}{$signal} }, $cb;
442} 538}
443 539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
444sub emit { 546sub emit {
445 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
446 548
447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
448} 555}
449 556
450sub DESTROY { 557sub DESTROY {
451 my ($self) = @_; 558 my ($self) = @_;
452 559
560 delete $WIDGET{$self+0};
453 #$self->deactivate; 561 #$self->deactivate;
454} 562}
455 563
456############################################################################# 564#############################################################################
457 565
… …
466 my $class = shift; 574 my $class = shift;
467 575
468 # range [value, low, high, page] 576 # range [value, low, high, page]
469 577
470 $class->SUPER::new ( 578 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 579 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 580 #active_bg => [1, 1, 1, 0.5],
473 @_ 581 @_
474 ) 582 )
475} 583}
476 584
477sub _draw { 585sub _draw {
478 my ($self) = @_; 586 my ($self) = @_;
479 587
588 my $color = $FOCUS == $self && $self->{active_bg}
589 ? $self->{active_bg}
590 : $self->{bg};
591
592 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 593 my ($w, $h) = @$self{qw(w h)};
481 594
482 glEnable GL_BLEND; 595 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 597 glColor @$color;
485 598
486 glBegin GL_QUADS; 599 glBegin GL_QUADS;
487 glVertex 0 , 0; 600 glVertex 0 , 0;
488 glVertex 0 , $h; 601 glVertex 0 , $h;
489 glVertex $w, $h; 602 glVertex $w, $h;
490 glVertex $w, 0; 603 glVertex $w, 0;
491 glEnd; 604 glEnd;
492 605
493 glDisable GL_BLEND; 606 glDisable GL_BLEND;
607 }
494} 608}
495 609
496############################################################################# 610#############################################################################
497 611
498package CFClient::UI::Empty; 612package CFClient::UI::Empty;
… …
530 644
531 $self 645 $self
532} 646}
533 647
534sub add { 648sub add {
535 my ($self, $child) = @_; 649 my ($self, @widgets) = @_;
536 650
537 $child->set_parent ($self); 651 $_->set_parent ($self)
652 for @widgets;
538 653
539 use sort 'stable'; 654 use sort 'stable';
540 655
541 $self->{children} = [ 656 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 657 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 658 @{$self->{children}}, @widgets
544 ]; 659 ];
545 660
546 $child->check_size; 661 $self->check_size (1);
547 $self->update; 662 $self->update;
548} 663}
549 664
550sub children { 665sub children {
551 @{ $_[0]{children} } 666 @{ $_[0]{children} }
… …
557 delete $child->{parent}; 672 delete $child->{parent};
558 $child->hide; 673 $child->hide;
559 674
560 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
561 676
562 $self->check_size; 677 $self->check_size (1);
563 $self->update; 678 $self->update;
564} 679}
565 680
566sub clear { 681sub clear {
567 my ($self) = @_; 682 my ($self) = @_;
… …
658} 773}
659 774
660sub update { 775sub update {
661 my ($self) = @_; 776 my ($self) = @_;
662 777
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 778 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 779 $self->SUPER::update;
665} 780}
666 781
667sub size_allocate { 782sub size_allocate {
668 my ($self, $w, $h) = @_; 783 my ($self, $w, $h) = @_;
… …
681 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
682 glClearColor 0, 0, 0, 0; 797 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT; 798 glClear GL_COLOR_BUFFER_BIT;
684 799
685 $self->_render; 800 $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 }; 801 };
694} 802}
695 803
696sub _draw { 804sub _draw {
697 my ($self) = @_; 805 my ($self) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 807 my ($w, $h) = ($self->w, $self->h);
700 808
701 my $tex = $self->{texture} 809 my $tex = $self->{texture}
702 or return; 810 or return;
703 811
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 812 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 814 glColor 1, 1, 1, 1;
709 815
710 $tex->draw_quad (0, 0, $w, $h); 816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 817
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 818 glDisable GL_TEXTURE_2D;
714} 819}
715 820
716############################################################################# 821#############################################################################
717 822
718package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
719 824
720our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
721 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
722sub size_request { 837sub size_request {
723 my ($self) = @_; 838 my ($self) = @_;
724 839
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 @$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 841
728 @$self{qw(child_w child_h)} 842 @$self{qw(child_w child_h)}
729} 843}
730 844
731sub size_allocate { 845sub size_allocate {
732 my ($self, $w, $h) = @_; 846 my ($self, $w, $h) = @_;
733 847
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850
851 $self->child->configure (0, 0, $w, $h);
734 $self->update; 852 $self->update;
735} 853}
736 854
737sub set_offset { 855sub set_offset {
738 my ($self, $x, $y) = @_; 856 my ($self, $x, $y) = @_;
… …
741 $self->{view_y} = int $y; 859 $self->{view_y} = int $y;
742 860
743 $self->update; 861 $self->update;
744} 862}
745 863
746# hmm, this does not work for topleft of $self... but we should not aks for that 864# hmm, this does not work for topleft of $self... but we should not ask for that
747sub _topleft { 865sub coord2local {
748 my ($self, $x, $y) = @_; 866 my ($self, $x, $y) = @_;
749 867
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 868 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
869}
870
871sub coord2global {
872 my ($self, $x, $y) = @_;
873
874 $x = List::Util::min $self->{w}, $x - $self->{view_x};
875 $y = List::Util::min $self->{h}, $y - $self->{view_y};
876
877 $self->SUPER::coord2global ($x, $y)
751} 878}
752 879
753sub find_widget { 880sub find_widget {
754 my ($self, $x, $y) = @_; 881 my ($self, $x, $y) = @_;
755 882
… …
780 my $class = shift; 907 my $class = shift;
781 908
782 my $self; 909 my $self;
783 910
784 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
785 vertical => 1, 912 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub { 914 on_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 915 $self->{vp}->set_offset (0, $_[1]);
789 }, 916 },
790 ; 917 ;
791 918
792 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort), 920 vp => (new CFClient::UI::ViewPort expand => 1),
794 slider => $slider, 921 slider => $slider,
795 @_, 922 @_,
796 ); 923 );
797 924
798 $self->{vp}->add ($self->{scrolled}); 925 $self->{vp}->add ($self->{scrolled});
… …
800 $self->add ($self->{slider}); 927 $self->add ($self->{slider});
801 928
802 $self 929 $self
803} 930}
804 931
932sub update {
933 my ($self) = @_;
934
935 $self->SUPER::update;
936
937 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940}
941
942sub size_allocate {
943 my ($self, $w, $h) = @_;
944
945 $self->SUPER::size_allocate ($w, $h);
946
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949}
950
805#TODO# update range on size_allocate depeneing on child 951#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 952# update viewport offset on scroll
807 953
808############################################################################# 954#############################################################################
809 955
810package CFClient::UI::Frame; 956package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 960use CFClient::OpenGL;
815 961
816sub new { 962sub new {
817 my $class = shift; 963 my $class = shift;
818 964
819 my $self = $class->SUPER::new ( 965 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 966 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 967 @_,
824 ); 968 )
825
826 $self
827} 969}
828 970
829sub _draw { 971sub _draw {
830 my ($self) = @_; 972 my ($self) = @_;
831 973
832 my ($w, $h) = ($self->{w}, $self->{h}); 974 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)};
833 976
834 glEnable GL_BLEND; 977 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 979 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 980
839# glBegin GL_QUADS; 981 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 982 glVertex 0 , 0;
842# glVertex 0 , $h; 983 glVertex 0 , $h;
843# glVertex $w, $h; 984 glVertex $w, $h;
844# glVertex $w, 0; 985 glVertex $w, 0;
845# glEnd; 986 glEnd;
846 987
847
848 $self->child->draw;
849 glDisable GL_BLEND; 988 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 989 }
990
991 $self->SUPER::_draw;
851} 992}
852 993
853############################################################################# 994#############################################################################
854 995
855package CFClient::UI::FancyFrame; 996package CFClient::UI::FancyFrame;
… …
863 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
864 1005
865sub new { 1006sub new {
866 my $class = shift; 1007 my $class = shift;
867 1008
868 # TODO: user_x, user_y, overwrite moveto?
869
870 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 1010 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 1011 border_bg => [1, 1, 1, 1],
873 border => 0.6, 1012 border => 0.6,
1013 is_toplevel => 1,
874 can_events => 1, 1014 can_events => 1,
875 @_ 1015 @_
876 ); 1016 );
877 1017
878 $self->{title} &&= new CFClient::UI::Label 1018 $self->{title} &&= new CFClient::UI::Label
879 align => 0, 1019 align => 0,
… …
903 my ($self, $w, $h) = @_; 1043 my ($self, $w, $h) = @_;
904 1044
905 $h -= List::Util::max 0, $self->border * 2; 1045 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 1046 $w -= List::Util::max 0, $self->border * 2;
907 1047
908 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1048 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
909 if $self->{title}; 1049 if $self->{title};
910 1050
911 $self->child->configure ($self->border, $self->border, $w, $h); 1051 $self->child->configure ($self->border, $self->border, $w, $h);
912} 1052}
913 1053
… …
932 my ($ev, $x, $y) = @_; 1072 my ($ev, $x, $y) = @_;
933 1073
934 my $dx = $ev->{x} - $ox; 1074 my $dx = $ev->{x} - $ox;
935 my $dy = $ev->{y} - $oy; 1075 my $dy = $ev->{y} - $oy;
936 1076
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
937 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
938 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
939 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1081 $self->move ($self->{user_x}, $self->{user_y});
940 $self->check_size; 1082 $self->check_size;
941 }; 1083 };
942 1084
943 } elsif ($lr ^ $td) { 1085 } elsif ($lr ^ $td) {
944 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1086 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
947 $self->{motion} = sub { 1089 $self->{motion} = sub {
948 my ($ev, $x, $y) = @_; 1090 my ($ev, $x, $y) = @_;
949 1091
950 ($x, $y) = ($ev->{x}, $ev->{y}); 1092 ($x, $y) = ($ev->{x}, $ev->{y});
951 1093
952 $self->move ($bx + $x - $ox, $by + $y - $oy); 1094 $self->{user_x} = $bx + $x - $ox;
1095 $self->{user_y} = $by + $y - $oy;
1096
1097 $self->move ($self->{user_x}, $self->{user_y});
953 $self->update; 1098 $self->update;
954 }; 1099 };
955 } 1100 }
956} 1101}
957 1102
… …
971 my ($self) = @_; 1116 my ($self) = @_;
972 1117
973 my ($w, $h ) = ($self->{w}, $self->{h}); 1118 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1119 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 1120
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 1121 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1122 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 1123
981 my $border = $self->border; 1124 my $border = $self->border;
982 1125
983 glColor @{ $self->{border_bg} }; 1126 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 1127 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 1128 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1129 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1130 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988 1131
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1132 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1133 my $bg = $tex[0];
991 1134
992 # TODO: repeat texture not scale 1135 # TODO: repeat texture not scale
… …
996 glColor @{ $self->{bg} }; 1139 glColor @{ $self->{bg} };
997 1140
998 $bg->{s} = $rep_x; 1141 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y; 1142 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1; 1143 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1144 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145 }
1002 1146
1003 glDisable GL_TEXTURE_2D; 1147 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1148
1007 $self->{title}->draw if $self->{title}; 1149 $self->{title}->draw if $self->{title};
1008 1150
1009 $self->child->draw; 1151 $self->child->draw;
1010} 1152}
… …
1022sub new { 1164sub new {
1023 my $class = shift; 1165 my $class = shift;
1024 1166
1025 $class->SUPER::new ( 1167 $class->SUPER::new (
1026 col_expand => [], 1168 col_expand => [],
1027 @_ 1169 @_,
1028 ) 1170 )
1171}
1172
1173sub children {
1174 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1029} 1175}
1030 1176
1031sub add { 1177sub add {
1032 my ($self, $x, $y, $child) = @_; 1178 my ($self, $x, $y, $child) = @_;
1033 1179
1034 $child->set_parent ($self); 1180 $child->set_parent ($self);
1035 $self->{children}[$y][$x] = $child; 1181 $self->{children}[$y][$x] = $child;
1036 1182
1037 $child->check_size; 1183 $self->check_size (1);
1038} 1184}
1039 1185
1040sub children {
1041 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1042}
1043
1044# TODO: move to container class maybe? send childs a signal on removal? 1186# TODO: move to container class maybe? send children a signal on removal?
1045sub clear { 1187sub clear {
1046 my ($self) = @_; 1188 my ($self) = @_;
1047 1189
1048 my @children = $self->children; 1190 my @children = $self->children;
1049 delete $self->{children}; 1191 delete $self->{children};
… …
1051 for (@children) { 1193 for (@children) {
1052 delete $_->{parent}; 1194 delete $_->{parent};
1053 $_->hide; 1195 $_->hide;
1054 } 1196 }
1055 1197
1198 $self->check_size (1);
1056 $self->update; 1199 $self->update;
1057} 1200}
1058 1201
1059sub get_wh { 1202sub get_wh {
1060 my ($self) = @_; 1203 my ($self) = @_;
… …
1092sub size_allocate { 1235sub size_allocate {
1093 my ($self, $w, $h) = @_; 1236 my ($self, $w, $h) = @_;
1094 1237
1095 my ($ws, $hs) = $self->get_wh; 1238 my ($ws, $hs) = $self->get_wh;
1096 1239
1097 my $req_w = sum @$ws; 1240 my $req_w = (sum @$ws) || 1;
1098 my $req_h = sum @$hs; 1241 my $req_h = (sum @$hs) || 1;
1099 1242
1100 # TODO: nicer code && do row_expand 1243 # TODO: nicer code && do row_expand
1101 my @col_expand = @{$self->{col_expand}}; 1244 my @col_expand = @{$self->{col_expand}};
1102 @col_expand = (1) x @$ws unless @col_expand; 1245 @col_expand = (1) x @$ws unless @col_expand;
1103 my $col_expand = (sum @col_expand) || 1; 1246 my $col_expand = (sum @col_expand) || 1;
… …
1157 } 1300 }
1158} 1301}
1159 1302
1160############################################################################# 1303#############################################################################
1161 1304
1162package CFClient::UI::HBox; 1305package CFClient::UI::Box;
1163
1164# TODO: wrap into common Box base class
1165 1306
1166our @ISA = CFClient::UI::Container::; 1307our @ISA = CFClient::UI::Container::;
1167 1308
1168sub size_request { 1309sub size_request {
1169 my ($self) = @_; 1310 my ($self) = @_;
1170 1311
1171 my @alloc = map [$_->size_request], @{$self->{children}}; 1312 $self->{vertical}
1172 1313 ? (
1173 ( 1314 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1174 (List::Util::sum map $_->[0], @alloc), 1315 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1175 (List::Util::max map $_->[1], @alloc), 1316 )
1176 ) 1317 : (
1318 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1320 )
1177} 1321}
1178 1322
1179sub size_allocate { 1323sub size_allocate {
1180 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1181 1325
1182 ($h, $w) = ($w, $h); 1326 my $space = $self->{vertical} ? $h : $w;
1183
1184 my $children = $self->{children}; 1327 my $children = $self->{children};
1185 1328
1186 my @h = map $_->{req_w}, @$children; 1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1187
1188 my $req_h = List::Util::sum @h; 1330 my $req = List::Util::sum @req;
1189 1331
1190 if ($req_h > $h) { 1332 if ($req > $space) {
1191 # ah well, not enough space 1333 # ah well, not enough space
1192 $_ *= $h / $req_h for @h; 1334 $_ *= $space / $req for @req;
1193 } else { 1335 } else {
1194 my $exp = List::Util::sum map $_->{expand}, @$children; 1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1195 $exp ||= 1;
1196 1337
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1197 for (0 .. $#$children) { 1339 for 0 .. $#$children;
1198 my $child = $children->[$_];
1199
1200 my $alloc_h = $h[$_];
1201 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1202 $h[$_] = $alloc_h;
1203 }
1204 } 1340 }
1205 1341
1206 CFClient::UI::harmonize \@h; 1342 CFClient::UI::harmonize \@req;
1207 1343
1208 my $y = 0; 1344 my $pos = 0;
1209 for (0 .. $#$children) { 1345 for (0 .. $#$children) {
1210 my $child = $children->[$_];
1211 my $h = $h[$_]; 1346 my $alloc = $req[$_];
1212 $child->configure ($y, 0, $h, $w); 1347 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1213 1348
1214 $y += $h; 1349 $pos += $alloc;
1215 } 1350 }
1216 1351
1217 1 1352 1
1218} 1353}
1219 1354
1220############################################################################# 1355#############################################################################
1221 1356
1357package CFClient::UI::HBox;
1358
1359our @ISA = CFClient::UI::Box::;
1360
1361sub new {
1362 my $class = shift;
1363
1364 $class->SUPER::new (
1365 vertical => 0,
1366 @_,
1367 )
1368}
1369
1370#############################################################################
1371
1222package CFClient::UI::VBox; 1372package CFClient::UI::VBox;
1223 1373
1224# TODO: wrap into common Box base class
1225
1226our @ISA = CFClient::UI::Container::; 1374our @ISA = CFClient::UI::Box::;
1227 1375
1228sub size_request { 1376sub new {
1229 my ($self) = @_; 1377 my $class = shift;
1230 1378
1231 my @alloc = map [$_->size_request], @{$self->{children}}; 1379 $class->SUPER::new (
1232 1380 vertical => 1,
1233 ( 1381 @_,
1234 (List::Util::max map $_->[0], @alloc),
1235 (List::Util::sum map $_->[1], @alloc),
1236 ) 1382 )
1237} 1383}
1238 1384
1239sub size_allocate {
1240 my ($self, $w, $h) = @_;
1241
1242 my $children = $self->{children};
1243
1244 my @h = map $_->{req_h}, @$children;
1245
1246 my $req_h = List::Util::sum @h;
1247
1248 if ($req_h > $h) {
1249 # ah well, not enough space
1250 $_ *= $h / $req_h for @h;
1251 } else {
1252 my $exp = List::Util::sum map $_->{expand}, @$children;
1253 $exp ||= 1;
1254
1255 for (0 .. $#$children) {
1256 my $child = $children->[$_];
1257
1258 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1259 }
1260 }
1261
1262 CFClient::UI::harmonize \@h;
1263
1264 my $y = 0;
1265 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_];
1268 $child->configure (0, $y, $w, $h);
1269
1270 $y += $h;
1271 }
1272
1273 1
1274}
1275
1276############################################################################# 1385#############################################################################
1277 1386
1278package CFClient::UI::Label; 1387package CFClient::UI::Label;
1279 1388
1280our @ISA = CFClient::UI::Base::; 1389our @ISA = CFClient::UI::DrawBG::;
1281 1390
1282use CFClient::OpenGL; 1391use CFClient::OpenGL;
1283 1392
1284sub new { 1393sub new {
1285 my ($class, %arg) = @_; 1394 my ($class, %arg) = @_;
1286 1395
1287 my $self = $class->SUPER::new ( 1396 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1397 fg => [1, 1, 1],
1398 #bg => none
1399 #active_bg => none
1289 #font => default_font 1400 #font => default_font
1401 #text => initial text
1402 #markup => initial narkup
1403 #max_w => maximum pixel width
1404 ellipsise => 3, # end
1405 layout => (new CFClient::Layout),
1290 fontsize => 1, 1406 fontsize => 1,
1291 text => "",
1292 align => -1, 1407 align => -1,
1293 valign => -1, 1408 valign => -1,
1294 padding => 2, 1409 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1410 can_events => 0,
1297 %arg 1411 %arg
1298 ); 1412 );
1299 1413
1300 if (exists $self->{template}) { 1414 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1415 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1416 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1417 $self->{template} = $layout;
1304 } 1418 }
1305 1419
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1420 if (exists $self->{markup}) {
1307 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1421 $self->set_markup (delete $self->{markup});
1422 } else {
1423 $self->set_text (delete $self->{text});
1424 }
1308 1425
1309 $self 1426 $self
1310} 1427}
1311 1428
1312sub escape { 1429sub escape($) {
1313 local $_ = $_[1]; 1430 local $_ = $_[0];
1314 1431
1315 s/&/&amp;/g; 1432 s/&/&amp;/g;
1316 s/>/&gt;/g; 1433 s/>/&gt;/g;
1317 s/</&lt;/g; 1434 s/</&lt;/g;
1318 1435
1319 $_[1] 1436 $_
1320} 1437}
1321 1438
1322sub update { 1439sub update {
1323 my ($self) = @_; 1440 my ($self) = @_;
1324 1441
… …
1330 my ($self, $text) = @_; 1447 my ($self, $text) = @_;
1331 1448
1332 return if $self->{text} eq "T$text"; 1449 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1450 $self->{text} = "T$text";
1334 1451
1452 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1453 $self->{layout}->set_text ($text);
1336 1454
1337 delete $self->{texture};
1338 $self->update; 1455 $self->update;
1339 $self->check_size; 1456 $self->check_size;
1340} 1457}
1341 1458
1342sub set_markup { 1459sub set_markup {
1343 my ($self, $markup) = @_; 1460 my ($self, $markup) = @_;
1344 1461
1345 return if $self->{text} eq "M$markup"; 1462 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1463 $self->{text} = "M$markup";
1347 1464
1465 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466
1467 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1468 $self->{layout}->set_markup ($markup);
1349 1469
1350 delete $self->{texture};
1351 $self->update; 1470 $self->update;
1352 $self->check_size; 1471 $self->check_size;
1353} 1472}
1354 1473
1355sub size_request { 1474sub size_request {
1356 my ($self) = @_; 1475 my ($self) = @_;
1357 1476
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1477 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $self->{layout}->set_width ($self->{max_w} || -1); 1478 $self->{layout}->set_width ($self->{max_w} || -1);
1479 $self->{layout}->set_ellipsise ($self->{ellipsise});
1480 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1481 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1482
1362 my ($w, $h) = $self->{layout}->size; 1483 my ($w, $h) = $self->{layout}->size;
1363 1484
1364 if (exists $self->{template}) { 1485 if (exists $self->{template}) {
… …
1394} 1515}
1395 1516
1396sub _draw { 1517sub _draw {
1397 my ($self) = @_; 1518 my ($self) = @_;
1398 1519
1520 $self->SUPER::_draw; # draw background, if applicable
1521
1399 my $tex = $self->{texture} ||= do { 1522 my $tex = $self->{texture} ||= do {
1523 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1524 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1525 $self->{layout}->set_width ($self->{w});
1526 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529
1403 new_from_layout CFClient::Texture $self->{layout} 1530 my $tex = new_from_layout CFClient::Texture $self->{layout};
1531
1532 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1533 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1534 : ($self->{w} - $tex->{w}) * 0.5);
1535
1536 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1537 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1538 : ($self->{h} - $tex->{h}) * 0.5);
1539
1540 $tex
1404 }; 1541 };
1405 1542
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1543 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1545
1546 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1547 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}); 1548 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1549 } else {
1550 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1551 }
1426 1552
1427 glDisable GL_TEXTURE_2D; 1553 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1554}
1430 1555
1431############################################################################# 1556#############################################################################
1432 1557
1433package CFClient::UI::EntryBase; 1558package CFClient::UI::EntryBase;
… …
1446 active_fg => [0, 0, 0], 1571 active_fg => [0, 0, 0],
1447 can_hover => 1, 1572 can_hover => 1,
1448 can_focus => 1, 1573 can_focus => 1,
1449 valign => 0, 1574 valign => 0,
1450 can_events => 1, 1575 can_events => 1,
1576 #text => ...
1451 @_ 1577 @_
1452 ) 1578 )
1453} 1579}
1454 1580
1455sub _set_text { 1581sub _set_text {
… …
1465 $self->{text} = $text; 1591 $self->{text} = $text;
1466 1592
1467 $text =~ s/./*/g if $self->{hidden}; 1593 $text =~ s/./*/g if $self->{hidden};
1468 $self->{layout}->set_text ("$text "); 1594 $self->{layout}->set_text ("$text ");
1469 1595
1470 $self->emit (changed => $self->{text}); 1596 $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} 1597}
1490 1598
1491sub set_text { 1599sub set_text {
1492 my ($self, $text) = @_; 1600 my ($self, $text) = @_;
1493 1601
1494 $self->{cursor} = length $text; 1602 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1603 $self->_set_text ($text);
1496 $self->update; 1604 $self->update;
1605 $self->check_size;
1606}
1607
1608sub get_text {
1609 $_[0]{text}
1610}
1611
1612sub size_request {
1613 my ($self) = @_;
1614
1615 my ($w, $h) = $self->SUPER::size_request;
1616
1617 ($w + 1, $h) # add 1 for cursor
1497} 1618}
1498 1619
1499sub key_down { 1620sub key_down {
1500 my ($self, $ev) = @_; 1621 my ($self, $ev) = @_;
1501 1622
… …
1503 my $sym = $ev->{sym}; 1624 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1625 my $uni = $ev->{unicode};
1505 1626
1506 my $text = $self->get_text; 1627 my $text = $self->get_text;
1507 1628
1508 if ($sym == 8) { 1629 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1630 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1631 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1632 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1633 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1634 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1635 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1636 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1637 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1638 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1639 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1640 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1641 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1642 $self->_emit ('escape');
1522 } elsif ($uni) { 1643 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1644 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1645 }
1525 1646
1526 $self->_set_text ($text); 1647 $self->_set_text ($text);
1527 $self->update; 1648 $self->update;
1649 $self->check_size;
1528} 1650}
1529 1651
1530sub focus_in { 1652sub focus_in {
1531 my ($self) = @_; 1653 my ($self) = @_;
1532 1654
… …
1612 if ($sym == 13) { 1734 if ($sym == 13) {
1613 unshift @{$self->{history}}, 1735 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 1736 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1; 1737 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 1738 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 1739 $self->_emit (activate => $txt);
1618 $self->update; 1740 $self->update;
1619 1741
1620 } elsif ($sym == CFClient::SDLK_UP) { 1742 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 1743 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 1744 $self->{history_saveback} = $self->get_text;
… …
1661 my $class = shift; 1783 my $class = shift;
1662 1784
1663 $class->SUPER::new ( 1785 $class->SUPER::new (
1664 padding => 4, 1786 padding => 4,
1665 fg => [1, 1, 1], 1787 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1788 active_fg => [0, 0, 1],
1668 can_hover => 1, 1789 can_hover => 1,
1669 align => 0, 1790 align => 0,
1670 valign => 0, 1791 valign => 0,
1671 can_events => 1, 1792 can_events => 1,
1672 @_ 1793 @_
1673 ) 1794 )
1674} 1795}
1675 1796
1797sub activate { }
1798
1676sub button_up { 1799sub button_up {
1677 my ($self, $ev, $x, $y) = @_; 1800 my ($self, $ev, $x, $y) = @_;
1678 1801
1802 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 1803 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 1804 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate");
1682 }
1683} 1805}
1684 1806
1685sub _draw { 1807sub _draw {
1686 my ($self) = @_; 1808 my ($self) = @_;
1687 1809
… …
1689 1811
1690 if ($GRAB == $self) { 1812 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1813 $self->{fg} = $self->{active_fg};
1692 } 1814 }
1693 1815
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1816 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1818 glColor 0, 0, 0, 1;
1699 1819
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1820 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1821
1702 glDisable GL_TEXTURE_2D; 1822 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1823
1705 $self->SUPER::_draw; 1824 $self->SUPER::_draw;
1706} 1825}
1707 1826
1708############################################################################# 1827#############################################################################
… …
1722 1841
1723 $class->SUPER::new ( 1842 $class->SUPER::new (
1724 padding => 2, 1843 padding => 2,
1725 fg => [1, 1, 1], 1844 fg => [1, 1, 1],
1726 active_fg => [1, 1, 0], 1845 active_fg => [1, 1, 0],
1846 bg => [0, 0, 0, 0.2],
1847 active_bg => [1, 1, 1, 0.5],
1727 state => 0, 1848 state => 0,
1728 can_hover => 1, 1849 can_hover => 1,
1729 @_ 1850 @_
1730 ) 1851 )
1731} 1852}
… …
1740 my ($self, $ev, $x, $y) = @_; 1861 my ($self, $ev, $x, $y) = @_;
1741 1862
1742 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1863 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1743 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1864 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1744 $self->{state} = !$self->{state}; 1865 $self->{state} = !$self->{state};
1745 $self->emit (changed => $self->{state}); 1866 $self->_emit (changed => $self->{state});
1746 } 1867 }
1747} 1868}
1748 1869
1749sub _draw { 1870sub _draw {
1750 my ($self) = @_; 1871 my ($self) = @_;
… …
1755 1876
1756 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1877 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1757 1878
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1879 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1880
1760 glEnable GL_BLEND; 1881 my $tex = $self->{state} ? $tex[1] : $tex[0];
1882
1761 glEnable GL_TEXTURE_2D; 1883 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); 1884 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1885 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1886}
1771 1887
1772############################################################################# 1888#############################################################################
1773 1889
1774package CFClient::UI::Image; 1890package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1933 glTranslate 0, -$self->{w}, 0;
1818 1934
1819 ($w, $h) = ($h, $w); 1935 ($w, $h) = ($h, $w);
1820 } 1936 }
1821 1937
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1938 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1939 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1940
1827 $tex->draw_quad (0, 0, $w, $h); 1941 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1942
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1943 glDisable GL_TEXTURE_2D;
1831} 1944}
1832 1945
1833############################################################################# 1946#############################################################################
1834 1947
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2136 qw(s1_slider.png s1_slider_bg.png);
2024 2137
2025sub new { 2138sub new {
2026 my $class = shift; 2139 my $class = shift;
2027 2140
2028 # range [value, low, high, page] 2141 # range [value, low, high, page, unit]
2029 2142
2030 # TODO: 0-width page 2143 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2144 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2145 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2146 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2147 fg => [1, 1, 1],
2035 active_fg => [0, 0, 0], 2148 active_fg => [0, 0, 0],
2149 bg => [0, 0, 0, 0.2],
2150 active_bg => [1, 1, 1, 0.5],
2036 range => [0, 0, 100, 10], 2151 range => [0, 0, 100, 10, 0],
2037 req_w => $::WIDTH / 80, 2152 req_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2153 req_h => $::WIDTH / 80,
2039 vertical => 0, 2154 vertical => 0,
2040 can_hover => 1, 2155 can_hover => 1,
2041 inner_pad => 5, 2156 inner_pad => 0.02,
2042 @_ 2157 @_
2043 ); 2158 );
2044 2159
2160 $self->set_value ($self->{range}[0]);
2161 $self->update;
2162
2045 $self 2163 $self
2164}
2165
2166sub set_range {
2167 my ($self, $range) = @_;
2168
2169 ($range, $self->{range}) = ($self->{range}, $range);
2170
2171 $self->update
2172 if "@$range" ne "@{$self->{range}}";
2173}
2174
2175sub set_value {
2176 my ($self, $value) = @_;
2177
2178 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2179
2180 $hi = $lo + 1 if $hi <= $lo;
2181
2182 $page = $hi - $lo if $page > $hi - $lo;
2183
2184 $value = $lo if $value < $lo;
2185 $value = $hi - $page if $value > $hi - $page;
2186
2187 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2188 if $unit;
2189
2190 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2191
2192 if ($value != $old_value) {
2193 $self->_emit (changed => $value);
2194 $self->update;
2195 }
2046} 2196}
2047 2197
2048sub size_request { 2198sub size_request {
2049 my ($self) = @_; 2199 my ($self) = @_;
2050 2200
… …
2056 2206
2057sub button_down { 2207sub button_down {
2058 my ($self, $ev, $x, $y) = @_; 2208 my ($self, $ev, $x, $y) = @_;
2059 2209
2060 $self->SUPER::button_down ($ev, $x, $y); 2210 $self->SUPER::button_down ($ev, $x, $y);
2211
2212 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2213
2061 $self->mouse_motion ($ev, $x, $y); 2214 $self->mouse_motion ($ev, $x, $y);
2062} 2215}
2063 2216
2064sub mouse_motion { 2217sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
2066 2219
2067 if ($GRAB == $self) { 2220 if ($GRAB == $self) {
2221 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2222
2223 my (undef, $lo, $hi, $page) = @{$self->{range}};
2224
2225 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2226
2227 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2228 }
2229}
2230
2231sub update {
2232 my ($self) = @_;
2233
2234 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2235 $self->set_value ($self->{range}[0]);
2236
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2237 my ($value, $lo, $hi, $page) = @{$self->{range}};
2238 my $range = ($hi - $page - $lo) || 1e-100;
2069 2239
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2240 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2071 2241
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2242 $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 2243 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2074 2244
2075 $x -= $inner_pad_px; # substract the padding 2245 $value = ($value - $lo) / $range;
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2246 $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 2247
2081 $self->emit (changed => $x); 2248 $self->{knob_x} = $value - $knob_w * 0.5;
2082 $self->update; 2249 $self->{knob_w} = $knob_w;
2083 } 2250 });
2084}
2085 2251
2086# the inner_* stuff is for generating a padding for the slider handle, 2252 $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} 2253}
2093 2254
2094sub _draw { 2255sub _draw {
2095 my ($self) = @_; 2256 my ($self) = @_;
2096 2257
2097 $self->SUPER::_draw (); 2258 $self->SUPER::_draw ();
2098 2259
2099 my ($w, $h) = @$self{qw(w h)}; 2260 glScale $self->{w}, $self->{h};
2100 2261
2101 if ($self->{vertical}) { 2262 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2263 # draw a vertical slider like a rotated horizontal slider
2103 2264
2265 glTranslate 1, 0, 0;
2104 glRotate 90, 0, 0, 1; 2266 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2267 }
2109 2268
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2269 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2270 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2271
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; 2272 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2274
2136 # draw background 2275 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2276 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2277
2139 # draw handle 2278 # draw handle
2140 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2279 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2141 2280
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2281 glDisable GL_TEXTURE_2D;
2144} 2282}
2283
2284#############################################################################
2285
2286package CFClient::UI::ValSlider;
2287
2288our @ISA = CFClient::UI::HBox::;
2289
2290sub new {
2291 my ($class, %arg) = @_;
2292
2293 my $range = delete $arg{range};
2294
2295 my $self = $class->SUPER::new (
2296 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2297 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2298 to_value => sub { shift },
2299 from_value => sub { shift },
2300 %arg,
2301 );
2302
2303 $self->{slider}->connect (changed => sub {
2304 my ($self, $value) = @_;
2305 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2306 $self->{parent}->emit (changed => $value);
2307 });
2308
2309# $self->{entry}->connect (changed => sub {
2310# my ($self, $value) = @_;
2311# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2312# $self->{parent}->emit (changed => $value);
2313# });
2314
2315 $self->add ($self->{slider}, $self->{entry});
2316
2317 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2318
2319 $self
2320}
2321
2322sub set_range { shift->{slider}->set_range (@_) }
2323sub set_value { shift->{slider}->set_value (@_) }
2145 2324
2146############################################################################# 2325#############################################################################
2147 2326
2148package CFClient::UI::TextView; 2327package CFClient::UI::TextView;
2149 2328
… …
2158 fontsize => 1, 2337 fontsize => 1,
2159 can_events => 0, 2338 can_events => 0,
2160 #font => default_font 2339 #font => default_font
2161 @_, 2340 @_,
2162 2341
2163 layout => (new CFClient::Layout), 2342 layout => (new CFClient::Layout 1),
2164 par => [], 2343 par => [],
2165 height => 0, 2344 height => 0,
2166 children => [ 2345 children => [
2167 (new CFClient::UI::Empty expand => 1), 2346 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2347 (new CFClient::UI::Slider vertical => 1),
… …
2179 2358
2180 $self->{fontsize} = $fontsize; 2359 $self->{fontsize} = $fontsize;
2181 $self->reflow; 2360 $self->reflow;
2182} 2361}
2183 2362
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 { 2363sub size_allocate {
2204 my ($self, $w, $h) = @_; 2364 my ($self, $w, $h) = @_;
2205 2365
2206 $self->SUPER::size_allocate ($w, $h); 2366 $self->SUPER::size_allocate ($w, $h);
2207 2367
… …
2210 $self->{layout}->set_width ($self->{children}[0]{w}); 2370 $self->{layout}->set_width ($self->{children}[0]{w});
2211 2371
2212 $self->reflow; 2372 $self->reflow;
2213} 2373}
2214 2374
2375sub text_size {
2376 my ($self, $text, $indent) = @_;
2377
2378 my $layout = $self->{layout};
2379
2380 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2381 $layout->set_width ($self->{children}[0]{w} - $indent);
2382 $layout->set_markup ($text);
2383
2384 $layout->size
2385}
2386
2387sub reflow {
2388 my ($self) = @_;
2389
2390 $self->{need_reflow}++;
2391 $self->update;
2392}
2393
2394sub set_offset {
2395 my ($self, $offset) = @_;
2396
2397 # todo: base offset on lines or so, not on pixels
2398 $self->{children}[1]->set_value ($offset);
2399}
2400
2401sub clear {
2402 my ($self) = @_;
2403
2404 $self->{par} = [];
2405 $self->{height} = 0;
2406 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2407}
2408
2215sub add_paragraph { 2409sub add_paragraph {
2216 my ($self, $color, $text) = @_; 2410 my ($self, $color, $text, $indent) = @_;
2217 2411
2218 #TODO: intelligently "reformat" paragraph 2412 for my $line (split /\n/, $text) {
2219 2413 my ($w, $h) = $self->text_size ($line);
2220 my $height = $self->text_height ($text);
2221
2222 $self->{height} += $height; 2414 $self->{height} += $h;
2415 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2416 }
2223 2417
2224 push @{$self->{par}}, [$height, $color, $text];
2225
2226 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2418 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2227 $self->{children}[1]->update;
2228} 2419}
2229 2420
2230sub update { 2421sub update {
2231 my ($self) = @_; 2422 my ($self) = @_;
2232 2423
… …
2234 2425
2235 return unless $self->{h} > 0; 2426 return unless $self->{h} > 0;
2236 2427
2237 delete $self->{texture}; 2428 delete $self->{texture};
2238 2429
2239 $ROOT->on_refresh ($self, sub { 2430 $ROOT->on_post_alloc ($self, sub {
2431 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2432
2240 if (delete $self->{need_reflow}) { 2433 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2434 my $height = 0;
2242 2435
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2436 my $layout = $self->{layout};
2437
2438 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2439
2244 for @{$self->{par}}; 2440 for (@{$self->{par}}) {
2441 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2442 $layout->set_width ($W - $_->[3]);
2443 $layout->set_markup ($_->[4]);
2444 my ($w, $h) = $layout->size;
2445 $_->[0] = $w + $_->[3];
2446 $_->[1] = $h;
2447 }
2448
2449 $height += $_->[1];
2450 }
2245 2451
2246 $self->{height} = $height; 2452 $self->{height} = $height;
2247 2453
2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2454 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2249 2455
2250 delete $self->{texture}; 2456 delete $self->{texture};
2251 } 2457 }
2252 2458
2253 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2459 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2254 glClearColor 0, 0, 0, 0; 2460 glClearColor 0.5, 0.5, 0.5, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2461 glClear GL_COLOR_BUFFER_BIT;
2256 2462
2463 my $top = int $self->{children}[1]{range}[0];
2464
2465 my $y0 = $top;
2466 my $y1 = $top + $H;
2467
2468 my $y = 0;
2469
2470 my $layout = $self->{layout};
2471
2472 $layout->set_font ($self->{font}) if $self->{font};
2473
2257 glEnable GL_BLEND; 2474 glEnable GL_BLEND;
2475 #TODO# not correct in windows where rgba is forced off
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2476 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 2477
2273 for my $par (@{$self->{par}}) { 2478 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2479 my $h = $par->[1];
2275 2480
2276 if ($y0 < $y + $h && $y < $y1) { 2481 if ($y0 < $y + $h && $y < $y1) {
2482 $layout->set_foreground (@{ $par->[2] });
2483 $layout->set_width ($W - $par->[3]);
2277 $layout->set_text ($par->[2]); 2484 $layout->set_markup ($par->[4]);
2278 2485
2279 glColor @{ $par->[1] }; 2486 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 my ($W, $H) = $layout->size; 2487
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2488 glRasterPos $par->[3], $y - $y0;
2489 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282 } 2490 }
2283 2491
2284 $y += $h; 2492 $y += $h;
2285 } 2493 }
2286 2494
2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND; 2495 glDisable GL_BLEND;
2289 }; 2496 };
2290 }); 2497 });
2291} 2498}
2292 2499
2293sub _draw { 2500sub _draw {
2294 my ($self) = @_; 2501 my ($self) = @_;
2295 2502
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2503 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2505 glColor 1, 1, 1, 1;
2301 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2506 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2302 glDisable GL_TEXTURE_2D; 2507 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2508
2305 $self->{children}[1]->draw; 2509 $self->{children}[1]->draw;
2306 2510
2307} 2511}
2308 2512
… …
2356 2560
2357sub new { 2561sub new {
2358 my $class = shift; 2562 my $class = shift;
2359 2563
2360 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2361 state => 0, 2565 state => 0,
2362 connect_activate => \&toggle_flopper, 2566 on_activate => \&toggle_flopper,
2363 @_ 2567 @_
2364 ); 2568 );
2365 2569
2366 if ($self->{state}) {
2367 $self->{state} = 0;
2368 $self->toggle_flopper;
2369 }
2370
2371 $self 2570 $self
2372} 2571}
2373 2572
2374sub toggle_flopper { 2573sub toggle_flopper {
2375 my ($self) = @_; 2574 my ($self) = @_;
2376 2575
2377 # TODO: use animation 2576 $self->{other}->toggle_visibility;
2378 if ($self->{state} = !$self->{state}) {
2379 $CFClient::UI::ROOT->add ($self->{other});
2380 $self->{other}->move ($self->coord2global (0, $self->{h}));
2381 $self->emit ("open");
2382 } else {
2383 $CFClient::UI::ROOT->remove ($self->{other});
2384 $self->emit ("close");
2385 }
2386
2387 $self->emit (changed => $self->{state});
2388} 2577}
2389 2578
2390############################################################################# 2579#############################################################################
2391 2580
2392package CFClient::UI::Tooltip; 2581package CFClient::UI::Tooltip;
… …
2402 @_, 2591 @_,
2403 can_events => 0, 2592 can_events => 0,
2404 ) 2593 )
2405} 2594}
2406 2595
2407sub set_markup { 2596sub set_tooltip_from {
2408 my ($self, $text) = @_; 2597 my ($self, $widget) = @_;
2409 2598
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2599 $self->add (new CFClient::UI::Label
2411 $self->{label}->set_markup ($text); 2600 markup => $widget->{tooltip},
2412 $self->add ($self->{label}); 2601 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602 fontsize => 0.8,
2603 fg => [0, 0, 0, 1],
2604 ellipsise => 0,
2605 font => ($widget->{tooltip_font} || $::FONT_PROP),
2606 );
2413} 2607}
2414 2608
2415sub size_request { 2609sub size_request {
2416 my ($self) = @_; 2610 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2611
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2612 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2613
2422 ($w + 4, $h + 4) 2614 ($w + 4, $h + 4)
2423} 2615}
… …
2429} 2621}
2430 2622
2431sub _draw { 2623sub _draw {
2432 my ($self) = @_; 2624 my ($self) = @_;
2433 2625
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2626 glTranslate 0.375, 0.375;
2436 2627
2437 my ($w, $h) = @$self{qw(w h)}; 2628 my ($w, $h) = @$self{qw(w h)};
2438 2629
2439 glColor 1, 0.8, 0.4; 2630 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2641 glVertex 0 , $h;
2451 glVertex $w, $h; 2642 glVertex $w, $h;
2452 glVertex $w, 0; 2643 glVertex $w, 0;
2453 glEnd; 2644 glEnd;
2454 2645
2455 glPopMatrix; 2646 glTranslate 2 - 0.375, 2 - 0.375;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2647 $self->SUPER::_draw;
2459} 2648}
2460 2649
2461############################################################################# 2650#############################################################################
2462 2651
… …
2467use CFClient::OpenGL; 2656use CFClient::OpenGL;
2468 2657
2469sub new { 2658sub new {
2470 my $class = shift; 2659 my $class = shift;
2471 2660
2472 $class->SUPER::new ( 2661 my $self = $class->SUPER::new (
2473 aspect => 1, 2662 aspect => 1,
2663 can_events => 0,
2474 @_, 2664 @_,
2475 ) 2665 );
2666
2667 if ($self->{anim} && $self->{animspeed}) {
2668 Scalar::Util::weaken (my $widget = $self);
2669
2670 $self->{timer} = Event->timer (
2671 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2672 hard => 1,
2673 interval => $self->{animspeed},
2674 cb => sub {
2675 ++$widget->{frame};
2676 $widget->update;
2677 },
2678 );
2679 }
2680
2681 $self
2476} 2682}
2477 2683
2478sub size_request { 2684sub size_request {
2479 (32, 8) 2685 (32, 8)
2480} 2686}
2481 2687
2688sub update {
2689 my ($self) = @_;
2690
2691 return unless $self->{visible};
2692
2693 $self->SUPER::update;
2694}
2695
2482sub _draw { 2696sub _draw {
2483 my ($self) = @_; 2697 my ($self) = @_;
2484 2698
2485 return unless $::CONN;#d# manage and cache textures differently 2699 return unless $::CONN;
2700
2701 my $face;
2702
2703 if ($self->{frame}) {
2704 my $anim = $::CONN->{anim}[$self->{anim}];
2705
2706 $face = $anim->[ $self->{frame} % @$anim ]
2707 if $anim && @$anim;
2708 }
2709
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2710 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487 2711
2488 # TODO animation
2489 if ($tex) { 2712 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2713 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2715 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2716 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2718 }
2499} 2719}
2500 2720
2501############################################################################# 2721sub DESTROY {
2722 my ($self) = @_;
2502 2723
2724 $self->{timer}->cancel
2725 if $self->{timer};
2726
2727 $self->SUPER::DESTROY;
2728}
2729
2730#############################################################################
2731
2503package CFClient::UI::InventoryItem; 2732package CFClient::UI::Inventory;
2504 2733
2505our @ISA = CFClient::UI::HBox::; 2734our @ISA = CFClient::UI::ScrolledWindow::;
2506 2735
2507sub new { 2736sub new {
2508 my $class = shift; 2737 my $class = shift;
2509 2738
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 ( 2739 my $self = $class->SUPER::new (
2520 can_hover => 1, 2740 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 @_, 2741 @_,
2575 ); 2742 );
2576 2743
2577 $self 2744 $self
2578} 2745}
… …
2581 my ($self, $items) = @_; 2748 my ($self, $items) = @_;
2582 2749
2583 $self->{scrolled}->clear; 2750 $self->{scrolled}->clear;
2584 return unless $items; 2751 return unless $items;
2585 2752
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2753 my @items = sort {
2754 ($a->{type} <=> $b->{type})
2755 or ($a->{name} cmp $b->{name})
2756 } @$items;
2587 2757
2588 $self->{real_items} = \@items; 2758 $self->{real_items} = \@items;
2589 2759
2760 my $row = 0;
2590 for my $item (@items) { 2761 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2 2762 CFClient::Item::update_widgets $item;
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594 2763
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2764 $self->{scrolled}->add (0, $row, $item->{face_widget});
2596 } 2765 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2766 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2597 2767
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2768 $row++;
2599} 2769 }
2600
2601sub size_request {
2602 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h});
2604} 2770}
2605 2771
2606############################################################################# 2772#############################################################################
2607 2773
2608package CFClient::UI::Menu; 2774package CFClient::UI::Menu;
… …
2643 2809
2644# popup given the event (must be a mouse button down event currently) 2810# popup given the event (must be a mouse button down event currently)
2645sub popup { 2811sub popup {
2646 my ($self, $ev) = @_; 2812 my ($self, $ev) = @_;
2647 2813
2648 $self->emit ("popdown"); 2814 $self->_emit ("popdown");
2649 2815
2650 # maybe save $GRAB? must be careful about events... 2816 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 2817 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 2818 $self->{button} = $ev->{button};
2653 2819
… …
2668 2834
2669 if ($ev->{button} == $self->{button}) { 2835 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 2836 undef $GRAB;
2671 $self->hide; 2837 $self->hide;
2672 2838
2673 $self->emit ("popdown"); 2839 $self->_emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 2840 $self->{hover}[1]->() if $self->{hover};
2675 } 2841 }
2676} 2842}
2677 2843
2678############################################################################# 2844#############################################################################
2679 2845
2846package CFClient::UI::Statusbox;
2847
2848our @ISA = CFClient::UI::VBox::;
2849
2850sub new {
2851 my $class = shift;
2852
2853 $class->SUPER::new (
2854 fontsize => 0.8,
2855 @_,
2856 )
2857}
2858
2859sub reorder {
2860 my ($self) = @_;
2861 my $NOW = time;
2862
2863 while (my ($k, $v) = each %{ $self->{item} }) {
2864 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2865 }
2866
2867 my @widgets;
2868
2869 my @items = sort {
2870 $a->{pri} <=> $b->{pri}
2871 or $b->{id} <=> $a->{id}
2872 } values %{ $self->{item} };
2873
2874 my $count = 10 + 1;
2875 for my $item (@items) {
2876 last unless --$count;
2877
2878 push @widgets, $item->{label} ||= do {
2879 # TODO: doesn't handle markup well (read as: at all)
2880 my $short = $item->{count} > 1
2881 ? "<b>$item->{count} ×</b> $item->{text}"
2882 : $item->{text};
2883
2884 for ($short) {
2885 s/^\s+//;
2886 s/\s+/ /g;
2887 }
2888
2889 new CFClient::UI::Label
2890 markup => $short,
2891 tooltip => $item->{tooltip},
2892 tooltip_font => $::FONT_PROP,
2893 tooltip_width => 0.67,
2894 fontsize => $item->{fontsize} || $self->{fontsize},
2895 max_w => $::WIDTH * 0.44,
2896 fg => $item->{fg},
2897 can_events => 1,
2898 can_hover => 1
2899 };
2900 }
2901
2902 $self->clear;
2903 $self->SUPER::add (reverse @widgets);
2904}
2905
2906sub add {
2907 my ($self, $text, %arg) = @_;
2908
2909 $text =~ s/^\s+//;
2910 $text =~ s/\s+$//;
2911
2912 return unless $text;
2913
2914 my $timeout = time + ((delete $arg{timeout}) || 60);
2915
2916 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2917
2918 if (my $item = $self->{item}{$group}) {
2919 if ($item->{text} eq $text) {
2920 $item->{count}++;
2921 } else {
2922 $item->{count} = 1;
2923 $item->{text} = $item->{tooltip} = $text;
2924 }
2925 $item->{id} = ++$self->{id};
2926 $item->{timeout} = $timeout;
2927 delete $item->{label};
2928 } else {
2929 $self->{item}{$group} = {
2930 id => ++$self->{id},
2931 text => $text,
2932 timeout => $timeout,
2933 tooltip => $text,
2934 fg => [0.8, 0.8, 0.8, 0.8],
2935 pri => 0,
2936 count => 1,
2937 %arg,
2938 };
2939 }
2940
2941 $self->reorder;
2942}
2943
2944sub reconfigure {
2945 my ($self) = @_;
2946
2947 delete $_->{label}
2948 for values %{ $self->{item} || {} };
2949
2950 $self->reorder;
2951 $self->SUPER::reconfigure;
2952}
2953
2954#############################################################################
2955
2680package CFClient::UI::Root; 2956package CFClient::UI::Root;
2681 2957
2682our @ISA = CFClient::UI::Container::; 2958our @ISA = CFClient::UI::Container::;
2683 2959
2684use CFClient::OpenGL; 2960use CFClient::OpenGL;
2685 2961
2962sub new {
2963 my $class = shift;
2964
2965 $class->SUPER::new (
2966 visible => 1,
2967 @_,
2968 )
2969}
2970
2971sub configure {
2972 my ($self, $x, $y, $w, $h) = @_;
2973
2974 $self->{w} = $w;
2975 $self->{h} = $h;
2976}
2977
2686sub check_size { 2978sub check_size {
2687 my ($self) = @_; 2979 my ($self) = @_;
2688 2980
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 2981 $self->size_allocate ($self->{w}, $self->{h})
2982 if $self->{w};
2690} 2983}
2691 2984
2692sub size_request { 2985sub size_request {
2693 my ($self) = @_; 2986 my ($self) = @_;
2694 2987
… …
2696} 2989}
2697 2990
2698sub size_allocate { 2991sub size_allocate {
2699 my ($self, $w, $h) = @_; 2992 my ($self, $w, $h) = @_;
2700 2993
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) { 2994 for my $child ($self->children) {
2727 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2995 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2728 2996
2997 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2998 if exists $child->{req_x};
2999
3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3001 if exists $child->{req_y};
3002
3003 delete @$child{qw(req_x req_y)};
3004
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2730 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007
2731 $child->configure ($X, $Y, $W, $H); 3008 $child->configure ($X, $Y, $W, $H);
2732 } 3009 }
2733} 3010}
2734 3011
2735sub _topleft { 3012sub coord2local {
2736 my ($self, $x, $y) = @_; 3013 my ($self, $x, $y) = @_;
2737 3014
2738 ($x, $y) 3015 ($x, $y)
2739} 3016}
2740 3017
3018sub coord2global {
3019 my ($self, $x, $y) = @_;
3020
3021 ($x, $y)
3022}
3023
2741sub update { 3024sub update {
2742 my ($self) = @_; 3025 my ($self) = @_;
2743 3026
2744 $self->check_size; 3027 $self->check_size;
2745 ::refresh (); 3028 $::WANT_REFRESH++;
2746} 3029}
2747 3030
2748sub add { 3031sub add {
2749 my ($self, $child) = @_; 3032 my ($self, @children) = @_;
2750 3033
3034 for my $child (@children) {
3035 $child->{is_toplevel} = 1;
3036
2751 # integerize window positions 3037 # integerise window positions
2752 $child->{x} = int $child->{x}; 3038 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 3039 $child->{y} = int $child->{y};
3040 }
2754 3041
2755 $self->SUPER::add ($child); 3042 $self->SUPER::add (@children);
3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3049}
3050
3051sub remove {
3052 my ($self, @children) = @_;
3053
3054 $self->SUPER::remove (@children);
3055
3056 while (@children) {
3057 my $w = pop @children;
3058 push @children, $w->children;
3059 $w->set_invisible;
3060 }
2756} 3061}
2757 3062
2758sub on_refresh { 3063sub on_refresh {
2759 my ($self, $id, $cb) = @_; 3064 my ($self, $id, $cb) = @_;
2760 3065
2761 $self->{refresh_hook}{$id} = $cb; 3066 $self->{refresh_hook}{$id} = $cb;
2762} 3067}
2763 3068
3069sub on_post_alloc {
3070 my ($self, $id, $cb) = @_;
3071
3072 $self->{post_alloc_hook}{$id} = $cb;
3073}
3074
2764sub draw { 3075sub draw {
2765 my ($self) = @_; 3076 my ($self) = @_;
2766 3077
2767 while (my $rcb = delete $self->{refresh_hook}) { 3078 while ($self->{refresh_hook}) {
2768 $_->() for values %$rcb; 3079 $_->()
3080 for values %{delete $self->{refresh_hook}};
3081 }
3082
3083 if ($self->{check_size}) {
3084 my @queue;
3085
3086 for (;;) {
3087 if ($self->{check_size}) {
3088 #TODO use array-of-depth approach
3089
3090 @queue = sort { $a->{visible} <=> $b->{visible} }
3091 @queue, values %{delete $self->{check_size}};
3092 }
3093
3094 my $widget = pop @queue || last;
3095
3096 defined $widget->{visible} or last; # do not resize invisible widgets
3097
3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3099 ? @$widget{qw(def_w def_h)}
3100 : $widget->size_request;
3101
3102 if (delete $widget->{force_alloc}
3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105
3106 $widget->{req_w} = $w;
3107 $widget->{req_h} = $h;
3108
3109 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3110
3111 $widget->{parent}->check_size
3112 if $widget->{parent};
3113 }
3114 }
3115 }
3116
3117 while ($self->{size_alloc}) {
3118 for (values %{delete $self->{size_alloc}}) {
3119 my ($widget, $w, $h) = @$_;
3120
3121 $w = 0 if $w < 0;
3122 $h = 0 if $h < 0;
3123
3124 $widget->{w} = $w;
3125 $widget->{h} = $h;
3126 $widget->emit (size_allocate => $w, $h);
3127 }
3128 }
3129
3130 while ($self->{post_alloc_hook}) {
3131 $_->()
3132 for values %{delete $self->{post_alloc_hook}};
2769 } 3133 }
2770 3134
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3135 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3136 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3137 glClear GL_COLOR_BUFFER_BIT;
2774 3138
2775 glMatrixMode GL_PROJECTION; 3139 glMatrixMode GL_PROJECTION;
2776 glLoadIdentity; 3140 glLoadIdentity;
2777 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3141 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778 glMatrixMode GL_MODELVIEW; 3142 glMatrixMode GL_MODELVIEW;
2779 glLoadIdentity; 3143 glLoadIdentity;
2780 3144
2781 $self->_draw; 3145 $self->_draw;
2782} 3146}
… …
2784############################################################################# 3148#############################################################################
2785 3149
2786package CFClient::UI; 3150package CFClient::UI;
2787 3151
2788$ROOT = new CFClient::UI::Root; 3152$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3153$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3154
27911 31551
2792 3156

Diff Legend

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