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.189 by root, Mon May 8 22:17:24 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 2006 UTC

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

Diff Legend

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