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.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.255 by root, Mon May 29 02:01:56 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}); 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;
830 1000
831our @ISA = CFClient::UI::Bin::; 1001our @ISA = CFClient::UI::Bin::;
832 1002
833use CFClient::OpenGL; 1003use CFClient::OpenGL;
834 1004
835my @tex = 1005my $bg =
1006 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1007 mipmap => 1, wrap => 1;
1008
1009my @border =
836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1010 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
837 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1011 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
838 1012
839sub new { 1013sub new {
840 my $class = shift; 1014 my $class = shift;
841 1015
842 # TODO: user_x, user_y, overwrite moveto?
843
844 my $self = $class->SUPER::new ( 1016 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1], 1017 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1], 1018 border_bg => [1, 1, 1, 1],
847 border => 0.6, 1019 border => 0.6,
1020 is_toplevel => 1,
848 can_events => 1, 1021 can_events => 1,
849 @_ 1022 @_
850 ); 1023 );
851 1024
852 $self->{title} &&= new CFClient::UI::Label 1025 $self->{title} &&= new CFClient::UI::Label
853 align => 0, 1026 align => 0,
… …
872 $h + $self->border * 2, 1045 $h + $self->border * 2,
873 ) 1046 )
874} 1047}
875 1048
876sub size_allocate { 1049sub size_allocate {
877 my ($self, $w, $h) = @_; 1050 my ($self, $w, $h, $changed) = @_;
1051
1052 return unless $changed;
878 1053
879 $h -= List::Util::max 0, $self->border * 2; 1054 $h -= List::Util::max 0, $self->border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 1055 $w -= List::Util::max 0, $self->border * 2;
881 1056
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883 if $self->{title}; 1058 if $self->{title};
884 1059
885 $self->child->configure ($self->border, $self->border, $w, $h); 1060 $self->child->configure ($self->border, $self->border, $w, $h);
886} 1061}
887 1062
… …
906 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
907 1082
908 my $dx = $ev->{x} - $ox; 1083 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy; 1084 my $dy = $ev->{y} - $oy;
910 1085
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1090 $self->move ($self->{user_x}, $self->{user_y});
914 $self->check_size; 1091 $self->realloc;
915 }; 1092 };
916 1093
917 } elsif ($lr ^ $td) { 1094 } elsif ($lr ^ $td) {
918 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
919 my ($bx, $by) = ($self->{x}, $self->{y}); 1096 my ($bx, $by) = ($self->{x}, $self->{y});
… …
921 $self->{motion} = sub { 1098 $self->{motion} = sub {
922 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
923 1100
924 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
925 1102
926 $self->move ($bx + $x - $ox, $by + $y - $oy); 1103 $self->{user_x} = $bx + $x - $ox;
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
927 $self->update; 1107 $self->realloc;
928 }; 1108 };
929 } 1109 }
930} 1110}
931 1111
932sub button_up { 1112sub button_up {
… …
945 my ($self) = @_; 1125 my ($self) = @_;
946 1126
947 my ($w, $h ) = ($self->{w}, $self->{h}); 1127 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949 1129
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 1130 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 1132
955 my $border = $self->border; 1133 my $border = $self->border;
956 1134
957 glColor @{ $self->{border_bg} }; 1135 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 1136 $border[0]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 1137 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1138 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1139 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1140
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1142 glColor @{ $self->{bg} };
965 1143
966 # TODO: repeat texture not scale 1144 # TODO: repeat texture not scale
1145 # solve this better(?)
967 my $rep_x = $cw / $bg->{w}; 1146 $bg->{s} = $cw / $bg->{w};
968 my $rep_y = $ch / $bg->{h}; 1147 $bg->{t} = $ch / $bg->{h};
969
970 glColor @{ $self->{bg} };
971
972 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1148 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1149 }
976 1150
977 glDisable GL_TEXTURE_2D; 1151 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1152
981 $self->{title}->draw if $self->{title}; 1153 $self->{title}->draw if $self->{title};
982 1154
983 $self->child->draw; 1155 $self->child->draw;
984} 1156}
… …
996sub new { 1168sub new {
997 my $class = shift; 1169 my $class = shift;
998 1170
999 $class->SUPER::new ( 1171 $class->SUPER::new (
1000 col_expand => [], 1172 col_expand => [],
1001 @_ 1173 @_,
1002 ) 1174 )
1175}
1176
1177sub children {
1178 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1003} 1179}
1004 1180
1005sub add { 1181sub add {
1006 my ($self, $x, $y, $child) = @_; 1182 my ($self, $x, $y, $child) = @_;
1007 1183
1008 $child->set_parent ($self); 1184 $child->set_parent ($self);
1009 $self->{children}[$y][$x] = $child; 1185 $self->{children}[$y][$x] = $child;
1010 1186
1011 $child->check_size; 1187 $self->realloc;
1012} 1188}
1013 1189
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
1018# TODO: move to container class maybe? send childs a signal on removal? 1190# TODO: move to container class maybe? send children a signal on removal?
1019sub clear { 1191sub clear {
1020 my ($self) = @_; 1192 my ($self) = @_;
1021 1193
1022 my @children = $self->children; 1194 my @children = $self->children;
1023 delete $self->{children}; 1195 delete $self->{children};
… …
1025 for (@children) { 1197 for (@children) {
1026 delete $_->{parent}; 1198 delete $_->{parent};
1027 $_->hide; 1199 $_->hide;
1028 } 1200 }
1029 1201
1030 $self->update; 1202 $self->realloc;
1031} 1203}
1032 1204
1033sub get_wh { 1205sub get_wh {
1034 my ($self) = @_; 1206 my ($self) = @_;
1035 1207
… …
1062 (sum @$hs), 1234 (sum @$hs),
1063 ) 1235 )
1064} 1236}
1065 1237
1066sub size_allocate { 1238sub size_allocate {
1067 my ($self, $w, $h) = @_; 1239 my ($self, $w, $h, $changed) = @_;
1068 1240
1069 my ($ws, $hs) = $self->get_wh; 1241 my ($ws, $hs) = $self->get_wh;
1070 1242
1071 my $req_w = sum @$ws; 1243 my $req_w = (sum @$ws) || 1;
1072 my $req_h = sum @$hs; 1244 my $req_h = (sum @$hs) || 1;
1073 1245
1074 # TODO: nicer code && do row_expand 1246 # TODO: nicer code && do row_expand
1075 my @col_expand = @{$self->{col_expand}}; 1247 my @col_expand = @{$self->{col_expand}};
1076 @col_expand = (1) x @$ws unless @col_expand; 1248 @col_expand = (1) x @$ws unless @col_expand;
1077 my $col_expand = (sum @col_expand) || 1; 1249 my $col_expand = (sum @col_expand) || 1;
… …
1131 } 1303 }
1132} 1304}
1133 1305
1134############################################################################# 1306#############################################################################
1135 1307
1308package CFClient::UI::Box;
1309
1310our @ISA = CFClient::UI::Container::;
1311
1312sub size_request {
1313 my ($self) = @_;
1314
1315 $self->{vertical}
1316 ? (
1317 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1318 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319 )
1320 : (
1321 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1322 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1323 )
1324}
1325
1326sub size_allocate {
1327 my ($self, $w, $h, $changed) = @_;
1328
1329 my $space = $self->{vertical} ? $h : $w;
1330 my $children = $self->{children};
1331
1332 my @req;
1333
1334 if ($self->{homogeneous}) {
1335 @req = ($space / (@$children || 1)) x @$children;
1336 } else {
1337 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1338 my $req = List::Util::sum @req;
1339
1340 if ($req > $space) {
1341 # ah well, not enough space
1342 $_ *= $space / $req for @req;
1343 } else {
1344 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1345
1346 $space = ($space - $req) / $expand; # remaining space to give away
1347
1348 $req[$_] += $space * $children->[$_]{expand}
1349 for 0 .. $#$children;
1350 }
1351 }
1352
1353 CFClient::UI::harmonize \@req;
1354
1355 my $pos = 0;
1356 for (0 .. $#$children) {
1357 my $alloc = $req[$_];
1358 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1359
1360 $pos += $alloc;
1361 }
1362
1363 1
1364}
1365
1366#############################################################################
1367
1136package CFClient::UI::HBox; 1368package CFClient::UI::HBox;
1137 1369
1138# TODO: wrap into common Box base class
1139
1140our @ISA = CFClient::UI::Container::; 1370our @ISA = CFClient::UI::Box::;
1141 1371
1142sub size_request { 1372sub new {
1143 my ($self) = @_; 1373 my $class = shift;
1144 1374
1145 my @alloc = map [$_->size_request], @{$self->{children}}; 1375 $class->SUPER::new (
1146 1376 vertical => 0,
1147 ( 1377 @_,
1148 (List::Util::sum map $_->[0], @alloc),
1149 (List::Util::max map $_->[1], @alloc),
1150 ) 1378 )
1151} 1379}
1152 1380
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############################################################################# 1381#############################################################################
1195 1382
1196package CFClient::UI::VBox; 1383package CFClient::UI::VBox;
1197 1384
1198# TODO: wrap into common Box base class
1199
1200our @ISA = CFClient::UI::Container::; 1385our @ISA = CFClient::UI::Box::;
1201 1386
1202sub size_request { 1387sub new {
1203 my ($self) = @_; 1388 my $class = shift;
1204 1389
1205 my @alloc = map [$_->size_request], @{$self->{children}}; 1390 $class->SUPER::new (
1206 1391 vertical => 1,
1207 ( 1392 @_,
1208 (List::Util::max map $_->[0], @alloc),
1209 (List::Util::sum map $_->[1], @alloc),
1210 ) 1393 )
1211} 1394}
1212 1395
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############################################################################# 1396#############################################################################
1253 1397
1254package CFClient::UI::Label; 1398package CFClient::UI::Label;
1255 1399
1256our @ISA = CFClient::UI::Base::; 1400our @ISA = CFClient::UI::DrawBG::;
1257 1401
1258use CFClient::OpenGL; 1402use CFClient::OpenGL;
1259 1403
1260sub new { 1404sub new {
1261 my ($class, %arg) = @_; 1405 my ($class, %arg) = @_;
1262 1406
1263 my $self = $class->SUPER::new ( 1407 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1408 fg => [1, 1, 1],
1409 #bg => none
1410 #active_bg => none
1265 #font => default_font 1411 #font => default_font
1266 #text => initial text 1412 #text => initial text
1267 #markup => initial narkup 1413 #markup => initial narkup
1414 #max_w => maximum pixel width
1415 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1416 layout => (new CFClient::Layout),
1269 fontsize => 1, 1417 fontsize => 1,
1270 align => -1, 1418 align => -1,
1271 valign => -1, 1419 valign => -1,
1272 padding => 2, 1420 padding => 2,
… …
1287 } 1435 }
1288 1436
1289 $self 1437 $self
1290} 1438}
1291 1439
1292sub escape { 1440sub escape($) {
1293 local $_ = $_[1]; 1441 local $_ = $_[0];
1294 1442
1295 s/&/&amp;/g; 1443 s/&/&amp;/g;
1296 s/>/&gt;/g; 1444 s/>/&gt;/g;
1297 s/</&lt;/g; 1445 s/</&lt;/g;
1298 1446
1299 $_[1] 1447 $_
1300} 1448}
1301 1449
1302sub update { 1450sub update {
1303 my ($self) = @_; 1451 my ($self) = @_;
1304 1452
… …
1313 $self->{text} = "T$text"; 1461 $self->{text} = "T$text";
1314 1462
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1463 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1316 $self->{layout}->set_text ($text); 1464 $self->{layout}->set_text ($text);
1317 1465
1466 $self->realloc;
1318 $self->update; 1467 $self->update;
1319 $self->check_size;
1320} 1468}
1321 1469
1322sub set_markup { 1470sub set_markup {
1323 my ($self, $markup) = @_; 1471 my ($self, $markup) = @_;
1324 1472
… …
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1476 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329 1477
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1478 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1331 $self->{layout}->set_markup ($markup); 1479 $self->{layout}->set_markup ($markup);
1332 1480
1481 $self->realloc;
1333 $self->update; 1482 $self->update;
1334 $self->check_size;
1335} 1483}
1336 1484
1337sub size_request { 1485sub size_request {
1338 my ($self) = @_; 1486 my ($self) = @_;
1339 1487
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1488 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1); 1489 $self->{layout}->set_width ($self->{max_w} || -1);
1490 $self->{layout}->set_ellipsise ($self->{ellipsise});
1491 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1492 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1493
1344 my ($w, $h) = $self->{layout}->size; 1494 my ($w, $h) = $self->{layout}->size;
1345 1495
1346 if (exists $self->{template}) { 1496 if (exists $self->{template}) {
… …
1358 $h + $self->{padding} * 2, 1508 $h + $self->{padding} * 2,
1359 ) 1509 )
1360} 1510}
1361 1511
1362sub size_allocate { 1512sub size_allocate {
1363 my ($self, $w, $h) = @_; 1513 my ($self, $w, $h, $changed) = @_;
1364 1514
1365 delete $self->{texture}; 1515 delete $self->{texture}
1516 if $changed;
1366} 1517}
1367 1518
1368sub set_fontsize { 1519sub set_fontsize {
1369 my ($self, $fontsize) = @_; 1520 my ($self, $fontsize) = @_;
1370 1521
1371 $self->{fontsize} = $fontsize; 1522 $self->{fontsize} = $fontsize;
1372 delete $self->{texture}; 1523 delete $self->{texture};
1373 1524
1374 $self->update; 1525 $self->realloc;
1375 $self->check_size;
1376} 1526}
1377 1527
1378sub _draw { 1528sub _draw {
1379 my ($self) = @_; 1529 my ($self) = @_;
1530
1531 $self->SUPER::_draw; # draw background, if applicable
1380 1532
1381 my $tex = $self->{texture} ||= do { 1533 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1534 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1535 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $self->{layout}->set_width ($self->{w}); 1536 $self->{layout}->set_width ($self->{w});
1537 $self->{layout}->set_ellipsise ($self->{ellipsise});
1538 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1539 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1540
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1541 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388 1542
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1543 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1544 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5; 1545 : ($self->{w} - $tex->{w}) * 0.5);
1392 1546
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1547 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1548 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5; 1549 : ($self->{h} - $tex->{h}) * 0.5);
1396 1550
1397 $tex 1551 $tex
1398 }; 1552 };
1399 1553
1400 glEnable GL_TEXTURE_2D; 1554 glEnable GL_TEXTURE_2D;
… …
1428 active_fg => [0, 0, 0], 1582 active_fg => [0, 0, 0],
1429 can_hover => 1, 1583 can_hover => 1,
1430 can_focus => 1, 1584 can_focus => 1,
1431 valign => 0, 1585 valign => 0,
1432 can_events => 1, 1586 can_events => 1,
1587 #text => ...
1433 @_ 1588 @_
1434 ) 1589 )
1435} 1590}
1436 1591
1437sub _set_text { 1592sub _set_text {
… …
1447 $self->{text} = $text; 1602 $self->{text} = $text;
1448 1603
1449 $text =~ s/./*/g if $self->{hidden}; 1604 $text =~ s/./*/g if $self->{hidden};
1450 $self->{layout}->set_text ("$text "); 1605 $self->{layout}->set_text ("$text ");
1451 1606
1452 $self->emit (changed => $self->{text}); 1607 $self->_emit (changed => $self->{text});
1453} 1608}
1454 1609
1455sub set_text { 1610sub set_text {
1456 my ($self, $text) = @_; 1611 my ($self, $text) = @_;
1457 1612
1458 $self->{cursor} = length $text; 1613 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1614 $self->_set_text ($text);
1460 $self->check_size; 1615
1461 $self->update; 1616 $self->realloc;
1462} 1617}
1463 1618
1464sub get_text { 1619sub get_text {
1465 $_[0]{text} 1620 $_[0]{text}
1466} 1621}
… …
1469 my ($self) = @_; 1624 my ($self) = @_;
1470 1625
1471 my ($w, $h) = $self->SUPER::size_request; 1626 my ($w, $h) = $self->SUPER::size_request;
1472 1627
1473 ($w + 1, $h) # add 1 for cursor 1628 ($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} 1629}
1481 1630
1482sub key_down { 1631sub key_down {
1483 my ($self, $ev) = @_; 1632 my ($self, $ev) = @_;
1484 1633
… …
1486 my $sym = $ev->{sym}; 1635 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1636 my $uni = $ev->{unicode};
1488 1637
1489 my $text = $self->get_text; 1638 my $text = $self->get_text;
1490 1639
1491 if ($sym == 8) { 1640 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1641 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1642 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1643 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1644 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1645 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1646 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1647 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1648 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1649 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1650 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1651 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1652 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1653 $self->_emit ('escape');
1505 } elsif ($uni) { 1654 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1655 substr $text, $self->{cursor}++, 0, chr $uni;
1507 } 1656 }
1508 1657
1509 $self->_set_text ($text); 1658 $self->_set_text ($text);
1510 $self->update; 1659
1660 $self->realloc;
1511} 1661}
1512 1662
1513sub focus_in { 1663sub focus_in {
1514 my ($self) = @_; 1664 my ($self) = @_;
1515 1665
… …
1595 if ($sym == 13) { 1745 if ($sym == 13) {
1596 unshift @{$self->{history}}, 1746 unshift @{$self->{history}},
1597 my $txt = $self->get_text; 1747 my $txt = $self->get_text;
1598 $self->{history_pointer} = -1; 1748 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = ''; 1749 $self->{history_saveback} = '';
1600 $self->emit (activate => $txt); 1750 $self->_emit (activate => $txt);
1601 $self->update; 1751 $self->update;
1602 1752
1603 } elsif ($sym == CFClient::SDLK_UP) { 1753 } elsif ($sym == CFClient::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) { 1754 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text; 1755 $self->{history_saveback} = $self->get_text;
… …
1644 my $class = shift; 1794 my $class = shift;
1645 1795
1646 $class->SUPER::new ( 1796 $class->SUPER::new (
1647 padding => 4, 1797 padding => 4,
1648 fg => [1, 1, 1], 1798 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1799 active_fg => [0, 0, 1],
1651 can_hover => 1, 1800 can_hover => 1,
1652 align => 0, 1801 align => 0,
1653 valign => 0, 1802 valign => 0,
1654 can_events => 1, 1803 can_events => 1,
1655 @_ 1804 @_
1656 ) 1805 )
1657} 1806}
1658 1807
1808sub activate { }
1809
1659sub button_up { 1810sub button_up {
1660 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1661 1812
1813 $self->emit ("activate")
1662 if ($x >= 0 && $x < $self->{w} 1814 if $x >= 0 && $x < $self->{w}
1663 && $y >= 0 && $y < $self->{h}) { 1815 && $y >= 0 && $y < $self->{h};
1664 $self->emit ("activate");
1665 }
1666} 1816}
1667 1817
1668sub _draw { 1818sub _draw {
1669 my ($self) = @_; 1819 my ($self) = @_;
1670 1820
… …
1672 1822
1673 if ($GRAB == $self) { 1823 if ($GRAB == $self) {
1674 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1675 } 1825 }
1676 1826
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 1827 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 glColor 0, 0, 0, 1; 1829 glColor 0, 0, 0, 1;
1682 1830
1683 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1831 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1684 1832
1685 glDisable GL_TEXTURE_2D; 1833 glDisable GL_TEXTURE_2D;
1686 glDisable GL_BLEND;
1687 1834
1688 $self->SUPER::_draw; 1835 $self->SUPER::_draw;
1689} 1836}
1690 1837
1691############################################################################# 1838#############################################################################
… …
1705 1852
1706 $class->SUPER::new ( 1853 $class->SUPER::new (
1707 padding => 2, 1854 padding => 2,
1708 fg => [1, 1, 1], 1855 fg => [1, 1, 1],
1709 active_fg => [1, 1, 0], 1856 active_fg => [1, 1, 0],
1857 bg => [0, 0, 0, 0.2],
1858 active_bg => [1, 1, 1, 0.5],
1710 state => 0, 1859 state => 0,
1711 can_hover => 1, 1860 can_hover => 1,
1712 @_ 1861 @_
1713 ) 1862 )
1714} 1863}
… …
1723 my ($self, $ev, $x, $y) = @_; 1872 my ($self, $ev, $x, $y) = @_;
1724 1873
1725 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1874 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1726 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1875 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1727 $self->{state} = !$self->{state}; 1876 $self->{state} = !$self->{state};
1728 $self->emit (changed => $self->{state}); 1877 $self->_emit (changed => $self->{state});
1729 } 1878 }
1730} 1879}
1731 1880
1732sub _draw { 1881sub _draw {
1733 my ($self) = @_; 1882 my ($self) = @_;
… …
1738 1887
1739 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1888 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1740 1889
1741 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1890 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1742 1891
1743 glEnable GL_BLEND; 1892 my $tex = $self->{state} ? $tex[1] : $tex[0];
1893
1744 glEnable GL_TEXTURE_2D; 1894 glEnable GL_TEXTURE_2D;
1745 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746
1747 my $tex = $self->{state} ? $tex[1] : $tex[0];
1748
1749 $tex->draw_quad (0, 0, $s, $s); 1895 $tex->draw_quad_alpha (0, 0, $s, $s);
1750
1751 glDisable GL_TEXTURE_2D; 1896 glDisable GL_TEXTURE_2D;
1752 glDisable GL_BLEND;
1753} 1897}
1754 1898
1755############################################################################# 1899#############################################################################
1756 1900
1757package CFClient::UI::Image; 1901package CFClient::UI::Image;
… …
1800 glTranslate 0, -$self->{w}, 0; 1944 glTranslate 0, -$self->{w}, 0;
1801 1945
1802 ($w, $h) = ($h, $w); 1946 ($w, $h) = ($h, $w);
1803 } 1947 }
1804 1948
1805 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D; 1949 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1950 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809 1951
1810 $tex->draw_quad (0, 0, $w, $h); 1952 $tex->draw_quad_alpha (0, 0, $w, $h);
1811 1953
1812 glDisable GL_BLEND;
1813 glDisable GL_TEXTURE_2D; 1954 glDisable GL_TEXTURE_2D;
1814} 1955}
1815 1956
1816############################################################################# 1957#############################################################################
1817 1958
… …
2006 qw(s1_slider.png s1_slider_bg.png); 2147 qw(s1_slider.png s1_slider_bg.png);
2007 2148
2008sub new { 2149sub new {
2009 my $class = shift; 2150 my $class = shift;
2010 2151
2011 # range [value, low, high, page] 2152 # range [value, low, high, page, unit]
2012 2153
2013 # TODO: 0-width page 2154 # TODO: 0-width page
2014 # TODO: req_w/h are wrong with vertical 2155 # TODO: req_w/h are wrong with vertical
2015 # TODO: calculations are off 2156 # TODO: calculations are off
2016 my $self = $class->SUPER::new ( 2157 my $self = $class->SUPER::new (
2017 fg => [1, 1, 1], 2158 fg => [1, 1, 1],
2018 active_fg => [0, 0, 0], 2159 active_fg => [0, 0, 0],
2160 bg => [0, 0, 0, 0.2],
2161 active_bg => [1, 1, 1, 0.5],
2019 range => [0, 0, 100, 10], 2162 range => [0, 0, 100, 10, 0],
2020 req_w => $::WIDTH / 80, 2163 req_w => $::WIDTH / 80,
2021 req_h => $::WIDTH / 80, 2164 req_h => $::WIDTH / 80,
2022 vertical => 0, 2165 vertical => 0,
2023 can_hover => 1, 2166 can_hover => 1,
2024 inner_pad => 5, 2167 inner_pad => 0.02,
2025 @_ 2168 @_
2026 ); 2169 );
2027 2170
2171 $self->set_value ($self->{range}[0]);
2172 $self->update;
2173
2028 $self 2174 $self
2175}
2176
2177sub changed { }
2178
2179sub set_range {
2180 my ($self, $range) = @_;
2181
2182 ($range, $self->{range}) = ($self->{range}, $range);
2183
2184 $self->update
2185 if "@$range" ne "@{$self->{range}}";
2186}
2187
2188sub set_value {
2189 my ($self, $value) = @_;
2190
2191 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2192
2193 $hi = $lo + 1 if $hi <= $lo;
2194
2195 $page = $hi - $lo if $page > $hi - $lo;
2196
2197 $value = $lo if $value < $lo;
2198 $value = $hi - $page if $value > $hi - $page;
2199
2200 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2201 if $unit;
2202
2203 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2204
2205 if ($value != $old_value) {
2206 $self->_emit (changed => $value);
2207 $self->update;
2208 }
2029} 2209}
2030 2210
2031sub size_request { 2211sub size_request {
2032 my ($self) = @_; 2212 my ($self) = @_;
2033 2213
… …
2039 2219
2040sub button_down { 2220sub button_down {
2041 my ($self, $ev, $x, $y) = @_; 2221 my ($self, $ev, $x, $y) = @_;
2042 2222
2043 $self->SUPER::button_down ($ev, $x, $y); 2223 $self->SUPER::button_down ($ev, $x, $y);
2224
2225 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2226
2044 $self->mouse_motion ($ev, $x, $y); 2227 $self->mouse_motion ($ev, $x, $y);
2045} 2228}
2046 2229
2047sub mouse_motion { 2230sub mouse_motion {
2048 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
2049 2232
2050 if ($GRAB == $self) { 2233 if ($GRAB == $self) {
2234 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2235
2236 my (undef, $lo, $hi, $page) = @{$self->{range}};
2237
2238 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2239
2240 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2241 }
2242}
2243
2244sub update {
2245 my ($self) = @_;
2246
2247 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2248 $self->set_value ($self->{range}[0]);
2249
2051 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2250 my ($value, $lo, $hi, $page) = @{$self->{range}};
2251 my $range = ($hi - $page - $lo) || 1e-100;
2052 2252
2053 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2253 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2054 2254
2055 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2255 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2056 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2256 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2057 2257
2058 $x -= $inner_pad_px; # substract the padding 2258 $value = ($value - $lo) / $range;
2059 $x = $x * ($hi - $lo) / $inner_w + $lo; 2259 $value = $value * $self->{scale} + $self->{offset};
2060 $x = $lo if $x < $lo;
2061 $x = $hi - $page if $x > $hi - $page;
2062 $self->{range}[0] = $x;
2063 2260
2064 $self->emit (changed => $x); 2261 $self->{knob_x} = $value - $knob_w * 0.5;
2065 $self->update; 2262 $self->{knob_w} = $knob_w;
2066 } 2263 });
2067}
2068 2264
2069# the inner_* stuff is for generating a padding for the slider handle, 2265 $self->SUPER::update;
2070# so that the handle doesn't leave the texture. This calculation isn't 100%
2071# correct propably, but it does the job for now
2072sub _calc_inner_pad_px {
2073 my ($self, $w) = @_;
2074 ($w / 100) * $self->{inner_pad} # % to pixels
2075} 2266}
2076 2267
2077sub _draw { 2268sub _draw {
2078 my ($self) = @_; 2269 my ($self) = @_;
2079 2270
2080 $self->SUPER::_draw (); 2271 $self->SUPER::_draw ();
2081 2272
2082 my ($w, $h) = @$self{qw(w h)}; 2273 glScale $self->{w}, $self->{h};
2083 2274
2084 if ($self->{vertical}) { 2275 if ($self->{vertical}) {
2085 # draw a vertical slider like a rotated horizontal slider 2276 # draw a vertical slider like a rotated horizontal slider
2086 2277
2278 glTranslate 1, 0, 0;
2087 glRotate 90, 0, 0, 1; 2279 glRotate 90, 0, 0, 1;
2088 glTranslate 0, -$self->{w}, 0;
2089
2090 ($w, $h) = ($h, $w);
2091 } 2280 }
2092 2281
2093 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2282 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2094 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2283 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2095 2284
2096 my ($value, $lo, $hi, $page) = @{$self->{range}};
2097
2098 $hi = $value + 1 if $lo == $hi;
2099
2100 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2101 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2102
2103 $page = int $page * $inner_w / ($hi - $lo);
2104 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2105
2106 $w -= $page;
2107 $page &= ~1;
2108 glTranslate $page * 0.5, 0, 0;
2109 $page ||= 2;
2110
2111 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2112 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2113
2114 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2287
2119 # draw background 2288 # draw background
2120 $tex[1]->draw_quad (0, 0, $w, $h); 2289 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2121 2290
2122 # draw handle 2291 # draw handle
2123 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2292 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2124 2293
2125 glDisable GL_BLEND;
2126 glDisable GL_TEXTURE_2D; 2294 glDisable GL_TEXTURE_2D;
2127} 2295}
2296
2297#############################################################################
2298
2299package CFClient::UI::ValSlider;
2300
2301our @ISA = CFClient::UI::HBox::;
2302
2303sub new {
2304 my ($class, %arg) = @_;
2305
2306 my $range = delete $arg{range};
2307
2308 my $self = $class->SUPER::new (
2309 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2310 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2311 to_value => sub { shift },
2312 from_value => sub { shift },
2313 %arg,
2314 );
2315
2316 $self->{slider}->connect (changed => sub {
2317 my ($self, $value) = @_;
2318 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2319 $self->{parent}->emit (changed => $value);
2320 });
2321
2322# $self->{entry}->connect (changed => sub {
2323# my ($self, $value) = @_;
2324# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2325# $self->{parent}->emit (changed => $value);
2326# });
2327
2328 $self->add ($self->{slider}, $self->{entry});
2329
2330 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2331
2332 $self
2333}
2334
2335sub set_range { shift->{slider}->set_range (@_) }
2336sub set_value { shift->{slider}->set_value (@_) }
2128 2337
2129############################################################################# 2338#############################################################################
2130 2339
2131package CFClient::UI::TextView; 2340package CFClient::UI::TextView;
2132 2341
… …
2141 fontsize => 1, 2350 fontsize => 1,
2142 can_events => 0, 2351 can_events => 0,
2143 #font => default_font 2352 #font => default_font
2144 @_, 2353 @_,
2145 2354
2146 layout => (new CFClient::Layout), 2355 layout => (new CFClient::Layout 1),
2147 par => [], 2356 par => [],
2148 height => 0, 2357 height => 0,
2149 children => [ 2358 children => [
2150 (new CFClient::UI::Empty expand => 1), 2359 (new CFClient::UI::Empty expand => 1),
2151 (new CFClient::UI::Slider vertical => 1), 2360 (new CFClient::UI::Slider vertical => 1),
… …
2162 2371
2163 $self->{fontsize} = $fontsize; 2372 $self->{fontsize} = $fontsize;
2164 $self->reflow; 2373 $self->reflow;
2165} 2374}
2166 2375
2167sub text_height {
2168 my ($self, $text) = @_;
2169
2170 my $layout = $self->{layout};
2171
2172 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2173 $layout->set_width ($self->{children}[0]{w});
2174 $layout->set_text ($text);
2175
2176 ($layout->size)[1]
2177}
2178
2179sub reflow {
2180 my ($self) = @_;
2181
2182 $self->{need_reflow}++;
2183 $self->update;
2184}
2185
2186sub size_allocate { 2376sub size_allocate {
2187 my ($self, $w, $h) = @_; 2377 my ($self, $w, $h, $changed) = @_;
2188 2378
2189 $self->SUPER::size_allocate ($w, $h); 2379 $self->SUPER::size_allocate ($w, $h, $changed);
2380
2381 return unless $changed;
2190 2382
2191 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2383 $self->{layout}->set_font ($self->{font}) if $self->{font};
2192 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $self->{layout}->set_width ($self->{children}[0]{w}); 2385 $self->{layout}->set_width ($self->{children}[0]{w});
2194 2386
2195 $self->reflow; 2387 $self->reflow;
2196} 2388}
2197 2389
2390sub text_size {
2391 my ($self, $text, $indent) = @_;
2392
2393 my $layout = $self->{layout};
2394
2395 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $layout->set_width ($self->{children}[0]{w} - $indent);
2397 $layout->set_markup ($text);
2398
2399 $layout->size
2400}
2401
2402sub reflow {
2403 my ($self) = @_;
2404
2405 $self->{need_reflow}++;
2406 $self->update;
2407}
2408
2409sub set_offset {
2410 my ($self, $offset) = @_;
2411
2412 # todo: base offset on lines or so, not on pixels
2413 $self->{children}[1]->set_value ($offset);
2414}
2415
2416sub clear {
2417 my ($self) = @_;
2418
2419 $self->{par} = [];
2420 $self->{height} = 0;
2421 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2422}
2423
2198sub add_paragraph { 2424sub add_paragraph {
2199 my ($self, $color, $text) = @_; 2425 my ($self, $color, $text, $indent) = @_;
2200 2426
2201 #TODO: intelligently "reformat" paragraph 2427 for my $line (split /\n/, $text) {
2202 2428 my ($w, $h) = $self->text_size ($line);
2203 my $height = $self->text_height ($text);
2204
2205 $self->{height} += $height; 2429 $self->{height} += $h;
2430 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2431 }
2206 2432
2207 push @{$self->{par}}, [$height, $color, $text];
2208
2209 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2433 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2210 $self->{children}[1]->update;
2211} 2434}
2212 2435
2213sub update { 2436sub update {
2214 my ($self) = @_; 2437 my ($self) = @_;
2215 2438
… …
2217 2440
2218 return unless $self->{h} > 0; 2441 return unless $self->{h} > 0;
2219 2442
2220 delete $self->{texture}; 2443 delete $self->{texture};
2221 2444
2222 $ROOT->on_refresh ($self, sub { 2445 $ROOT->on_post_alloc ($self, sub {
2446 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2447
2223 if (delete $self->{need_reflow}) { 2448 if (delete $self->{need_reflow}) {
2224 my $height = 0; 2449 my $height = 0;
2225 2450
2226 $height += $_->[0] = $self->text_height ($_->[2]) 2451 my $layout = $self->{layout};
2452
2453 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2454
2227 for @{$self->{par}}; 2455 for (@{$self->{par}}) {
2456 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2457 $layout->set_width ($W - $_->[3]);
2458 $layout->set_markup ($_->[4]);
2459 my ($w, $h) = $layout->size;
2460 $_->[0] = $w + $_->[3];
2461 $_->[1] = $h;
2462 }
2463
2464 $height += $_->[1];
2465 }
2228 2466
2229 $self->{height} = $height; 2467 $self->{height} = $height;
2230 2468
2231 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2469 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2232 2470
2233 delete $self->{texture}; 2471 delete $self->{texture};
2234 } 2472 }
2235 2473
2236 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2474 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2237 glClearColor 0, 0, 0, 0; 2475 glClearColor 0.5, 0.5, 0.5, 0;
2238 glClear GL_COLOR_BUFFER_BIT; 2476 glClear GL_COLOR_BUFFER_BIT;
2239 2477
2478 my $top = int $self->{children}[1]{range}[0];
2479
2480 my $y0 = $top;
2481 my $y1 = $top + $H;
2482
2483 my $y = 0;
2484
2485 my $layout = $self->{layout};
2486
2487 $layout->set_font ($self->{font}) if $self->{font};
2488
2240 glEnable GL_BLEND; 2489 glEnable GL_BLEND;
2490 #TODO# not correct in windows where rgba is forced off
2241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2491 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0];
2246
2247 my $y0 = $top;
2248 my $y1 = $top + $self->{h};
2249
2250 my $y = 0;
2251
2252 my $layout = $self->{layout};
2253
2254 $layout->set_font ($self->{font}) if $self->{font};
2255 2492
2256 for my $par (@{$self->{par}}) { 2493 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2494 my $h = $par->[1];
2258 2495
2259 if ($y0 < $y + $h && $y < $y1) { 2496 if ($y0 < $y + $h && $y < $y1) {
2497 $layout->set_foreground (@{ $par->[2] });
2498 $layout->set_width ($W - $par->[3]);
2260 $layout->set_text ($par->[2]); 2499 $layout->set_markup ($par->[4]);
2261 2500
2262 glColor @{ $par->[1] }; 2501 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2263 my ($W, $H) = $layout->size; 2502
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2503 glRasterPos $par->[3], $y - $y0;
2504 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265 } 2505 }
2266 2506
2267 $y += $h; 2507 $y += $h;
2268 } 2508 }
2269 2509
2270 glDisable GL_TEXTURE_2D;
2271 glDisable GL_BLEND; 2510 glDisable GL_BLEND;
2272 }; 2511 };
2273 }); 2512 });
2274} 2513}
2275 2514
2276sub _draw { 2515sub _draw {
2277 my ($self) = @_; 2516 my ($self) = @_;
2278 2517
2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2281 glEnable GL_TEXTURE_2D; 2518 glEnable GL_TEXTURE_2D;
2282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2519 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283 glColor 1, 1, 1, 1; 2520 glColor 1, 1, 1, 1;
2284 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2521 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2285 glDisable GL_TEXTURE_2D; 2522 glDisable GL_TEXTURE_2D;
2286 glDisable GL_BLEND;
2287 2523
2288 $self->{children}[1]->draw; 2524 $self->{children}[1]->draw;
2289 2525
2290} 2526}
2291 2527
… …
2339 2575
2340sub new { 2576sub new {
2341 my $class = shift; 2577 my $class = shift;
2342 2578
2343 my $self = $class->SUPER::new ( 2579 my $self = $class->SUPER::new (
2344 state => 0, 2580 state => 0,
2345 connect_activate => \&toggle_flopper, 2581 on_activate => \&toggle_flopper,
2346 @_ 2582 @_
2347 ); 2583 );
2348 2584
2349 if ($self->{state}) {
2350 $self->{state} = 0;
2351 $self->toggle_flopper;
2352 }
2353
2354 $self 2585 $self
2355} 2586}
2356 2587
2357sub toggle_flopper { 2588sub toggle_flopper {
2358 my ($self) = @_; 2589 my ($self) = @_;
2359 2590
2360 # TODO: use animation 2591 $self->{other}->toggle_visibility;
2361 if ($self->{state} = !$self->{state}) {
2362 $CFClient::UI::ROOT->add ($self->{other});
2363 $self->{other}->move ($self->coord2global (0, $self->{h}));
2364 $self->emit ("open");
2365 } else {
2366 $CFClient::UI::ROOT->remove ($self->{other});
2367 $self->emit ("close");
2368 }
2369
2370 $self->emit (changed => $self->{state});
2371} 2592}
2372 2593
2373############################################################################# 2594#############################################################################
2374 2595
2375package CFClient::UI::Tooltip; 2596package CFClient::UI::Tooltip;
… …
2385 @_, 2606 @_,
2386 can_events => 0, 2607 can_events => 0,
2387 ) 2608 )
2388} 2609}
2389 2610
2390sub set_markup { 2611sub set_tooltip_from {
2391 my ($self, $text) = @_; 2612 my ($self, $widget) = @_;
2392 2613
2393 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2614 $self->add (new CFClient::UI::Label
2394 $self->{label}->set_markup ($text); 2615 markup => $widget->{tooltip},
2395 $self->add ($self->{label}); 2616 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2617 fontsize => 0.8,
2618 fg => [0, 0, 0, 1],
2619 ellipsise => 0,
2620 font => ($widget->{tooltip_font} || $::FONT_PROP),
2621 );
2396} 2622}
2397 2623
2398sub size_request { 2624sub size_request {
2399 my ($self) = @_; 2625 my ($self) = @_;
2400 2626
2401 $self->child->set_max_size ($::WIDTH * 0.3);
2402
2403 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2627 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404 2628
2405 ($w + 4, $h + 4) 2629 ($w + 4, $h + 4)
2406} 2630}
2407 2631
2408sub size_allocate { 2632sub size_allocate {
2409 my ($self, $w, $h) = @_; 2633 my ($self, $w, $h, $changed) = @_;
2410 2634
2635 return unless $changed;
2636
2411 $self->SUPER::size_allocate ($w - 4, $h - 4); 2637 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2638}
2639
2640sub visibility_change {
2641 my ($self, $visible) = @_;
2642
2643 return unless $visible;
2644
2645 $self->{root}->on_post_alloc ("move_$self" => sub {
2646 my $widget = $self->{owner}
2647 or return;
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 });
2412} 2656}
2413 2657
2414sub _draw { 2658sub _draw {
2415 my ($self) = @_; 2659 my ($self) = @_;
2416 2660
2417 glPushMatrix;
2418 glTranslate 0.375, 0.375; 2661 glTranslate 0.375, 0.375;
2419 2662
2420 my ($w, $h) = @$self{qw(w h)}; 2663 my ($w, $h) = @$self{qw(w h)};
2421 2664
2422 glColor 1, 0.8, 0.4; 2665 glColor 1, 0.8, 0.4;
… …
2433 glVertex 0 , $h; 2676 glVertex 0 , $h;
2434 glVertex $w, $h; 2677 glVertex $w, $h;
2435 glVertex $w, 0; 2678 glVertex $w, 0;
2436 glEnd; 2679 glEnd;
2437 2680
2438 glPopMatrix; 2681 glTranslate 2 - 0.375, 2 - 0.375;
2439 2682
2440 glTranslate 2, 2;
2441 $self->SUPER::_draw; 2683 $self->SUPER::_draw;
2442} 2684}
2443 2685
2444############################################################################# 2686#############################################################################
2445 2687
… …
2450use CFClient::OpenGL; 2692use CFClient::OpenGL;
2451 2693
2452sub new { 2694sub new {
2453 my $class = shift; 2695 my $class = shift;
2454 2696
2455 $class->SUPER::new ( 2697 my $self = $class->SUPER::new (
2456 aspect => 1, 2698 aspect => 1,
2699 can_events => 0,
2457 @_, 2700 @_,
2458 ) 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
2459} 2718}
2460 2719
2461sub size_request { 2720sub size_request {
2462 (32, 8) 2721 (32, 8)
2463} 2722}
2464 2723
2724sub update {
2725 my ($self) = @_;
2726
2727 return unless $self->{visible};
2728
2729 $self->SUPER::update;
2730}
2731
2465sub _draw { 2732sub _draw {
2466 my ($self) = @_; 2733 my ($self) = @_;
2467 2734
2468 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
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2746 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2747
2471 # TODO animation
2472 if ($tex) { 2748 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2749 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2751 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2752 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2753 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2754 }
2482} 2755}
2483 2756
2484############################################################################# 2757sub DESTROY {
2758 my ($self) = @_;
2485 2759
2760 $self->{timer}->cancel
2761 if $self->{timer};
2762
2763 $self->SUPER::DESTROY;
2764}
2765
2766#############################################################################
2767
2486package CFClient::UI::InventoryItem; 2768package CFClient::UI::Inventory;
2487 2769
2488our @ISA = CFClient::UI::HBox::; 2770our @ISA = CFClient::UI::ScrolledWindow::;
2489 2771
2490sub new { 2772sub new {
2491 my $class = shift; 2773 my $class = shift;
2492 2774
2493 my %args = @_;
2494
2495 my $item = delete $args{item};
2496
2497 my $desc = $item->{nrof} < 2
2498 ? $item->{name}
2499 : "$item->{nrof} $item->{name_pl}";
2500
2501
2502 my $self = $class->SUPER::new ( 2775 my $self = $class->SUPER::new (
2503 can_hover => 1, 2776 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2504 can_events => 1,
2505 tooltip => (CFClient::UI::Label->escape ($desc)
2506 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507 connect_button_down => sub {
2508 my ($self, $ev, $x, $y) = @_;
2509
2510 # todo: maybe put examine on 1? but should just be a tooltip :(
2511 if ($ev->{button} == 1) {
2512 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513 } elsif ($ev->{button} == 2) {
2514 $::CONN->send ("apply $item->{tag}");
2515 } elsif ($ev->{button} == 3) {
2516 CFClient::UI::Menu->new (
2517 items => [
2518 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519 [
2520 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521 sub { $::CONN->send ("lock $item->{tag}") },
2522 ],
2523 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526 ],
2527 )->popup ($ev);
2528 }
2529
2530 1
2531 },
2532 %args
2533 );
2534
2535 $self->add (new CFClient::UI::Face
2536 can_events => 0,
2537 face => $item->{face},
2538 anim => $item->{anim},
2539 animspeed => $item->{animspeed},
2540 );
2541
2542 $self->add (new CFClient::UI::Label
2543 can_events => 0,
2544 text => $desc,
2545 );
2546
2547 $self
2548}
2549
2550#############################################################################
2551
2552package CFClient::UI::Inventory;
2553
2554our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556sub new {
2557 my $class = shift;
2558
2559 my $self = $class->SUPER::new (
2560 scrolled => (new CFClient::UI::VBox),
2561 @_, 2777 @_,
2562 ); 2778 );
2563 2779
2564 $self 2780 $self
2565} 2781}
… …
2568 my ($self, $items) = @_; 2784 my ($self, $items) = @_;
2569 2785
2570 $self->{scrolled}->clear; 2786 $self->{scrolled}->clear;
2571 return unless $items; 2787 return unless $items;
2572 2788
2573 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;
2574 2793
2575 $self->{real_items} = \@items; 2794 $self->{real_items} = \@items;
2576 2795
2796 my $row = 0;
2577 for my $item (@items) { 2797 for my $item (@items) {
2578 my $desc = $item->{nrof} < 2 2798 CFClient::Item::update_widgets $item;
2579 ? $item->{name}
2580 : "$item->{nrof} $item->{name_pl}";
2581 2799
2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2800 $self->{scrolled}->add (0, $row, $item->{face_widget});
2583 } 2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2584 2803
2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2804 $row++;
2586} 2805 }
2587
2588sub size_request {
2589 my ($self) = @_;
2590 ($self->{req_w}, $self->{req_h});
2591} 2806}
2592 2807
2593############################################################################# 2808#############################################################################
2594 2809
2595package CFClient::UI::Menu; 2810package CFClient::UI::Menu;
… …
2630 2845
2631# 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)
2632sub popup { 2847sub popup {
2633 my ($self, $ev) = @_; 2848 my ($self, $ev) = @_;
2634 2849
2635 $self->emit ("popdown"); 2850 $self->_emit ("popdown");
2636 2851
2637 # maybe save $GRAB? must be careful about events... 2852 # maybe save $GRAB? must be careful about events...
2638 $GRAB = $self; 2853 $GRAB = $self;
2639 $self->{button} = $ev->{button}; 2854 $self->{button} = $ev->{button};
2640 2855
… …
2655 2870
2656 if ($ev->{button} == $self->{button}) { 2871 if ($ev->{button} == $self->{button}) {
2657 undef $GRAB; 2872 undef $GRAB;
2658 $self->hide; 2873 $self->hide;
2659 2874
2660 $self->emit ("popdown"); 2875 $self->_emit ("popdown");
2661 $self->{hover}[1]->() if $self->{hover}; 2876 $self->{hover}[1]->() if $self->{hover};
2662 } 2877 }
2663} 2878}
2664 2879
2665############################################################################# 2880#############################################################################
2666 2881
2667package CFClient::UI::Statusbox; 2882package CFClient::UI::Statusbox;
2668 2883
2669our @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}
2670 2894
2671sub reorder { 2895sub reorder {
2672 my ($self) = @_; 2896 my ($self) = @_;
2673 my $NOW = time; 2897 my $NOW = time;
2674 2898
2675 while (my ($k, $v) = each %{ $self->{item} }) { 2899 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2900 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 } 2901 }
2678 2902
2679 my @widgets; 2903 my @widgets;
2680 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
2681 my $count = 10 + 1; 2910 my $count = 10 + 1;
2682 for my $item (@items) { 2911 for my $item (@items) {
2683 last unless --$count; 2912 last unless --$count;
2684 2913
2685 push @widgets, $item->{label} ||= do { 2914 push @widgets, $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all) 2915 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text}; 2916 my $short = $item->{count} > 1
2917 ? "<b>$item->{count} ×</b> $item->{text}"
2918 : $item->{text};
2919
2688 for ($short) { 2920 for ($short) {
2689 s/^\s+//; 2921 s/^\s+//;
2690 s/\012.*//s; 2922 s/\s+/ /g;
2691 my $len = int 30 / $item->{fontsize};
2692 substr $_, $len, length, "…" if $len < length;
2693 } 2923 }
2694 2924
2695 new CFClient::UI::Label 2925 new CFClient::UI::Label
2696 markup => $short, 2926 markup => $short,
2697 tooltip => delete $item->{tooltip}, 2927 tooltip => $item->{tooltip},
2698 fontsize => delete $item->{fontsize}, 2928 tooltip_font => $::FONT_PROP,
2699 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},
2700 can_events => 1, 2933 can_events => 1,
2701 can_hover => 1, 2934 can_hover => 1
2702 }; 2935 };
2703 } 2936 }
2704 2937
2705 $self->clear; 2938 $self->clear;
2706 $self->SUPER::add (@widgets); 2939 $self->SUPER::add (reverse @widgets);
2707} 2940}
2708 2941
2709sub add { 2942sub add {
2710 my ($self, $text, %arg) = @_; 2943 my ($self, $text, %arg) = @_;
2711 2944
2712 my $item = { 2945 $text =~ s/^\s+//;
2713 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},
2714 text => $text, 2967 text => $text,
2715 timeout => 60, 2968 timeout => $timeout,
2716 tooltip => $text, 2969 tooltip => $text,
2717 fontsize => 0.8,
2718 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,
2719 %arg, 2973 %arg,
2974 };
2720 }; 2975 }
2721
2722 $item->{timeout} += time;
2723 $item->{group} ||= $item+0;
2724
2725 $item = $self->{item}{$item->{group}} ||= $item;
2726 2976
2727 $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;
2728} 2988}
2729 2989
2730############################################################################# 2990#############################################################################
2731 2991
2732package CFClient::UI::Root; 2992package CFClient::UI::Root;
… …
2736use CFClient::OpenGL; 2996use CFClient::OpenGL;
2737 2997
2738sub new { 2998sub new {
2739 my $class = shift; 2999 my $class = shift;
2740 3000
2741 $class->SUPER::new ( 3001 my $self = $class->SUPER::new (
3002 visible => 1,
2742 @_, 3003 @_,
2743 ) 3004 );
3005
3006 Scalar::Util::weaken ($self->{root} = $self);
3007
3008 $self
2744} 3009}
2745 3010
2746sub configure { 3011sub configure {
2747 my ($self, $x, $y, $w, $h) = @_; 3012 my ($self, $x, $y, $w, $h) = @_;
2748 3013
2749 $self->{w} = $w; 3014 $self->{w} = $w;
2750 $self->{h} = $h; 3015 $self->{h} = $h;
2751} 3016}
2752 3017
2753sub check_size { 3018sub reconfigure {
2754 my ($self) = @_; 3019 my ($self) = @_;
2755 3020
3021 $self->SUPER::reconfigure;
3022
2756 $self->size_allocate ($self->{w}, $self->{h}) 3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
2757 if $self->{w}; 3024 if $self->{w};
2758} 3025}
2759 3026
2760sub size_request { 3027sub size_request {
2761 my ($self) = @_; 3028 my ($self) = @_;
2762 3029
2763 ($self->{w}, $self->{h}) 3030 ($self->{w}, $self->{h})
2764} 3031}
2765 3032
2766sub size_allocate { 3033sub size_allocate {
2767 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h, $changed) = @_;
2768
2769 my $old_w = $self->{old_w};
2770 my $old_h = $self->{old_h};
2771
2772 if ($old_w && $old_h) {
2773 for my $child ($self->children) {
2774 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782 }
2783 }
2784 3035
2785 for my $child ($self->children) { 3036 for my $child ($self->children) {
2786 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)};
2787 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
2788 $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;
2789 $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
2790 $child->configure ($X, $Y, $W, $H); 3050 $child->configure ($X, $Y, $W, $H);
2791 } 3051 }
2792
2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795} 3052}
2796 3053
2797sub coord2local { 3054sub coord2local {
2798 my ($self, $x, $y) = @_; 3055 my ($self, $x, $y) = @_;
2799 3056
… …
2807} 3064}
2808 3065
2809sub update { 3066sub update {
2810 my ($self) = @_; 3067 my ($self) = @_;
2811 3068
2812 $self->check_size;
2813 $::WANT_REFRESH++; 3069 $::WANT_REFRESH++;
2814} 3070}
2815 3071
2816sub add { 3072sub add {
2817 my ($self, $child) = @_; 3073 my ($self, @children) = @_;
2818 3074
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1;
3077
2819 # integerise window positions 3078 # integerise window positions
2820 $child->{x} = int $child->{x}; 3079 $child->{x} = int $child->{x};
2821 $child->{y} = int $child->{y}; 3080 $child->{y} = int $child->{y};
3081 }
2822 3082
2823 $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 }
2824} 3096}
2825 3097
2826sub on_refresh { 3098sub on_refresh {
2827 my ($self, $id, $cb) = @_; 3099 my ($self, $id, $cb) = @_;
2828 3100
2829 $self->{refresh_hook}{$id} = $cb; 3101 $self->{refresh_hook}{$id} = $cb;
2830} 3102}
2831 3103
3104sub on_post_alloc {
3105 my ($self, $id, $cb) = @_;
3106
3107 $self->{post_alloc_hook}{$id} = $cb;
3108}
3109
2832sub draw { 3110sub draw {
2833 my ($self) = @_; 3111 my ($self) = @_;
2834
2835 if ($self->{check_size}) {
2836 my @queue = ([], []);
2837
2838 for (;;) {
2839 if ($self->{check_size}) {
2840 # heuristic: check containers last
2841 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2842 for values %{delete $self->{check_size}}
2843 }
2844
2845 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2846
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848 ? @$widget{qw(user_w user_h)}
2849 : $widget->size_request;
2850
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853
2854 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h;
2856
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2858
2859 $widget->{parent}->check_size
2860 if $widget->{parent};
2861 }
2862 }
2863 }
2864
2865 while ($self->{size_alloc}) {
2866 for (values %{delete $self->{size_alloc}}) {
2867 my ($widget, $w, $h) = @$_;
2868
2869 $w = 0 if $w < 0;
2870 $h = 0 if $h < 0;
2871
2872 $widget->{w} = $w;
2873 $widget->{h} = $h;
2874 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h);
2876 }
2877 }
2878 3112
2879 while ($self->{refresh_hook}) { 3113 while ($self->{refresh_hook}) {
2880 $_->() 3114 $_->()
2881 for values %{delete $self->{refresh_hook}}; 3115 for values %{delete $self->{refresh_hook}};
2882 } 3116 }
2883 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
2884 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3173 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2886 glClear GL_COLOR_BUFFER_BIT; 3175 glClear GL_COLOR_BUFFER_BIT;
2887 3176
2888 glMatrixMode GL_PROJECTION; 3177 glMatrixMode GL_PROJECTION;
2889 glLoadIdentity; 3178 glLoadIdentity;
2890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3179 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2891 glMatrixMode GL_MODELVIEW; 3180 glMatrixMode GL_MODELVIEW;
2892 glLoadIdentity; 3181 glLoadIdentity;
2893 3182
2894 $self->_draw; 3183 $self->_draw;
2895} 3184}
… …
2897############################################################################# 3186#############################################################################
2898 3187
2899package CFClient::UI; 3188package CFClient::UI;
2900 3189
2901$ROOT = new CFClient::UI::Root; 3190$ROOT = new CFClient::UI::Root;
2902$TOOLTIP = new CFClient::UI::Tooltip; 3191$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2903 3192
29041 31931
2905 3194

Diff Legend

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