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

Diff Legend

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