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

Diff Legend

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