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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.253 by root, Sun May 28 23:28:12 2006 UTC

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

Diff Legend

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