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.247 by root, Sun May 28 01:16:04 2006 UTC

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

Diff Legend

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