ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.186 by root, Mon May 8 20:39:34 2006 UTC vs.
Revision 1.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->{parent} 529 $self->{force_alloc} = 1 if $forced;
409 or return 1; 530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429} 531}
430 532
431sub update { 533sub update {
432 my ($self) = @_; 534 my ($self) = @_;
433 535
… …
439 my ($self, $signal, $cb) = @_; 541 my ($self, $signal, $cb) = @_;
440 542
441 push @{ $self->{signal_cb}{$signal} }, $cb; 543 push @{ $self->{signal_cb}{$signal} }, $cb;
442} 544}
443 545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
444sub emit { 552sub emit {
445 my ($self, $signal, @args) = @_; 553 my ($self, $signal, @args) = @_;
446 554
447 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) = @_;
448} 561}
449 562
450sub DESTROY { 563sub DESTROY {
451 my ($self) = @_; 564 my ($self) = @_;
452 565
566 delete $WIDGET{$self+0};
453 #$self->deactivate; 567 #$self->deactivate;
454} 568}
455 569
456############################################################################# 570#############################################################################
457 571
… …
466 my $class = shift; 580 my $class = shift;
467 581
468 # range [value, low, high, page] 582 # range [value, low, high, page]
469 583
470 $class->SUPER::new ( 584 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 585 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 586 #active_bg => [1, 1, 1, 0.5],
473 @_ 587 @_
474 ) 588 )
475} 589}
476 590
477sub _draw { 591sub _draw {
478 my ($self) = @_; 592 my ($self) = @_;
479 593
594 my $color = $FOCUS == $self && $self->{active_bg}
595 ? $self->{active_bg}
596 : $self->{bg};
597
598 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 599 my ($w, $h) = @$self{qw(w h)};
481 600
482 glEnable GL_BLEND; 601 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 603 glColor @$color;
485 604
486 glBegin GL_QUADS; 605 glBegin GL_QUADS;
487 glVertex 0 , 0; 606 glVertex 0 , 0;
488 glVertex 0 , $h; 607 glVertex 0 , $h;
489 glVertex $w, $h; 608 glVertex $w, $h;
490 glVertex $w, 0; 609 glVertex $w, 0;
491 glEnd; 610 glEnd;
492 611
493 glDisable GL_BLEND; 612 glDisable GL_BLEND;
613 }
494} 614}
495 615
496############################################################################# 616#############################################################################
497 617
498package CFClient::UI::Empty; 618package CFClient::UI::Empty;
… …
530 650
531 $self 651 $self
532} 652}
533 653
534sub add { 654sub add {
535 my ($self, $child) = @_; 655 my ($self, @widgets) = @_;
536 656
537 $child->set_parent ($self); 657 $_->set_parent ($self)
658 for @widgets;
538 659
539 use sort 'stable'; 660 use sort 'stable';
540 661
541 $self->{children} = [ 662 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 663 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 664 @{$self->{children}}, @widgets
544 ]; 665 ];
545 666
546 $child->check_size; 667 $self->check_size (1);
547 $self->update; 668 $self->update;
548} 669}
549 670
550sub children { 671sub children {
551 @{ $_[0]{children} } 672 @{ $_[0]{children} }
… …
557 delete $child->{parent}; 678 delete $child->{parent};
558 $child->hide; 679 $child->hide;
559 680
560 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
561 682
562 $self->check_size; 683 $self->check_size (1);
563 $self->update; 684 $self->update;
564} 685}
565 686
566sub clear { 687sub clear {
567 my ($self) = @_; 688 my ($self) = @_;
… …
658} 779}
659 780
660sub update { 781sub update {
661 my ($self) = @_; 782 my ($self) = @_;
662 783
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 784 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 785 $self->SUPER::update;
665} 786}
666 787
667sub size_allocate { 788sub size_allocate {
668 my ($self, $w, $h) = @_; 789 my ($self, $w, $h) = @_;
… …
681 $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 {
682 glClearColor 0, 0, 0, 0; 803 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT; 804 glClear GL_COLOR_BUFFER_BIT;
684 805
685 $self->_render; 806 $self->_render;
686# glColorMask 1, 1, 1, 0;
687# glEnable GL_BLEND;
688# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689# glRasterPos 0, 0;
690# glCopyPixels 0, 0, $self->{w}, $self->{h};
691# glDisable GL_BLEND;
692# glColorMask 1, 1, 1, 1;
693 }; 807 };
694} 808}
695 809
696sub _draw { 810sub _draw {
697 my ($self) = @_; 811 my ($self) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 813 my ($w, $h) = ($self->w, $self->h);
700 814
701 my $tex = $self->{texture} 815 my $tex = $self->{texture}
702 or return; 816 or return;
703 817
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 818 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 820 glColor 1, 1, 1, 1;
709 821
710 $tex->draw_quad (0, 0, $w, $h); 822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 823
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 824 glDisable GL_TEXTURE_2D;
714} 825}
715 826
716############################################################################# 827#############################################################################
717 828
718package CFClient::UI::ViewPort; 829package CFClient::UI::ViewPort;
719 830
720our @ISA = CFClient::UI::Window::; 831our @ISA = CFClient::UI::Window::;
721 832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 scroll_x => 0,
838 scroll_y => 1,
839 @_,
840 )
841}
842
722sub size_request { 843sub size_request {
723 my ($self) = @_; 844 my ($self) = @_;
724 845
725 @$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)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 847
728 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
729} 852}
730 853
731sub size_allocate { 854sub size_allocate {
732 my ($self, $w, $h) = @_; 855 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 861 $self->update;
735} 862}
736 863
737sub set_offset { 864sub set_offset {
738 my ($self, $x, $y) = @_; 865 my ($self, $x, $y) = @_;
… …
741 $self->{view_y} = int $y; 868 $self->{view_y} = int $y;
742 869
743 $self->update; 870 $self->update;
744} 871}
745 872
746# 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
747sub _topleft { 874sub coord2local {
748 my ($self, $x, $y) = @_; 875 my ($self, $x, $y) = @_;
749 876
750 $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)
751} 887}
752 888
753sub find_widget { 889sub find_widget {
754 my ($self, $x, $y) = @_; 890 my ($self, $x, $y) = @_;
755 891
… …
780 my $class = shift; 916 my $class = shift;
781 917
782 my $self; 918 my $self;
783 919
784 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
785 vertical => 1, 921 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub { 923 on_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 924 $self->{vp}->set_offset (0, $_[1]);
789 }, 925 },
790 ; 926 ;
791 927
792 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort), 929 vp => (new CFClient::UI::ViewPort expand => 1),
794 slider => $slider, 930 slider => $slider,
795 @_, 931 @_,
796 ); 932 );
797 933
798 $self->{vp}->add ($self->{scrolled}); 934 $self->{vp}->add ($self->{scrolled});
… …
800 $self->add ($self->{slider}); 936 $self->add ($self->{slider});
801 937
802 $self 938 $self
803} 939}
804 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
805#TODO# update range on size_allocate depeneing on child 960#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 961# update viewport offset on scroll
807 962
808############################################################################# 963#############################################################################
809 964
810package CFClient::UI::Frame; 965package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 969use CFClient::OpenGL;
815 970
816sub new { 971sub new {
817 my $class = shift; 972 my $class = shift;
818 973
819 my $self = $class->SUPER::new ( 974 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 975 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 976 @_,
824 ); 977 )
825
826 $self
827} 978}
828 979
829sub _draw { 980sub _draw {
830 my ($self) = @_; 981 my ($self) = @_;
831 982
832 my ($w, $h) = ($self->{w}, $self->{h}); 983 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)};
833 985
834 glEnable GL_BLEND; 986 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 988 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 989
839# glBegin GL_QUADS; 990 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 991 glVertex 0 , 0;
842# glVertex 0 , $h; 992 glVertex 0 , $h;
843# glVertex $w, $h; 993 glVertex $w, $h;
844# glVertex $w, 0; 994 glVertex $w, 0;
845# glEnd; 995 glEnd;
846 996
847
848 $self->child->draw;
849 glDisable GL_BLEND; 997 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 998 }
999
1000 $self->SUPER::_draw;
851} 1001}
852 1002
853############################################################################# 1003#############################################################################
854 1004
855package CFClient::UI::FancyFrame; 1005package CFClient::UI::FancyFrame;
… …
863 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);
864 1014
865sub new { 1015sub new {
866 my $class = shift; 1016 my $class = shift;
867 1017
868 # TODO: user_x, user_y, overwrite moveto?
869
870 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
873 border => 0.6, 1021 border => 0.6,
1022 is_toplevel => 1,
874 can_events => 1, 1023 can_events => 1,
875 @_ 1024 @_
876 ); 1025 );
877 1026
878 $self->{title} &&= new CFClient::UI::Label 1027 $self->{title} &&= new CFClient::UI::Label
879 align => 0, 1028 align => 0,
… …
903 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h) = @_;
904 1053
905 $h -= List::Util::max 0, $self->border * 2; 1054 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 1055 $w -= List::Util::max 0, $self->border * 2;
907 1056
908 $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)
909 if $self->{title}; 1058 if $self->{title};
910 1059
911 $self->child->configure ($self->border, $self->border, $w, $h); 1060 $self->child->configure ($self->border, $self->border, $w, $h);
912} 1061}
913 1062
… …
932 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
933 1082
934 my $dx = $ev->{x} - $ox; 1083 my $dx = $ev->{x} - $ox;
935 my $dy = $ev->{y} - $oy; 1084 my $dy = $ev->{y} - $oy;
936 1085
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
937 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
938 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
939 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1090 $self->move ($self->{user_x}, $self->{user_y});
940 $self->check_size; 1091 $self->check_size;
941 }; 1092 };
942 1093
943 } elsif ($lr ^ $td) { 1094 } elsif ($lr ^ $td) {
944 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
947 $self->{motion} = sub { 1098 $self->{motion} = sub {
948 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
949 1100
950 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
951 1102
952 $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});
953 $self->update; 1107 $self->update;
954 }; 1108 };
955 } 1109 }
956} 1110}
957 1111
… …
971 my ($self) = @_; 1125 my ($self) = @_;
972 1126
973 my ($w, $h ) = ($self->{w}, $self->{h}); 1127 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 1129
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 1130 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 1132
981 my $border = $self->border; 1133 my $border = $self->border;
982 1134
983 glColor @{ $self->{border_bg} }; 1135 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988 1140
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1142 my $bg = $tex[0];
991 1143
992 # TODO: repeat texture not scale 1144 # TODO: repeat texture not scale
… …
996 glColor @{ $self->{bg} }; 1148 glColor @{ $self->{bg} };
997 1149
998 $bg->{s} = $rep_x; 1150 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y; 1151 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1; 1152 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 }
1002 1155
1003 glDisable GL_TEXTURE_2D; 1156 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1157
1007 $self->{title}->draw if $self->{title}; 1158 $self->{title}->draw if $self->{title};
1008 1159
1009 $self->child->draw; 1160 $self->child->draw;
1010} 1161}
… …
1022sub new { 1173sub new {
1023 my $class = shift; 1174 my $class = shift;
1024 1175
1025 $class->SUPER::new ( 1176 $class->SUPER::new (
1026 col_expand => [], 1177 col_expand => [],
1027 @_ 1178 @_,
1028 ) 1179 )
1180}
1181
1182sub children {
1183 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1029} 1184}
1030 1185
1031sub add { 1186sub add {
1032 my ($self, $x, $y, $child) = @_; 1187 my ($self, $x, $y, $child) = @_;
1033 1188
1034 $child->set_parent ($self); 1189 $child->set_parent ($self);
1035 $self->{children}[$y][$x] = $child; 1190 $self->{children}[$y][$x] = $child;
1036 1191
1037 $child->check_size; 1192 $self->check_size (1);
1038} 1193}
1039 1194
1040sub children {
1041 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1042}
1043
1044# 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?
1045sub clear { 1196sub clear {
1046 my ($self) = @_; 1197 my ($self) = @_;
1047 1198
1048 my @children = $self->children; 1199 my @children = $self->children;
1049 delete $self->{children}; 1200 delete $self->{children};
… …
1051 for (@children) { 1202 for (@children) {
1052 delete $_->{parent}; 1203 delete $_->{parent};
1053 $_->hide; 1204 $_->hide;
1054 } 1205 }
1055 1206
1207 $self->check_size (1);
1056 $self->update; 1208 $self->update;
1057} 1209}
1058 1210
1059sub get_wh { 1211sub get_wh {
1060 my ($self) = @_; 1212 my ($self) = @_;
… …
1092sub size_allocate { 1244sub size_allocate {
1093 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h) = @_;
1094 1246
1095 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1096 1248
1097 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
1098 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
1099 1251
1100 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
1101 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
1102 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
1103 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1157 } 1309 }
1158} 1310}
1159 1311
1160############################################################################# 1312#############################################################################
1161 1313
1162package CFClient::UI::HBox; 1314package CFClient::UI::Box;
1163
1164# TODO: wrap into common Box base class
1165 1315
1166our @ISA = CFClient::UI::Container::; 1316our @ISA = CFClient::UI::Container::;
1167 1317
1168sub size_request { 1318sub size_request {
1169 my ($self) = @_; 1319 my ($self) = @_;
1170 1320
1171 my @alloc = map [$_->size_request], @{$self->{children}}; 1321 $self->{vertical}
1172 1322 ? (
1173 ( 1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1174 (List::Util::sum map $_->[0], @alloc), 1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1175 (List::Util::max map $_->[1], @alloc), 1325 )
1176 ) 1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1177} 1330}
1178 1331
1179sub size_allocate { 1332sub size_allocate {
1180 my ($self, $w, $h) = @_; 1333 my ($self, $w, $h) = @_;
1181 1334
1182 ($h, $w) = ($w, $h); 1335 my $space = $self->{vertical} ? $h : $w;
1183
1184 my $children = $self->{children}; 1336 my $children = $self->{children};
1185 1337
1186 my @h = map $_->{req_w}, @$children; 1338 my @req;
1187 1339
1188 my $req_h = List::Util::sum @h; 1340 if ($self->{homogeneous}) {
1189 1341 @req = ($space / (@$children || 1)) x @$children;
1190 if ($req_h > $h) {
1191 # ah well, not enough space
1192 $_ *= $h / $req_h for @h;
1193 } 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 {
1194 my $exp = List::Util::sum map $_->{expand}, @$children; 1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1195 $exp ||= 1;
1196 1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1197 for (0 .. $#$children) { 1355 for 0 .. $#$children;
1198 my $child = $children->[$_];
1199
1200 my $alloc_h = $h[$_];
1201 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1202 $h[$_] = $alloc_h;
1203 } 1356 }
1204 } 1357 }
1205 1358
1206 CFClient::UI::harmonize \@h; 1359 CFClient::UI::harmonize \@req;
1207 1360
1208 my $y = 0; 1361 my $pos = 0;
1209 for (0 .. $#$children) { 1362 for (0 .. $#$children) {
1210 my $child = $children->[$_];
1211 my $h = $h[$_]; 1363 my $alloc = $req[$_];
1212 $child->configure ($y, 0, $h, $w); 1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1213 1365
1214 $y += $h; 1366 $pos += $alloc;
1215 } 1367 }
1216 1368
1217 1 1369 1
1218} 1370}
1219 1371
1220############################################################################# 1372#############################################################################
1221 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
1222package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1223 1390
1224# TODO: wrap into common Box base class
1225
1226our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1227 1392
1228sub size_request { 1393sub new {
1229 my ($self) = @_; 1394 my $class = shift;
1230 1395
1231 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1232 1397 vertical => 1,
1233 ( 1398 @_,
1234 (List::Util::max map $_->[0], @alloc),
1235 (List::Util::sum map $_->[1], @alloc),
1236 ) 1399 )
1237} 1400}
1238 1401
1239sub size_allocate {
1240 my ($self, $w, $h) = @_;
1241
1242 my $children = $self->{children};
1243
1244 my @h = map $_->{req_h}, @$children;
1245
1246 my $req_h = List::Util::sum @h;
1247
1248 if ($req_h > $h) {
1249 # ah well, not enough space
1250 $_ *= $h / $req_h for @h;
1251 } else {
1252 my $exp = List::Util::sum map $_->{expand}, @$children;
1253 $exp ||= 1;
1254
1255 for (0 .. $#$children) {
1256 my $child = $children->[$_];
1257
1258 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1259 }
1260 }
1261
1262 CFClient::UI::harmonize \@h;
1263
1264 my $y = 0;
1265 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_];
1268 $child->configure (0, $y, $w, $h);
1269
1270 $y += $h;
1271 }
1272
1273 1
1274}
1275
1276############################################################################# 1402#############################################################################
1277 1403
1278package CFClient::UI::Label; 1404package CFClient::UI::Label;
1279 1405
1280our @ISA = CFClient::UI::Base::; 1406our @ISA = CFClient::UI::DrawBG::;
1281 1407
1282use CFClient::OpenGL; 1408use CFClient::OpenGL;
1283 1409
1284sub new { 1410sub new {
1285 my ($class, %arg) = @_; 1411 my ($class, %arg) = @_;
1286 1412
1287 my $self = $class->SUPER::new ( 1413 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1414 fg => [1, 1, 1],
1415 #bg => none
1416 #active_bg => none
1289 #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),
1290 fontsize => 1, 1423 fontsize => 1,
1291 text => "",
1292 align => -1, 1424 align => -1,
1293 valign => -1, 1425 valign => -1,
1294 padding => 2, 1426 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1427 can_events => 0,
1297 %arg 1428 %arg
1298 ); 1429 );
1299 1430
1300 if (exists $self->{template}) { 1431 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1432 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1433 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1434 $self->{template} = $layout;
1304 } 1435 }
1305 1436
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1437 if (exists $self->{markup}) {
1307 $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 }
1308 1442
1309 $self 1443 $self
1310} 1444}
1311 1445
1312sub escape { 1446sub escape($) {
1313 local $_ = $_[1]; 1447 local $_ = $_[0];
1314 1448
1315 s/&/&amp;/g; 1449 s/&/&amp;/g;
1316 s/>/&gt;/g; 1450 s/>/&gt;/g;
1317 s/</&lt;/g; 1451 s/</&lt;/g;
1318 1452
1319 $_[1] 1453 $_
1320} 1454}
1321 1455
1322sub update { 1456sub update {
1323 my ($self) = @_; 1457 my ($self) = @_;
1324 1458
… …
1330 my ($self, $text) = @_; 1464 my ($self, $text) = @_;
1331 1465
1332 return if $self->{text} eq "T$text"; 1466 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1334 1468
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1336 1471
1337 delete $self->{texture};
1338 $self->update; 1472 $self->update;
1339 $self->check_size; 1473 $self->check_size;
1340} 1474}
1341 1475
1342sub set_markup { 1476sub set_markup {
1343 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1344 1478
1345 return if $self->{text} eq "M$markup"; 1479 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1480 $self->{text} = "M$markup";
1347 1481
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1349 1486
1350 delete $self->{texture};
1351 $self->update; 1487 $self->update;
1352 $self->check_size; 1488 $self->check_size;
1353} 1489}
1354 1490
1355sub size_request { 1491sub size_request {
1356 my ($self) = @_; 1492 my ($self) = @_;
1357 1493
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1494 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $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});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1499
1362 my ($w, $h) = $self->{layout}->size; 1500 my ($w, $h) = $self->{layout}->size;
1363 1501
1364 if (exists $self->{template}) { 1502 if (exists $self->{template}) {
… …
1394} 1532}
1395 1533
1396sub _draw { 1534sub _draw {
1397 my ($self) = @_; 1535 my ($self) = @_;
1398 1536
1537 $self->SUPER::_draw; # draw background, if applicable
1538
1399 my $tex = $self->{texture} ||= do { 1539 my $tex = $self->{texture} ||= do {
1540 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1541 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $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});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546
1403 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
1404 }; 1558 };
1405 1559
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1560 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1562
1563 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1564 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $tex->draw_quad ($self->{ox}, $self->{oy}); 1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 }
1426 1569
1427 glDisable GL_TEXTURE_2D; 1570 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1571}
1430 1572
1431############################################################################# 1573#############################################################################
1432 1574
1433package CFClient::UI::EntryBase; 1575package CFClient::UI::EntryBase;
… …
1446 active_fg => [0, 0, 0], 1588 active_fg => [0, 0, 0],
1447 can_hover => 1, 1589 can_hover => 1,
1448 can_focus => 1, 1590 can_focus => 1,
1449 valign => 0, 1591 valign => 0,
1450 can_events => 1, 1592 can_events => 1,
1593 #text => ...
1451 @_ 1594 @_
1452 ) 1595 )
1453} 1596}
1454 1597
1455sub _set_text { 1598sub _set_text {
… …
1465 $self->{text} = $text; 1608 $self->{text} = $text;
1466 1609
1467 $text =~ s/./*/g if $self->{hidden}; 1610 $text =~ s/./*/g if $self->{hidden};
1468 $self->{layout}->set_text ("$text "); 1611 $self->{layout}->set_text ("$text ");
1469 1612
1470 $self->emit (changed => $self->{text}); 1613 $self->_emit (changed => $self->{text});
1471}
1472
1473sub get_text {
1474 $_[0]{text}
1475}
1476
1477sub size_request {
1478 my ($self) = @_;
1479
1480 my ($w, $h) = $self->SUPER::size_request;
1481
1482 ($w + 1, $h) # add 1 for cursor
1483}
1484
1485sub size_allocate {
1486 my ($self, $w, $h) = @_;
1487
1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489} 1614}
1490 1615
1491sub set_text { 1616sub set_text {
1492 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1493 1618
1494 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1620 $self->_set_text ($text);
1496 $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
1497} 1635}
1498 1636
1499sub key_down { 1637sub key_down {
1500 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1501 1639
… …
1503 my $sym = $ev->{sym}; 1641 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1642 my $uni = $ev->{unicode};
1505 1643
1506 my $text = $self->get_text; 1644 my $text = $self->get_text;
1507 1645
1508 if ($sym == 8) { 1646 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1647 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1648 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1649 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1650 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1651 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1652 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1653 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1654 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1655 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1656 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1657 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1658 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1659 $self->_emit ('escape');
1522 } elsif ($uni) { 1660 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1662 }
1525 1663
1526 $self->_set_text ($text); 1664 $self->_set_text ($text);
1527 $self->update; 1665 $self->update;
1666 $self->check_size;
1528} 1667}
1529 1668
1530sub focus_in { 1669sub focus_in {
1531 my ($self) = @_; 1670 my ($self) = @_;
1532 1671
… …
1612 if ($sym == 13) { 1751 if ($sym == 13) {
1613 unshift @{$self->{history}}, 1752 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 1753 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1; 1754 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 1755 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 1756 $self->_emit (activate => $txt);
1618 $self->update; 1757 $self->update;
1619 1758
1620 } elsif ($sym == CFClient::SDLK_UP) { 1759 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 1760 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 1761 $self->{history_saveback} = $self->get_text;
… …
1661 my $class = shift; 1800 my $class = shift;
1662 1801
1663 $class->SUPER::new ( 1802 $class->SUPER::new (
1664 padding => 4, 1803 padding => 4,
1665 fg => [1, 1, 1], 1804 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1805 active_fg => [0, 0, 1],
1668 can_hover => 1, 1806 can_hover => 1,
1669 align => 0, 1807 align => 0,
1670 valign => 0, 1808 valign => 0,
1671 can_events => 1, 1809 can_events => 1,
1672 @_ 1810 @_
1673 ) 1811 )
1674} 1812}
1675 1813
1814sub activate { }
1815
1676sub button_up { 1816sub button_up {
1677 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1678 1818
1819 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 1820 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 1821 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate");
1682 }
1683} 1822}
1684 1823
1685sub _draw { 1824sub _draw {
1686 my ($self) = @_; 1825 my ($self) = @_;
1687 1826
… …
1689 1828
1690 if ($GRAB == $self) { 1829 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1830 $self->{fg} = $self->{active_fg};
1692 } 1831 }
1693 1832
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1833 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1835 glColor 0, 0, 0, 1;
1699 1836
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1837 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1838
1702 glDisable GL_TEXTURE_2D; 1839 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1840
1705 $self->SUPER::_draw; 1841 $self->SUPER::_draw;
1706} 1842}
1707 1843
1708############################################################################# 1844#############################################################################
… …
1722 1858
1723 $class->SUPER::new ( 1859 $class->SUPER::new (
1724 padding => 2, 1860 padding => 2,
1725 fg => [1, 1, 1], 1861 fg => [1, 1, 1],
1726 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],
1727 state => 0, 1865 state => 0,
1728 can_hover => 1, 1866 can_hover => 1,
1729 @_ 1867 @_
1730 ) 1868 )
1731} 1869}
… …
1740 my ($self, $ev, $x, $y) = @_; 1878 my ($self, $ev, $x, $y) = @_;
1741 1879
1742 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1743 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1744 $self->{state} = !$self->{state}; 1882 $self->{state} = !$self->{state};
1745 $self->emit (changed => $self->{state}); 1883 $self->_emit (changed => $self->{state});
1746 } 1884 }
1747} 1885}
1748 1886
1749sub _draw { 1887sub _draw {
1750 my ($self) = @_; 1888 my ($self) = @_;
… …
1755 1893
1756 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;
1757 1895
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1897
1760 glEnable GL_BLEND; 1898 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899
1761 glEnable GL_TEXTURE_2D; 1900 glEnable GL_TEXTURE_2D;
1762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764 my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766 $tex->draw_quad (0, 0, $s, $s); 1901 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1902 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1903}
1771 1904
1772############################################################################# 1905#############################################################################
1773 1906
1774package CFClient::UI::Image; 1907package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1950 glTranslate 0, -$self->{w}, 0;
1818 1951
1819 ($w, $h) = ($h, $w); 1952 ($w, $h) = ($h, $w);
1820 } 1953 }
1821 1954
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1955 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1957
1827 $tex->draw_quad (0, 0, $w, $h); 1958 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1959
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1960 glDisable GL_TEXTURE_2D;
1831} 1961}
1832 1962
1833############################################################################# 1963#############################################################################
1834 1964
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2153 qw(s1_slider.png s1_slider_bg.png);
2024 2154
2025sub new { 2155sub new {
2026 my $class = shift; 2156 my $class = shift;
2027 2157
2028 # range [value, low, high, page] 2158 # range [value, low, high, page, unit]
2029 2159
2030 # TODO: 0-width page 2160 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2161 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2162 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2164 fg => [1, 1, 1],
2035 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],
2036 range => [0, 0, 100, 10], 2168 range => [0, 0, 100, 10, 0],
2037 req_w => $::WIDTH / 80, 2169 req_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2170 req_h => $::WIDTH / 80,
2039 vertical => 0, 2171 vertical => 0,
2040 can_hover => 1, 2172 can_hover => 1,
2041 inner_pad => 5, 2173 inner_pad => 0.02,
2042 @_ 2174 @_
2043 ); 2175 );
2044 2176
2177 $self->set_value ($self->{range}[0]);
2178 $self->update;
2179
2045 $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 }
2046} 2213}
2047 2214
2048sub size_request { 2215sub size_request {
2049 my ($self) = @_; 2216 my ($self) = @_;
2050 2217
… …
2056 2223
2057sub button_down { 2224sub button_down {
2058 my ($self, $ev, $x, $y) = @_; 2225 my ($self, $ev, $x, $y) = @_;
2059 2226
2060 $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
2061 $self->mouse_motion ($ev, $x, $y); 2231 $self->mouse_motion ($ev, $x, $y);
2062} 2232}
2063 2233
2064sub mouse_motion { 2234sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2066 2236
2067 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
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2254 my ($value, $lo, $hi, $page) = @{$self->{range}};
2255 my $range = ($hi - $page - $lo) || 1e-100;
2069 2256
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2257 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2071 2258
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2259 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2073 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2260 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2074 2261
2075 $x -= $inner_pad_px; # substract the padding 2262 $value = ($value - $lo) / $range;
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2263 $value = $value * $self->{scale} + $self->{offset};
2077 $x = $lo if $x < $lo;
2078 $x = $hi - $page if $x > $hi - $page;
2079 $self->{range}[0] = $x;
2080 2264
2081 $self->emit (changed => $x); 2265 $self->{knob_x} = $value - $knob_w * 0.5;
2082 $self->update; 2266 $self->{knob_w} = $knob_w;
2083 } 2267 });
2084}
2085 2268
2086# the inner_* stuff is for generating a padding for the slider handle, 2269 $self->SUPER::update;
2087# so that the handle doesn't leave the texture. This calculation isn't 100%
2088# correct propably, but it does the job for now
2089sub _calc_inner_pad_px {
2090 my ($self, $w) = @_;
2091 ($w / 100) * $self->{inner_pad} # % to pixels
2092} 2270}
2093 2271
2094sub _draw { 2272sub _draw {
2095 my ($self) = @_; 2273 my ($self) = @_;
2096 2274
2097 $self->SUPER::_draw (); 2275 $self->SUPER::_draw ();
2098 2276
2099 my ($w, $h) = @$self{qw(w h)}; 2277 glScale $self->{w}, $self->{h};
2100 2278
2101 if ($self->{vertical}) { 2279 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2280 # draw a vertical slider like a rotated horizontal slider
2103 2281
2282 glTranslate 1, 0, 0;
2104 glRotate 90, 0, 0, 1; 2283 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2284 }
2109 2285
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2286 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2287 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2288
2113 my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115 $hi = $value + 1 if $lo == $hi;
2116
2117 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120 $page = int $page * $inner_w / ($hi - $lo);
2121 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123 $w -= $page;
2124 $page &= ~1;
2125 glTranslate $page * 0.5, 0, 0;
2126 $page ||= 2;
2127
2128 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131 glEnable GL_BLEND;
2132 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133 glEnable GL_TEXTURE_2D; 2289 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2290 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2291
2136 # draw background 2292 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2293 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2294
2139 # draw handle 2295 # draw handle
2140 $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);
2141 2297
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2298 glDisable GL_TEXTURE_2D;
2144} 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 (@_) }
2145 2341
2146############################################################################# 2342#############################################################################
2147 2343
2148package CFClient::UI::TextView; 2344package CFClient::UI::TextView;
2149 2345
… …
2158 fontsize => 1, 2354 fontsize => 1,
2159 can_events => 0, 2355 can_events => 0,
2160 #font => default_font 2356 #font => default_font
2161 @_, 2357 @_,
2162 2358
2163 layout => (new CFClient::Layout), 2359 layout => (new CFClient::Layout 1),
2164 par => [], 2360 par => [],
2165 height => 0, 2361 height => 0,
2166 children => [ 2362 children => [
2167 (new CFClient::UI::Empty expand => 1), 2363 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2364 (new CFClient::UI::Slider vertical => 1),
… …
2179 2375
2180 $self->{fontsize} = $fontsize; 2376 $self->{fontsize} = $fontsize;
2181 $self->reflow; 2377 $self->reflow;
2182} 2378}
2183 2379
2184sub text_height {
2185 my ($self, $text) = @_;
2186
2187 my $layout = $self->{layout};
2188
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text);
2192
2193 ($layout->size)[1]
2194}
2195
2196sub reflow {
2197 my ($self) = @_;
2198
2199 $self->{need_reflow}++;
2200 $self->update;
2201}
2202
2203sub size_allocate { 2380sub size_allocate {
2204 my ($self, $w, $h) = @_; 2381 my ($self, $w, $h) = @_;
2205 2382
2206 $self->SUPER::size_allocate ($w, $h); 2383 $self->SUPER::size_allocate ($w, $h);
2207 2384
… …
2210 $self->{layout}->set_width ($self->{children}[0]{w}); 2387 $self->{layout}->set_width ($self->{children}[0]{w});
2211 2388
2212 $self->reflow; 2389 $self->reflow;
2213} 2390}
2214 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
2215sub add_paragraph { 2426sub add_paragraph {
2216 my ($self, $color, $text) = @_; 2427 my ($self, $color, $text, $indent) = @_;
2217 2428
2218 #TODO: intelligently "reformat" paragraph 2429 for my $line (split /\n/, $text) {
2219 2430 my ($w, $h) = $self->text_size ($line);
2220 my $height = $self->text_height ($text);
2221
2222 $self->{height} += $height; 2431 $self->{height} += $h;
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2433 }
2223 2434
2224 push @{$self->{par}}, [$height, $color, $text];
2225
2226 $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]);
2227 $self->{children}[1]->update;
2228} 2436}
2229 2437
2230sub update { 2438sub update {
2231 my ($self) = @_; 2439 my ($self) = @_;
2232 2440
… …
2234 2442
2235 return unless $self->{h} > 0; 2443 return unless $self->{h} > 0;
2236 2444
2237 delete $self->{texture}; 2445 delete $self->{texture};
2238 2446
2239 $ROOT->on_refresh ($self, sub { 2447 $ROOT->on_post_alloc ($self, sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449
2240 if (delete $self->{need_reflow}) { 2450 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2451 my $height = 0;
2242 2452
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2244 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 }
2245 2468
2246 $self->{height} = $height; 2469 $self->{height} = $height;
2247 2470
2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2249 2472
2250 delete $self->{texture}; 2473 delete $self->{texture};
2251 } 2474 }
2252 2475
2253 $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 {
2254 glClearColor 0, 0, 0, 0; 2477 glClearColor 0.5, 0.5, 0.5, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2478 glClear GL_COLOR_BUFFER_BIT;
2256 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
2257 glEnable GL_BLEND; 2491 glEnable GL_BLEND;
2492 #TODO# not correct in windows where rgba is forced off
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2493 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0];
2263
2264 my $y0 = $top;
2265 my $y1 = $top + $self->{h};
2266
2267 my $y = 0;
2268
2269 my $layout = $self->{layout};
2270
2271 $layout->set_font ($self->{font}) if $self->{font};
2272 2494
2273 for my $par (@{$self->{par}}) { 2495 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2496 my $h = $par->[1];
2275 2497
2276 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]);
2277 $layout->set_text ($par->[2]); 2501 $layout->set_markup ($par->[4]);
2278 2502
2279 glColor @{ $par->[1] }; 2503 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 my ($W, $H) = $layout->size; 2504
2281 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;
2282 } 2507 }
2283 2508
2284 $y += $h; 2509 $y += $h;
2285 } 2510 }
2286 2511
2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND; 2512 glDisable GL_BLEND;
2289 }; 2513 };
2290 }); 2514 });
2291} 2515}
2292 2516
2293sub _draw { 2517sub _draw {
2294 my ($self) = @_; 2518 my ($self) = @_;
2295 2519
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2520 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2522 glColor 1, 1, 1, 1;
2301 $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});
2302 glDisable GL_TEXTURE_2D; 2524 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2525
2305 $self->{children}[1]->draw; 2526 $self->{children}[1]->draw;
2306 2527
2307} 2528}
2308 2529
… …
2356 2577
2357sub new { 2578sub new {
2358 my $class = shift; 2579 my $class = shift;
2359 2580
2360 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2361 state => 0, 2582 state => 0,
2362 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2363 @_ 2584 @_
2364 ); 2585 );
2365 2586
2366 if ($self->{state}) {
2367 $self->{state} = 0;
2368 $self->toggle_flopper;
2369 }
2370
2371 $self 2587 $self
2372} 2588}
2373 2589
2374sub toggle_flopper { 2590sub toggle_flopper {
2375 my ($self) = @_; 2591 my ($self) = @_;
2376 2592
2377 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2378 if ($self->{state} = !$self->{state}) {
2379 $CFClient::UI::ROOT->add ($self->{other});
2380 $self->{other}->move ($self->coord2global (0, $self->{h}));
2381 $self->emit ("open");
2382 } else {
2383 $CFClient::UI::ROOT->remove ($self->{other});
2384 $self->emit ("close");
2385 }
2386
2387 $self->emit (changed => $self->{state});
2388} 2594}
2389 2595
2390############################################################################# 2596#############################################################################
2391 2597
2392package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2402 @_, 2608 @_,
2403 can_events => 0, 2609 can_events => 0,
2404 ) 2610 )
2405} 2611}
2406 2612
2407sub set_markup { 2613sub set_tooltip_from {
2408 my ($self, $text) = @_; 2614 my ($self, $widget) = @_;
2409 2615
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2616 $self->add (new CFClient::UI::Label
2411 $self->{label}->set_markup ($text); 2617 markup => $widget->{tooltip},
2412 $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 );
2413} 2624}
2414 2625
2415sub size_request { 2626sub size_request {
2416 my ($self) = @_; 2627 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2628
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2629 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2630
2422 ($w + 4, $h + 4) 2631 ($w + 4, $h + 4)
2423} 2632}
… …
2429} 2638}
2430 2639
2431sub _draw { 2640sub _draw {
2432 my ($self) = @_; 2641 my ($self) = @_;
2433 2642
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2643 glTranslate 0.375, 0.375;
2436 2644
2437 my ($w, $h) = @$self{qw(w h)}; 2645 my ($w, $h) = @$self{qw(w h)};
2438 2646
2439 glColor 1, 0.8, 0.4; 2647 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2658 glVertex 0 , $h;
2451 glVertex $w, $h; 2659 glVertex $w, $h;
2452 glVertex $w, 0; 2660 glVertex $w, 0;
2453 glEnd; 2661 glEnd;
2454 2662
2455 glPopMatrix; 2663 glTranslate 2 - 0.375, 2 - 0.375;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2664 $self->SUPER::_draw;
2459} 2665}
2460 2666
2461############################################################################# 2667#############################################################################
2462 2668
… …
2467use CFClient::OpenGL; 2673use CFClient::OpenGL;
2468 2674
2469sub new { 2675sub new {
2470 my $class = shift; 2676 my $class = shift;
2471 2677
2472 $class->SUPER::new ( 2678 my $self = $class->SUPER::new (
2473 aspect => 1, 2679 aspect => 1,
2680 can_events => 0,
2474 @_, 2681 @_,
2475 ) 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
2476} 2699}
2477 2700
2478sub size_request { 2701sub size_request {
2479 (32, 8) 2702 (32, 8)
2480} 2703}
2481 2704
2705sub update {
2706 my ($self) = @_;
2707
2708 return unless $self->{visible};
2709
2710 $self->SUPER::update;
2711}
2712
2482sub _draw { 2713sub _draw {
2483 my ($self) = @_; 2714 my ($self) = @_;
2484 2715
2485 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
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2727 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487 2728
2488 # TODO animation
2489 if ($tex) { 2729 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2730 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2732 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2733 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2734 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2735 }
2499} 2736}
2500 2737
2501############################################################################# 2738sub DESTROY {
2739 my ($self) = @_;
2502 2740
2741 $self->{timer}->cancel
2742 if $self->{timer};
2743
2744 $self->SUPER::DESTROY;
2745}
2746
2747#############################################################################
2748
2503package CFClient::UI::InventoryItem; 2749package CFClient::UI::Inventory;
2504 2750
2505our @ISA = CFClient::UI::HBox::; 2751our @ISA = CFClient::UI::ScrolledWindow::;
2506 2752
2507sub new { 2753sub new {
2508 my $class = shift; 2754 my $class = shift;
2509 2755
2510 my %args = @_;
2511
2512 my $item = $args{item};
2513
2514 my $desc = $item->{nrof} < 2
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518
2519 my $self = $class->SUPER::new ( 2756 my $self = $class->SUPER::new (
2520 can_hover => 1, 2757 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2521 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_;
2526
2527 # todo: maybe put examine on 1? but should just be a tooltip :(
2528 if ($ev->{button} == 1) {
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2543 ],
2544 )->popup ($ev);
2545 }
2546
2547 1
2548 },
2549 %args
2550 );
2551 $self->add(new CFClient::UI::Face
2552 can_events => 0,
2553 face => $item->{face},
2554 anim => $item->{anim},
2555 animspeed => $item->{animspeed});
2556 $self->add(new CFClient::UI::Label
2557 can_events => 0,
2558 text => $desc);
2559
2560 $self
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Inventory;
2566
2567our @ISA = CFClient::UI::ScrolledWindow::;
2568
2569sub new {
2570 my $class = shift;
2571
2572 my $self = $class->SUPER::new (
2573 scrolled => (new CFClient::UI::VBox),
2574 @_, 2758 @_,
2575 ); 2759 );
2576 2760
2577 $self 2761 $self
2578} 2762}
… …
2581 my ($self, $items) = @_; 2765 my ($self, $items) = @_;
2582 2766
2583 $self->{scrolled}->clear; 2767 $self->{scrolled}->clear;
2584 return unless $items; 2768 return unless $items;
2585 2769
2586 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;
2587 2774
2588 $self->{real_items} = \@items; 2775 $self->{real_items} = \@items;
2589 2776
2777 my $row = 0;
2590 for my $item (@items) { 2778 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2 2779 CFClient::Item::update_widgets $item;
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594 2780
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2781 $self->{scrolled}->add (0, $row, $item->{face_widget});
2596 } 2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2597 2784
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2785 $row++;
2599} 2786 }
2600
2601sub size_request {
2602 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h});
2604} 2787}
2605 2788
2606############################################################################# 2789#############################################################################
2607 2790
2608package CFClient::UI::Menu; 2791package CFClient::UI::Menu;
… …
2643 2826
2644# 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)
2645sub popup { 2828sub popup {
2646 my ($self, $ev) = @_; 2829 my ($self, $ev) = @_;
2647 2830
2648 $self->emit ("popdown"); 2831 $self->_emit ("popdown");
2649 2832
2650 # maybe save $GRAB? must be careful about events... 2833 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 2834 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 2835 $self->{button} = $ev->{button};
2653 2836
… …
2668 2851
2669 if ($ev->{button} == $self->{button}) { 2852 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 2853 undef $GRAB;
2671 $self->hide; 2854 $self->hide;
2672 2855
2673 $self->emit ("popdown"); 2856 $self->_emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 2857 $self->{hover}[1]->() if $self->{hover};
2675 } 2858 }
2676} 2859}
2677 2860
2678############################################################################# 2861#############################################################################
2679 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
2680package CFClient::UI::Root; 2973package CFClient::UI::Root;
2681 2974
2682our @ISA = CFClient::UI::Container::; 2975our @ISA = CFClient::UI::Container::;
2683 2976
2684use CFClient::OpenGL; 2977use CFClient::OpenGL;
2685 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
2686sub check_size { 2995sub check_size {
2687 my ($self) = @_; 2996 my ($self) = @_;
2688 2997
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 2998 $self->size_allocate ($self->{w}, $self->{h})
2999 if $self->{w};
2690} 3000}
2691 3001
2692sub size_request { 3002sub size_request {
2693 my ($self) = @_; 3003 my ($self) = @_;
2694 3004
… …
2696} 3006}
2697 3007
2698sub size_allocate { 3008sub size_allocate {
2699 my ($self, $w, $h) = @_; 3009 my ($self, $w, $h) = @_;
2700 3010
2701 my $old_w = $self->{old_w};
2702 my $old_h = $self->{old_h};
2703
2704 if ($old_w && $old_h) {
2705 for my $child ($self->children) {
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{req_w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2722 my ($self, $x, $y, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725
2726 for my $child ($self->children) { 3011 for my $child ($self->children) {
2727 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)};
2728 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
2729 $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;
2730 $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
2731 $child->configure ($X, $Y, $W, $H); 3025 $child->configure ($X, $Y, $W, $H);
2732 } 3026 }
2733} 3027}
2734 3028
2735sub _topleft { 3029sub coord2local {
2736 my ($self, $x, $y) = @_; 3030 my ($self, $x, $y) = @_;
2737 3031
2738 ($x, $y) 3032 ($x, $y)
2739} 3033}
2740 3034
3035sub coord2global {
3036 my ($self, $x, $y) = @_;
3037
3038 ($x, $y)
3039}
3040
2741sub update { 3041sub update {
2742 my ($self) = @_; 3042 my ($self) = @_;
2743 3043
2744 $self->check_size; 3044 $self->check_size;
2745 ::refresh (); 3045 $::WANT_REFRESH++;
2746} 3046}
2747 3047
2748sub add { 3048sub add {
2749 my ($self, $child) = @_; 3049 my ($self, @children) = @_;
2750 3050
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1;
3053
2751 # integerize window positions 3054 # integerise window positions
2752 $child->{x} = int $child->{x}; 3055 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 3056 $child->{y} = int $child->{y};
3057 }
2754 3058
2755 $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 }
2756} 3078}
2757 3079
2758sub on_refresh { 3080sub on_refresh {
2759 my ($self, $id, $cb) = @_; 3081 my ($self, $id, $cb) = @_;
2760 3082
2761 $self->{refresh_hook}{$id} = $cb; 3083 $self->{refresh_hook}{$id} = $cb;
2762} 3084}
2763 3085
3086sub on_post_alloc {
3087 my ($self, $id, $cb) = @_;
3088
3089 $self->{post_alloc_hook}{$id} = $cb;
3090}
3091
2764sub draw { 3092sub draw {
2765 my ($self) = @_; 3093 my ($self) = @_;
2766 3094
2767 while (my $rcb = delete $self->{refresh_hook}) { 3095 while ($self->{refresh_hook}) {
2768 $_->() 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}};
2769 } 3153 }
2770 3154
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3155 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3156 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3157 glClear GL_COLOR_BUFFER_BIT;
2774 3158
2775 glMatrixMode GL_PROJECTION; 3159 glMatrixMode GL_PROJECTION;
2776 glLoadIdentity; 3160 glLoadIdentity;
2777 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3161 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778 glMatrixMode GL_MODELVIEW; 3162 glMatrixMode GL_MODELVIEW;
2779 glLoadIdentity; 3163 glLoadIdentity;
2780 3164
2781 $self->_draw; 3165 $self->_draw;
2782} 3166}
… …
2784############################################################################# 3168#############################################################################
2785 3169
2786package CFClient::UI; 3170package CFClient::UI;
2787 3171
2788$ROOT = new CFClient::UI::Root; 3172$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3173$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3174
27911 31751
2792 3176

Diff Legend

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