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.153 by root, Sun Apr 23 02:14:33 2006 UTC vs.
Revision 1.243 by root, Sat May 27 20:46:54 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 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}
38
16sub check_tooltip { 39sub check_tooltip {
17 if (!$GRAB) { 40 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
20 43
21 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 45 $TOOLTIP->{owner} = $widget;
46
47 my $tip = $widget->{tooltip};
48
49 $tip = $tip->($widget) if CODE:: eq ref $tip;
50
23 $TOOLTIP->set_text ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $TOOLTIP->show; 52 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
26 } 62 }
27 63
28 return; 64 return;
29 } 65 }
30 } 66 }
… …
34 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
35} 71}
36 72
37# class methods for events 73# class methods for events
38sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_down => $_[0])
76 if $FOCUS;
40} 77}
41 78
42sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS;
44} 82}
45 83
46sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
47 my ($ev) = @_; 85 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 check_tooltip; 94 check_tooltip;
57 } 95 }
58 96
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 98
61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
100 if $GRAB;
62} 101}
63 102
64sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
65 my ($ev) = @_; 104 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
67 106
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 108
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 110
72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
112 if $GRAB;
73 113
74 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 116 $grab->update if $grab;
77 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 134
95 check_tooltip; 135 check_tooltip;
96 } 136 }
97 137
98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER;
99} 140}
100 141
101# convert position array to integers 142# convert position array to integers
102sub harmonize { 143sub harmonize {
103 my ($vals) = @_; 144 my ($vals) = @_;
… …
109 $rem += $_ - $i; 150 $rem += $_ - $i;
110 $_ = $i; 151 $_ = $i;
111 } 152 }
112} 153}
113 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
185 }
186 }
187
188 reconfigure_widgets;
189}
190
114############################################################################# 191#############################################################################
115 192
116package CFClient::UI::Base; 193package CFClient::UI::Base;
117 194
118use strict; 195use strict;
… …
121 198
122sub new { 199sub new {
123 my $class = shift; 200 my $class = shift;
124 201
125 my $self = bless { 202 my $self = bless {
126 x => 0, 203 x => 0,
127 y => 0, 204 y => 0,
128 z => 0, 205 z => 0,
129 can_events => 1, 206 can_events => 1,
130 @_ 207 @_
131 }, $class; 208 }, $class;
132 209
133 for (keys %$self) { 210 for (keys %$self) {
134 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
135 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
136 } 213 }
137 } 214 }
138 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
139 $self 225 $self
140} 226}
141 227
228sub destroy {
229 my ($self) = @_;
230
231 $self->hide;
232 %$self = ();
233}
234
142sub show { 235sub show {
143 my ($self) = @_; 236 my ($self) = @_;
144
145 return if $self->{parent}; 237 return if $self->{parent};
146 238
147 $CFClient::UI::ROOT->add ($self); 239 $CFClient::UI::ROOT->add ($self);
148} 240}
149 241
242sub show_centered {
243 my ($self) = @_;
244 return if $self->{parent};
245
246 $self->show;
247
248 $CFClient::UI::ROOT->on_post_alloc (
249 "centered $self" => sub {
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
251 },
252 );
253}
254
255sub set_invisible {
256 my ($self) = @_;
257
258 # broken show/hide model
259
260 delete $self->{root};
261 delete $self->{visible};
262
263 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self;
265
266 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self;
268
269 $self->focus_out;
270}
271
150sub hide { 272sub hide {
151 my ($self) = @_; 273 my ($self) = @_;
152 274
153 return unless $self->{parent}; 275 $self->set_invisible;
154 276
155 $self->{parent}->remove ($self); 277 $self->{parent}->remove ($self)
278 if $self->{parent};
156} 279}
157 280
158sub move { 281sub move {
159 my ($self, $x, $y, $z) = @_; 282 my ($self, $x, $y, $z) = @_;
160 283
… …
163 $self->{z} = $z if defined $z; 286 $self->{z} = $z if defined $z;
164 287
165 $self->update; 288 $self->update;
166} 289}
167 290
168sub needs_redraw { 291sub set_size {
169 0 292 my ($self, $w, $h) = @_;
293
294 $self->{user_w} = $w;
295 $self->{user_h} = $h;
296
297 $self->check_size;
170} 298}
171 299
172sub size_request { 300sub size_request {
173 require Carp; 301 require Carp;
174 Carp::confess "size_request is abstract"; 302 Carp::confess "size_request is abstract";
… …
194 $self->{y} = $y; 322 $self->{y} = $y;
195 $self->update; 323 $self->update;
196 } 324 }
197 325
198 if ($self->{w} != $w || $self->{h} != $h) { 326 if ($self->{w} != $w || $self->{h} != $h) {
199 $self->{w} = $w; 327 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
200 $self->{h} = $h;
201
202 $self->size_allocate ($w, $h);
203 $self->update;
204 } 328 }
205} 329}
206 330
207sub size_allocate { 331sub size_allocate {
208 # nothing to be done 332 # nothing to be done
209} 333}
210 334
211# return top left coordinates 335sub reconfigure {
212sub _topleft { 336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340}
341
342sub children {
343}
344
345sub set_max_size {
213 my ($self, $x, $y) = @_; 346 my ($self, $w, $h) = @_;
214 347
215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 348 delete $self->{max_w}; $self->{max_w} = $w if $w;
349 delete $self->{max_h}; $self->{max_h} = $h if $h;
350}
351
352sub set_tooltip {
353 my ($self, $tooltip) = @_;
354
355 $tooltip =~ s/^\s+//;
356 $tooltip =~ s/\s+$//;
357
358 return if $self->{tooltip} eq $tooltip;
359
360 $self->{tooltip} = $tooltip;
361
362 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
363 delete $CFClient::UI::TOOLTIP->{owner};
364 CFClient::UI::check_tooltip;
365 }
216} 366}
217 367
218# translate global coordinates to local coordinate system 368# translate global coordinates to local coordinate system
219sub coord2local { 369sub coord2local {
220 my ($self, $x, $y) = @_; 370 my ($self, $x, $y) = @_;
221 371
222 my ($X, $Y) = $self->_topleft; 372 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
223 ($x - $X, $y - $Y)
224} 373}
225 374
226# translate local coordinates to global coordinate system 375# translate local coordinates to global coordinate system
227sub coord2global { 376sub coord2global {
228 my ($self, $x, $y) = @_; 377 my ($self, $x, $y) = @_;
229 378
230 my ($X, $Y) = $self->_topleft; 379 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
231 ($x + $X, $y + $Y)
232} 380}
233 381
234sub focus_in { 382sub focus_in {
235 my ($self) = @_; 383 my ($self) = @_;
236 384
237 return if $FOCUS == $self; 385 return if $FOCUS == $self;
238 return unless $self->{can_focus}; 386 return unless $self->{can_focus};
239 387
240 my $focus = $FOCUS; $FOCUS = $self; 388 my $focus = $FOCUS; $FOCUS = $self;
241 389
242 $self->emit (focus_in => $focus); 390 $self->_emit (focus_in => $focus);
243 391
244 $focus->update if $focus; 392 $focus->update if $focus;
245 $FOCUS->update; 393 $FOCUS->update;
246} 394}
247 395
… …
250 398
251 return unless $FOCUS == $self; 399 return unless $FOCUS == $self;
252 400
253 my $focus = $FOCUS; undef $FOCUS; 401 my $focus = $FOCUS; undef $FOCUS;
254 402
255 $self->emit (focus_out => $focus); 403 $self->_emit (focus_out => $focus);
256 404
257 $focus->update if $focus; #? 405 $focus->update if $focus; #?
406
407 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
408 unless $FOCUS;
258} 409}
259 410
260sub mouse_motion { } 411sub mouse_motion { }
261sub button_up { } 412sub button_up { }
262sub key_down { } 413sub key_down { }
263sub key_up { } 414sub key_up { }
264 415
265sub button_down { 416sub button_down {
266 my ($self, $ev, $x, $y) = @_; 417 my ($self, $ev, $x, $y) = @_;
267 418
268 $self->focus_in; 419 $self->focus_in;
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 447 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 448 glVertex $x , $y + $self->{h};
298 glEnd; 449 glEnd;
299 glDisable GL_BLEND; 450 glDisable GL_BLEND;
300 } 451 }
452
453 if ($ENV{PCLIENT_DEBUG}) {
454 glPushMatrix;
455 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0;
459 glVertex $self->{w} - 1, 0;
460 glVertex $self->{w} - 1, $self->{h} - 1;
461 glVertex 0 , $self->{h} - 1;
462 glEnd;
463 glPopMatrix;
464 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
465 }
301} 466}
302 467
303sub _draw { 468sub _draw {
304 my ($self) = @_; 469 my ($self) = @_;
305 470
… …
320 485
321sub set_parent { 486sub set_parent {
322 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
323 488
324 Scalar::Util::weaken ($self->{parent} = $parent); 489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
325} 499}
326 500
327sub check_size { 501sub check_size {
328 my ($self) = @_; 502 my ($self, $forced) = @_;
329 503
330 return unless $self->{parent}; 504 $self->{force_alloc} = 1 if $forced;
331 505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
332 my ($w, $h) = $self->size_request;
333
334 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w;
336 $self->{req_h} = $h;
337
338 $self->{parent}->check_size;
339 }
340} 506}
341 507
342sub update { 508sub update {
343 my ($self) = @_; 509 my ($self) = @_;
344 510
… …
350 my ($self, $signal, $cb) = @_; 516 my ($self, $signal, $cb) = @_;
351 517
352 push @{ $self->{signal_cb}{$signal} }, $cb; 518 push @{ $self->{signal_cb}{$signal} }, $cb;
353} 519}
354 520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
355sub emit { 527sub emit {
356 my ($self, $signal, @args) = @_; 528 my ($self, $signal, @args) = @_;
357 529
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 530 $self->_emit ($signal, @args)
359 $cb->($self, @args); 531 || $self->$signal (@args);
360 }
361} 532}
362 533
363sub DESTROY { 534sub DESTROY {
364 my ($self) = @_; 535 my ($self) = @_;
365 536
537 delete $WIDGET{$self+0};
366 #$self->deactivate; 538 #$self->deactivate;
367} 539}
368 540
369############################################################################# 541#############################################################################
370 542
… …
379 my $class = shift; 551 my $class = shift;
380 552
381 # range [value, low, high, page] 553 # range [value, low, high, page]
382 554
383 $class->SUPER::new ( 555 $class->SUPER::new (
384 bg => [0, 0, 0, 0.2], 556 #bg => [0, 0, 0, 0.2],
385 active_bg => [1, 1, 1, 0.5], 557 #active_bg => [1, 1, 1, 0.5],
386 @_ 558 @_
387 ) 559 )
388} 560}
389 561
390sub _draw { 562sub _draw {
391 my ($self) = @_; 563 my ($self) = @_;
392 564
565 my $color = $FOCUS == $self && $self->{active_bg}
566 ? $self->{active_bg}
567 : $self->{bg};
568
569 if ($color && (@$color < 4 || $color->[3])) {
393 my ($w, $h) = @$self{qw(w h)}; 570 my ($w, $h) = @$self{qw(w h)};
394 571
395 glEnable GL_BLEND; 572 glEnable GL_BLEND;
396 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
397 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 574 glColor @$color;
398 575
399 glBegin GL_QUADS; 576 glBegin GL_QUADS;
400 glVertex 0 , 0; 577 glVertex 0 , 0;
401 glVertex 0 , $h; 578 glVertex 0 , $h;
402 glVertex $w, $h; 579 glVertex $w, $h;
403 glVertex $w, 0; 580 glVertex $w, 0;
404 glEnd; 581 glEnd;
405 582
406 glDisable GL_BLEND; 583 glDisable GL_BLEND;
584 }
407} 585}
408 586
409############################################################################# 587#############################################################################
410 588
411package CFClient::UI::Empty; 589package CFClient::UI::Empty;
… …
432sub new { 610sub new {
433 my ($class, %arg) = @_; 611 my ($class, %arg) = @_;
434 612
435 my $children = delete $arg{children} || []; 613 my $children = delete $arg{children} || [];
436 614
437 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 615 my $self = $class->SUPER::new (
616 children => [],
617 can_events => 0,
618 %arg,
619 );
438 $self->add ($_) for @$children; 620 $self->add ($_) for @$children;
439 621
440 $self 622 $self
441} 623}
442 624
443sub add { 625sub add {
444 my ($self, $child) = @_; 626 my ($self, @widgets) = @_;
445 627
446 $child->set_parent ($self); 628 $_->set_parent ($self)
629 for @widgets;
447 630
448 use sort 'stable'; 631 use sort 'stable';
449 632
450 $self->{children} = [ 633 $self->{children} = [
451 sort { $a->{z} <=> $b->{z} } 634 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 635 @{$self->{children}}, @widgets
453 ]; 636 ];
454 637
455 $child->check_size; 638 $self->check_size (1);
639 $self->update;
640}
641
642sub children {
643 @{ $_[0]{children} }
456} 644}
457 645
458sub remove { 646sub remove {
459 my ($self, $child) = @_; 647 my ($self, $child) = @_;
460 648
461 delete $child->{parent}; 649 delete $child->{parent};
650 $child->hide;
462 651
463 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653
654 $self->check_size (1);
655 $self->update;
656}
657
658sub clear {
659 my ($self) = @_;
660
661 my $children = delete $self->{children};
662 $self->{children} = [];
663
664 for (@$children) {
665 delete $_->{parent};
666 $_->hide;
667 }
464 668
465 $self->check_size; 669 $self->check_size;
466 $self->update; 670 $self->update;
467} 671}
468 672
… …
546} 750}
547 751
548sub update { 752sub update {
549 my ($self) = @_; 753 my ($self) = @_;
550 754
551 # we want to do this delayed... 755 $ROOT->on_post_alloc ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 756 $self->SUPER::update;
554}
555
556sub render_chld {
557 my ($self) = @_;
558
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1;
561 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw;
563 };
564} 757}
565 758
566sub size_allocate { 759sub size_allocate {
567 my ($self, $w, $h) = @_; 760 my ($self, $w, $h) = @_;
568 761
569 $self->child->configure (0, 0, $w, $h); 762 $self->SUPER::size_allocate ($w, $h);
763 $self->update;
764}
570 765
766sub _render {
767 $_[0]{children}[0]->draw;
768}
769
770sub render_child {
771 my ($self) = @_;
772
773 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT;
776
571 $self->render_chld; 777 $self->_render;
778 };
572} 779}
573 780
574sub _draw { 781sub _draw {
575 my ($self) = @_; 782 my ($self) = @_;
576 783
577 my ($w, $h) = ($self->w, $self->h); 784 my ($w, $h) = ($self->w, $self->h);
578 785
579 my $tex = $self->{texture} 786 my $tex = $self->{texture}
580 or return; 787 or return;
581 788
582 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 789 glEnable GL_TEXTURE_2D;
585 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
791 glColor 1, 1, 1, 1;
586 792
587 $tex->draw_quad (0, 0, $w, $h); 793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
588 794
589 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 795 glDisable GL_TEXTURE_2D;
591} 796}
592 797
593############################################################################# 798#############################################################################
594 799
595package CFClient::UI::ViewPort; 800package CFClient::UI::ViewPort;
596 801
597our @ISA = CFClient::UI::Window::; 802our @ISA = CFClient::UI::Window::;
598
599sub new { die }
600
601sub size_request {
602 my ($self) = @_;
603
604 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
606
607 @$self{qw(child_w child_h)}
608}
609
610sub _draw {
611 my ($self) = @_;
612
613 $self->{children}[1]->draw;
614}
615
616
617#############################################################################
618
619package CFClient::UI::Frame;
620
621our @ISA = CFClient::UI::Bin::;
622
623use CFClient::OpenGL;
624 803
625sub new { 804sub new {
626 my $class = shift; 805 my $class = shift;
627 806
628 my $self = $class->SUPER::new ( 807 $class->SUPER::new (
629 bg => [1, 1, 1, 1], 808 scroll_x => 0,
630 border_bg => [1, 1, 1, 1], 809 scroll_y => 1,
631 border => 0.8,
632 @_ 810 @_,
633 ); 811 )
634
635 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643} 812}
644 813
645sub size_request { 814sub size_request {
646 my ($self) = @_; 815 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h}) 816
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
818
819 @$self{qw(child_w child_h)}
648} 820}
649 821
650sub size_allocate { 822sub size_allocate {
651 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
652 $self->{w} = $w; 824
653 $self->{h} = $h; 825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
827
654 $self->child->configure (0, 0, $w, $h); 828 $self->child->configure (0, 0, $w, $h);
829 $self->update;
830}
831
832sub set_offset {
833 my ($self, $x, $y) = @_;
834
835 $self->{view_x} = int $x;
836 $self->{view_y} = int $y;
837
838 $self->update;
839}
840
841# hmm, this does not work for topleft of $self... but we should not ask for that
842sub coord2local {
843 my ($self, $x, $y) = @_;
844
845 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
846}
847
848sub coord2global {
849 my ($self, $x, $y) = @_;
850
851 $x = List::Util::min $self->{w}, $x - $self->{view_x};
852 $y = List::Util::min $self->{h}, $y - $self->{view_y};
853
854 $self->SUPER::coord2global ($x, $y)
855}
856
857sub find_widget {
858 my ($self, $x, $y) = @_;
859
860 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
861 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
862 ) {
863 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
864 } else {
865 $self->CFClient::UI::Base::find_widget ($x, $y)
866 }
867}
868
869sub _render {
870 my ($self) = @_;
871
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873
874 $self->SUPER::_render;
875}
876
877#############################################################################
878
879package CFClient::UI::ScrolledWindow;
880
881our @ISA = CFClient::UI::HBox::;
882
883sub new {
884 my $class = shift;
885
886 my $self;
887
888 my $slider = new CFClient::UI::Slider
889 vertical => 1,
890 range => [0, 0, 1, 0.01], # HACK fix
891 on_changed => sub {
892 $self->{vp}->set_offset (0, $_[1]);
893 },
894 ;
895
896 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider,
899 @_,
900 );
901
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider});
905
906 $self
907}
908
909sub update {
910 my ($self) = @_;
911
912 $self->SUPER::update;
913
914 # todo: overwrite size_allocate of child
915 my $child = $self->{vp}->child;
916 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
917}
918
919sub size_allocate {
920 my ($self, $w, $h) = @_;
921
922 $self->SUPER::size_allocate ($w, $h);
923
924 my $child = $self->{vp}->child;
925 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
926}
927
928#TODO# update range on size_allocate depending on child
929# update viewport offset on scroll
930
931#############################################################################
932
933package CFClient::UI::Frame;
934
935our @ISA = CFClient::UI::Bin::;
936
937use CFClient::OpenGL;
938
939sub new {
940 my $class = shift;
941
942 $class->SUPER::new (
943 bg => undef,
944 @_,
945 )
655} 946}
656 947
657sub _draw { 948sub _draw {
658 my ($self) = @_; 949 my ($self) = @_;
659 950
660 my ($w, $h) = ($self->{w}, $self->{h}); 951 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)};
661 953
662 glEnable GL_BLEND; 954 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 956 glColor @{ $self->{bg} };
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
666 957
667# glBegin GL_QUADS; 958 glBegin GL_QUADS;
668# glColor 0, 0, 0, 0;
669# glVertex 0 , 0; 959 glVertex 0 , 0;
670# glVertex 0 , $h; 960 glVertex 0 , $h;
671# glVertex $w, $h; 961 glVertex $w, $h;
672# glVertex $w, 0; 962 glVertex $w, 0;
673# glEnd; 963 glEnd;
674 964
675
676 $self->child->draw;
677 glDisable GL_BLEND; 965 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D; 966 }
967
968 $self->SUPER::_draw;
679} 969}
680 970
681############################################################################# 971#############################################################################
682 972
683package CFClient::UI::FancyFrame; 973package CFClient::UI::FancyFrame;
… …
694 my $class = shift; 984 my $class = shift;
695 985
696 # TODO: user_x, user_y, overwrite moveto? 986 # TODO: user_x, user_y, overwrite moveto?
697 987
698 my $self = $class->SUPER::new ( 988 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 989 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 990 border_bg => [1, 1, 1, 1],
701 border => 0.8, 991 border => 0.6,
992 is_toplevel => 1,
702 can_events => 1, 993 can_events => 1,
703 @_ 994 @_
704 ); 995 );
705 996
706 $self->{title} &&= new CFClient::UI::Label 997 $self->{title} &&= new CFClient::UI::Label
707 align => 0, 998 align => 0,
708 valign => 1, 999 valign => 1,
709 text => $self->{title}, 1000 text => $self->{title},
710 fontsize => 1; 1001 fontsize => $self->{border};
711 1002
712 $self 1003 $self
713} 1004}
714 1005
715sub border { 1006sub border {
716 int $_[0]{border} * $::FONTSIZE 1007 int $_[0]{border} * $::FONTSIZE
717} 1008}
718 1009
719sub size_request { 1010sub size_request {
720 my ($self) = @_; 1011 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723 1012
724 my ($w, $h) = $self->SUPER::size_request; 1013 my ($w, $h) = $self->SUPER::size_request;
725 1014
726 ( 1015 (
727 $w + $self->border * 2, 1016 $w + $self->border * 2,
… …
733 my ($self, $w, $h) = @_; 1022 my ($self, $w, $h) = @_;
734 1023
735 $h -= List::Util::max 0, $self->border * 2; 1024 $h -= List::Util::max 0, $self->border * 2;
736 $w -= List::Util::max 0, $self->border * 2; 1025 $w -= List::Util::max 0, $self->border * 2;
737 1026
738 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
739 if $self->{title}; 1028 if $self->{title};
740 1029
741 $self->child->configure ($self->border, $self->border, $w, $h); 1030 $self->child->configure ($self->border, $self->border, $w, $h);
742} 1031}
743 1032
744sub button_down { 1033sub button_down {
745 my ($self, $ev, $x, $y) = @_; 1034 my ($self, $ev, $x, $y) = @_;
746 1035
1036 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 1037 my $border = $self->border;
748 1038
749 if ($x < $self->{w} && $x >= $self->{w} - $border 1039 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 1040 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 1041
1042 if ($lr & $td) {
1043 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1044 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 1045 my ($bw, $bh) = ($self->{w}, $self->{h});
754 1046
1047 my $mx = $x < $border;
1048 my $my = $y < $border;
1049
755 $self->{motion} = sub { 1050 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 1051 my ($ev, $x, $y) = @_;
757 1052
758 ($x, $y) = ($ev->{x}, $ev->{y}); 1053 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy;
759 1055
760 $self->{user_w} = $bw + $x - $ox; 1056 $self->{user_x} = $wx + $dx * $mx;
761 $self->{user_h} = $bh + $y - $oy; 1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y});
762 $self->check_size; 1061 $self->check_size;
763 }; 1062 };
764 1063
765 } elsif ($x >= 0 && $x < $self->{w} 1064 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1065 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 1066 my ($bx, $by) = ($self->{x}, $self->{y});
770 1067
771 $self->{motion} = sub { 1068 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 1069 my ($ev, $x, $y) = @_;
773 1070
774 ($x, $y) = ($ev->{x}, $ev->{y}); 1071 ($x, $y) = ($ev->{x}, $ev->{y});
775 1072
776 $self->move ($bx + $x - $ox, $by + $y - $oy); 1073 $self->{user_x} = $bx + $x - $ox;
1074 $self->{user_y} = $by + $y - $oy;
1075 $self->move ($self->{user_x}, $self->{user_y});
777 $self->update; 1076 $self->update;
778 }; 1077 };
779 } 1078 }
780} 1079}
781 1080
… …
795 my ($self) = @_; 1094 my ($self) = @_;
796 1095
797 my ($w, $h ) = ($self->{w}, $self->{h}); 1096 my ($w, $h ) = ($self->{w}, $self->{h});
798 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1097 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
799 1098
800 glEnable GL_BLEND;
801 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
802 glEnable GL_TEXTURE_2D; 1099 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
804 1101
805 my $border = $self->border; 1102 my $border = $self->border;
806 1103
807 glColor @{ $self->{border_bg} }; 1104 glColor @{ $self->{border_bg} };
808 $tex[1]->draw_quad (0, 0, $w, $border); 1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
812 1109
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
813 my $bg = $tex[0]; 1111 my $bg = $tex[0];
814 1112
815 # TODO: repeat texture not scale 1113 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 1114 my $rep_x = $cw / $bg->{w};
817 my $rep_y = $ch / $bg->{h}; 1115 my $rep_y = $ch / $bg->{h};
818 1116
819 glColor @{ $self->{bg} }; 1117 glColor @{ $self->{bg} };
820 1118
821 $bg->{s} = $rep_x; 1119 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y; 1120 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1; 1121 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 }
825 1124
826 glDisable GL_TEXTURE_2D; 1125 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND;
828 1126
829 $self->{title}->draw if $self->{title}; 1127 $self->{title}->draw if $self->{title};
1128
830 $self->child->draw; 1129 $self->child->draw;
831} 1130}
832 1131
833############################################################################# 1132#############################################################################
834 1133
… …
843sub new { 1142sub new {
844 my $class = shift; 1143 my $class = shift;
845 1144
846 $class->SUPER::new ( 1145 $class->SUPER::new (
847 col_expand => [], 1146 col_expand => [],
848 @_ 1147 @_,
849 ) 1148 )
1149}
1150
1151sub children {
1152 grep $_, map @$_, grep $_, @{ $_[0]{children} }
850} 1153}
851 1154
852sub add { 1155sub add {
853 my ($self, $x, $y, $child) = @_; 1156 my ($self, $x, $y, $child) = @_;
854 1157
855 $child->set_parent ($self); 1158 $child->set_parent ($self);
856 $self->{children}[$y][$x] = $child; 1159 $self->{children}[$y][$x] = $child;
857 1160
858 $child->check_size; 1161 $self->check_size (1);
859} 1162}
860 1163
861# TODO: move to container class maybe? send childs a signal on removal? 1164# TODO: move to container class maybe? send children a signal on removal?
862sub clear { 1165sub clear {
863 my ($self) = @_; 1166 my ($self) = @_;
864 1167
1168 my @children = $self->children;
865 delete $self->{children}; 1169 delete $self->{children};
1170
1171 for (@children) {
1172 delete $_->{parent};
1173 $_->hide;
1174 }
1175
1176 $self->check_size (1);
866 $self->update; 1177 $self->update;
867} 1178}
868 1179
869sub get_wh { 1180sub get_wh {
870 my ($self) = @_; 1181 my ($self) = @_;
… …
902sub size_allocate { 1213sub size_allocate {
903 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
904 1215
905 my ($ws, $hs) = $self->get_wh; 1216 my ($ws, $hs) = $self->get_wh;
906 1217
907 my $req_w = sum @$ws; 1218 my $req_w = (sum @$ws) || 1;
908 my $req_h = sum @$hs; 1219 my $req_h = (sum @$hs) || 1;
909 1220
910 # TODO: nicer code && do row_expand 1221 # TODO: nicer code && do row_expand
911 my @col_expand = @{$self->{col_expand}}; 1222 my @col_expand = @{$self->{col_expand}};
912 @col_expand = (1) x @$ws unless @col_expand; 1223 @col_expand = (1) x @$ws unless @col_expand;
913 my $col_expand = (sum @col_expand) || 1; 1224 my $col_expand = (sum @col_expand) || 1;
… …
1047} 1358}
1048 1359
1049sub size_allocate { 1360sub size_allocate {
1050 my ($self, $w, $h) = @_; 1361 my ($self, $w, $h) = @_;
1051 1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1052 my $children = $self->{children}; 1365 my $children = $self->{children};
1053 1366
1054 my @h = map $_->{req_h}, @$children; 1367 my @h = map $_->{req_h}, @$children;
1055 1368
1056 my $req_h = List::Util::sum @h; 1369 my $req_h = List::Util::sum @h;
… …
1085 1398
1086############################################################################# 1399#############################################################################
1087 1400
1088package CFClient::UI::Label; 1401package CFClient::UI::Label;
1089 1402
1090our @ISA = CFClient::UI::Base::; 1403our @ISA = CFClient::UI::DrawBG::;
1091 1404
1092use CFClient::OpenGL; 1405use CFClient::OpenGL;
1093 1406
1094sub new { 1407sub new {
1095 my ($class, %arg) = @_; 1408 my ($class, %arg) = @_;
1096 1409
1097 my $self = $class->SUPER::new ( 1410 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1411 fg => [1, 1, 1],
1412 #bg => none
1413 #active_bg => none
1414 #font => default_font
1415 #text => initial text
1416 #markup => initial narkup
1417 #max_w => maximum pixel width
1418 ellipsise => 3, # end
1419 layout => (new CFClient::Layout),
1099 fontsize => 1, 1420 fontsize => 1,
1100 text => "",
1101 align => -1, 1421 align => -1,
1102 valign => -1, 1422 valign => -1,
1103 padding => 2, 1423 padding => 2,
1104 layout => new CFClient::Layout,
1105 can_events => 0, 1424 can_events => 0,
1106 %arg 1425 %arg
1107 ); 1426 );
1108 1427
1109 if (exists $self->{template}) { 1428 if (exists $self->{template}) {
1110 my $layout = new CFClient::Layout; 1429 my $layout = new CFClient::Layout;
1111 $layout->set_text (delete $self->{template}); 1430 $layout->set_text (delete $self->{template});
1112 $self->{template} = $layout; 1431 $self->{template} = $layout;
1113 } 1432 }
1114 1433
1115 $self->set_text (delete $self->{text}) if exists $self->{text}; 1434 if (exists $self->{markup}) {
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1435 $self->set_markup (delete $self->{markup});
1436 } else {
1437 $self->set_text (delete $self->{text});
1438 }
1117 1439
1118 $self 1440 $self
1119} 1441}
1120 1442
1121sub escape_text { 1443sub escape($) {
1122 local $_ = $_[1]; 1444 local $_ = $_[0];
1123 1445
1124 s/&/&amp;/g; 1446 s/&/&amp;/g;
1125 s/>/&gt;/g; 1447 s/>/&gt;/g;
1126 s/</&lt;/g; 1448 s/</&lt;/g;
1127 1449
1128 $_[1] 1450 $_
1451}
1452
1453sub update {
1454 my ($self) = @_;
1455
1456 delete $self->{texture};
1457 $self->SUPER::update;
1129} 1458}
1130 1459
1131sub set_text { 1460sub set_text {
1132 my ($self, $text) = @_; 1461 my ($self, $text) = @_;
1133 1462
1463 return if $self->{text} eq "T$text";
1464 $self->{text} = "T$text";
1465
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1134 $self->{layout}->set_text ($text); 1467 $self->{layout}->set_text ($text);
1135 1468
1136 delete $self->{texture}; 1469 $self->update;
1137 $self->check_size; 1470 $self->check_size;
1138 $self->update;
1139} 1471}
1140 1472
1141sub set_markup { 1473sub set_markup {
1142 my ($self, $markup) = @_; 1474 my ($self, $markup) = @_;
1143 1475
1476 return if $self->{text} eq "M$markup";
1477 $self->{text} = "M$markup";
1478
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480
1481 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1144 $self->{layout}->set_markup ($markup); 1482 $self->{layout}->set_markup ($markup);
1145 1483
1146 delete $self->{texture}; 1484 $self->update;
1147 $self->check_size; 1485 $self->check_size;
1148 $self->update;
1149} 1486}
1150 1487
1151sub size_request { 1488sub size_request {
1152 my ($self) = @_; 1489 my ($self) = @_;
1153 1490
1154 $self->{layout}->set_width; 1491 $self->{layout}->set_font ($self->{font}) if $self->{font};
1492 $self->{layout}->set_width ($self->{max_w} || -1);
1493 $self->{layout}->set_ellipsise ($self->{ellipsise});
1494 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1495 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1496
1157 my ($w, $h) = $self->{layout}->size; 1497 my ($w, $h) = $self->{layout}->size;
1158 1498
1159 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
1500 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1501 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1502
1162 my ($w2, $h2) = $self->{template}->size; 1503 my ($w2, $h2) = $self->{template}->size;
1163 1504
1164 $w = List::Util::max $w, $w2; 1505 $w = List::Util::max $w, $w2;
… …
1180sub set_fontsize { 1521sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1522 my ($self, $fontsize) = @_;
1182 1523
1183 $self->{fontsize} = $fontsize; 1524 $self->{fontsize} = $fontsize;
1184 delete $self->{texture}; 1525 delete $self->{texture};
1526
1527 $self->update;
1185 $self->check_size; 1528 $self->check_size;
1186 $self->update;
1187} 1529}
1188 1530
1189sub _draw { 1531sub _draw {
1190 my ($self) = @_; 1532 my ($self) = @_;
1191 1533
1534 $self->SUPER::_draw; # draw background, if applicable
1535
1192 my $tex = $self->{texture} ||= do { 1536 my $tex = $self->{texture} ||= do {
1537 $self->{layout}->set_foreground (@{$self->{fg}});
1538 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{w}); 1539 $self->{layout}->set_width ($self->{w});
1540 $self->{layout}->set_ellipsise ($self->{ellipsise});
1541 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1194 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543
1195 new_from_layout CFClient::Texture $self->{layout} 1544 my $tex = new_from_layout CFClient::Texture $self->{layout};
1545
1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1548 : ($self->{w} - $tex->{w}) * 0.5);
1549
1550 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1551 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1552 : ($self->{h} - $tex->{h}) * 0.5);
1553
1554 $tex
1196 }; 1555 };
1197 1556
1198 glEnable GL_BLEND;
1199 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1200 glEnable GL_TEXTURE_2D; 1557 glEnable GL_TEXTURE_2D;
1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1202 1559
1560 if ($tex->{format} == GL_ALPHA) {
1203 glColor @{$self->{fg}}; 1561 glColor @{$self->{fg}};
1204
1205 $self->{ox} = int (
1206 $self->{align} < 0 ? $self->{padding}
1207 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1208 : ($self->{w} - $tex->{w}) * 0.5
1209 );
1210
1211 $self->{oy} = int (
1212 $self->{valign} < 0 ? $self->{padding}
1213 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1214 : ($self->{h} - $tex->{h}) * 0.5
1215 );
1216
1217 $tex->draw_quad ($self->{ox}, $self->{oy}); 1562 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1563 } else {
1564 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1565 }
1218 1566
1219 glDisable GL_TEXTURE_2D; 1567 glDisable GL_TEXTURE_2D;
1220 glDisable GL_BLEND;
1221} 1568}
1222 1569
1223############################################################################# 1570#############################################################################
1224 1571
1225package CFClient::UI::EntryBase; 1572package CFClient::UI::EntryBase;
… …
1230 1577
1231sub new { 1578sub new {
1232 my $class = shift; 1579 my $class = shift;
1233 1580
1234 $class->SUPER::new ( 1581 $class->SUPER::new (
1235 fg => [1, 1, 1], 1582 fg => [1, 1, 1],
1236 bg => [0, 0, 0, 0.2], 1583 bg => [0, 0, 0, 0.2],
1237 active_bg => [1, 1, 1, 0.5], 1584 active_bg => [1, 1, 1, 0.5],
1238 active_fg => [0, 0, 0], 1585 active_fg => [0, 0, 0],
1239 can_hover => 1, 1586 can_hover => 1,
1240 can_focus => 1, 1587 can_focus => 1,
1241 valign => 0, 1588 valign => 0,
1242 can_events => 1, 1589 can_events => 1,
1590 #text => ...
1243 @_ 1591 @_
1244 ) 1592 )
1245} 1593}
1246 1594
1247sub _set_text { 1595sub _set_text {
… …
1257 $self->{text} = $text; 1605 $self->{text} = $text;
1258 1606
1259 $text =~ s/./*/g if $self->{hidden}; 1607 $text =~ s/./*/g if $self->{hidden};
1260 $self->{layout}->set_text ("$text "); 1608 $self->{layout}->set_text ("$text ");
1261 1609
1262 $self->emit (changed => $self->{text}); 1610 $self->_emit (changed => $self->{text});
1263}
1264
1265sub get_text {
1266 $_[0]{text}
1267}
1268
1269sub size_request {
1270 my ($self) = @_;
1271
1272 my ($w, $h) = $self->SUPER::size_request;
1273
1274 ($w + 1, $h) # add 1 for cursor
1275}
1276
1277sub size_allocate {
1278 my ($self, $w, $h) = @_;
1279
1280 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1281} 1611}
1282 1612
1283sub set_text { 1613sub set_text {
1284 my ($self, $text) = @_; 1614 my ($self, $text) = @_;
1285 1615
1286 $self->{cursor} = length $text; 1616 $self->{cursor} = length $text;
1287 $self->_set_text ($text); 1617 $self->_set_text ($text);
1288 $self->update; 1618 $self->update;
1619 $self->check_size;
1620}
1621
1622sub get_text {
1623 $_[0]{text}
1624}
1625
1626sub size_request {
1627 my ($self) = @_;
1628
1629 my ($w, $h) = $self->SUPER::size_request;
1630
1631 ($w + 1, $h) # add 1 for cursor
1289} 1632}
1290 1633
1291sub key_down { 1634sub key_down {
1292 my ($self, $ev) = @_; 1635 my ($self, $ev) = @_;
1293 1636
… …
1295 my $sym = $ev->{sym}; 1638 my $sym = $ev->{sym};
1296 my $uni = $ev->{unicode}; 1639 my $uni = $ev->{unicode};
1297 1640
1298 my $text = $self->get_text; 1641 my $text = $self->get_text;
1299 1642
1300 if ($sym == 8) { 1643 if ($uni == 8) {
1301 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1644 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1302 } elsif ($sym == 127) { 1645 } elsif ($uni == 127) {
1303 substr $text, $self->{cursor}, 1, ""; 1646 substr $text, $self->{cursor}, 1, "";
1304 } elsif ($sym == CFClient::SDLK_LEFT) { 1647 } elsif ($sym == CFClient::SDLK_LEFT) {
1305 --$self->{cursor} if $self->{cursor}; 1648 --$self->{cursor} if $self->{cursor};
1306 } elsif ($sym == CFClient::SDLK_RIGHT) { 1649 } elsif ($sym == CFClient::SDLK_RIGHT) {
1307 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1650 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1308 } elsif ($sym == CFClient::SDLK_HOME) { 1651 } elsif ($sym == CFClient::SDLK_HOME) {
1309 $self->{cursor} = 0; 1652 $self->{cursor} = 0;
1310 } elsif ($sym == CFClient::SDLK_END) { 1653 } elsif ($sym == CFClient::SDLK_END) {
1311 $self->{cursor} = length $text; 1654 $self->{cursor} = length $text;
1312 } elsif ($sym == 27) { 1655 } elsif ($uni == 27) {
1313 $self->emit ('escape'); 1656 $self->_emit ('escape');
1314 } elsif ($uni) { 1657 } elsif ($uni) {
1315 substr $text, $self->{cursor}++, 0, chr $uni; 1658 substr $text, $self->{cursor}++, 0, chr $uni;
1316 } 1659 }
1317 1660
1318 $self->_set_text ($text); 1661 $self->_set_text ($text);
1319 $self->update; 1662 $self->update;
1663 $self->check_size;
1320} 1664}
1321 1665
1322sub focus_in { 1666sub focus_in {
1323 my ($self) = @_; 1667 my ($self) = @_;
1324 1668
… …
1400 my ($self, $ev) = @_; 1744 my ($self, $ev) = @_;
1401 1745
1402 my $sym = $ev->{sym}; 1746 my $sym = $ev->{sym};
1403 1747
1404 if ($sym == 13) { 1748 if ($sym == 13) {
1749 unshift @{$self->{history}},
1750 my $txt = $self->get_text;
1751 $self->{history_pointer} = -1;
1752 $self->{history_saveback} = '';
1405 $self->emit (activate => $self->get_text); 1753 $self->_emit (activate => $txt);
1406 $self->update; 1754 $self->update;
1755
1756 } elsif ($sym == CFClient::SDLK_UP) {
1757 if ($self->{history_pointer} < 0) {
1758 $self->{history_saveback} = $self->get_text;
1759 }
1760 if (@{$self->{history} || []} > 0) {
1761 $self->{history_pointer}++;
1762 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1763 $self->{history_pointer} = @{$self->{history} || []} - 1;
1764 }
1765 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1766 }
1767
1768 } elsif ($sym == CFClient::SDLK_DOWN) {
1769 $self->{history_pointer}--;
1770 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1771
1772 if ($self->{history_pointer} >= 0) {
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 } else {
1775 $self->set_text ($self->{history_saveback});
1776 }
1407 1777
1408 } else { 1778 } else {
1409 $self->SUPER::key_down ($ev); 1779 $self->SUPER::key_down ($ev);
1410 } 1780 }
1411 1781
… …
1425 1795
1426sub new { 1796sub new {
1427 my $class = shift; 1797 my $class = shift;
1428 1798
1429 $class->SUPER::new ( 1799 $class->SUPER::new (
1430 padding => 4, 1800 padding => 4,
1431 fg => [1, 1, 1], 1801 fg => [1, 1, 1],
1432 bg => [1, 1, 1, 0.2],
1433 active_fg => [0, 0, 1], 1802 active_fg => [0, 0, 1],
1434 can_hover => 1, 1803 can_hover => 1,
1435 align => 0, 1804 align => 0,
1436 valign => 0, 1805 valign => 0,
1437 can_events => 1, 1806 can_events => 1,
1438 @_ 1807 @_
1439 ) 1808 )
1440} 1809}
1441 1810
1811sub activate { }
1812
1442sub button_up { 1813sub button_up {
1443 my ($self, $ev, $x, $y) = @_; 1814 my ($self, $ev, $x, $y) = @_;
1444 1815
1816 $self->emit ("activate")
1445 if ($x >= 0 && $x < $self->{w} 1817 if $x >= 0 && $x < $self->{w}
1446 && $y >= 0 && $y < $self->{h}) { 1818 && $y >= 0 && $y < $self->{h};
1447 $self->emit ("activate");
1448 }
1449} 1819}
1450 1820
1451sub _draw { 1821sub _draw {
1452 my ($self) = @_; 1822 my ($self) = @_;
1453 1823
… …
1455 1825
1456 if ($GRAB == $self) { 1826 if ($GRAB == $self) {
1457 $self->{fg} = $self->{active_fg}; 1827 $self->{fg} = $self->{active_fg};
1458 } 1828 }
1459 1829
1460 glEnable GL_BLEND;
1461 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1462 glEnable GL_TEXTURE_2D; 1830 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 glColor 0, 0, 0, 1; 1832 glColor 0, 0, 0, 1;
1465 1833
1466 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1834 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1467 1835
1468 glDisable GL_TEXTURE_2D; 1836 glDisable GL_TEXTURE_2D;
1469 glDisable GL_BLEND;
1470 1837
1471 $self->SUPER::_draw; 1838 $self->SUPER::_draw;
1472} 1839}
1473 1840
1474############################################################################# 1841#############################################################################
… …
1488 1855
1489 $class->SUPER::new ( 1856 $class->SUPER::new (
1490 padding => 2, 1857 padding => 2,
1491 fg => [1, 1, 1], 1858 fg => [1, 1, 1],
1492 active_fg => [1, 1, 0], 1859 active_fg => [1, 1, 0],
1860 bg => [0, 0, 0, 0.2],
1861 active_bg => [1, 1, 1, 0.5],
1493 state => 0, 1862 state => 0,
1494 can_hover => 1, 1863 can_hover => 1,
1495 @_ 1864 @_
1496 ) 1865 )
1497} 1866}
… …
1506 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1507 1876
1508 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1509 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1510 $self->{state} = !$self->{state}; 1879 $self->{state} = !$self->{state};
1511 $self->emit (changed => $self->{state}); 1880 $self->_emit (changed => $self->{state});
1512 } 1881 }
1513} 1882}
1514 1883
1515sub _draw { 1884sub _draw {
1516 my ($self) = @_; 1885 my ($self) = @_;
… …
1521 1890
1522 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1891 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1523 1892
1524 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1525 1894
1526 glEnable GL_BLEND; 1895 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896
1527 glEnable GL_TEXTURE_2D; 1897 glEnable GL_TEXTURE_2D;
1528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1529
1530 my $tex = $self->{state} ? $tex[1] : $tex[0];
1531
1532 $tex->draw_quad (0, 0, $s, $s); 1898 $tex->draw_quad_alpha (0, 0, $s, $s);
1533
1534 glDisable GL_TEXTURE_2D; 1899 glDisable GL_TEXTURE_2D;
1535 glDisable GL_BLEND;
1536} 1900}
1537 1901
1538############################################################################# 1902#############################################################################
1539 1903
1540package CFClient::UI::Image; 1904package CFClient::UI::Image;
… …
1583 glTranslate 0, -$self->{w}, 0; 1947 glTranslate 0, -$self->{w}, 0;
1584 1948
1585 ($w, $h) = ($h, $w); 1949 ($w, $h) = ($h, $w);
1586 } 1950 }
1587 1951
1588 glEnable GL_BLEND;
1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592 1954
1593 $tex->draw_quad (0, 0, $w, $h); 1955 $tex->draw_quad_alpha (0, 0, $w, $h);
1594 1956
1595 glDisable GL_BLEND;
1596 glDisable GL_TEXTURE_2D; 1957 glDisable GL_TEXTURE_2D;
1597} 1958}
1598 1959
1599############################################################################# 1960#############################################################################
1600 1961
1601package CFClient::UI::VGauge; 1962package CFClient::UI::VGauge;
1602 1963
1603our @ISA = CFClient::UI::Base::; 1964our @ISA = CFClient::UI::Base::;
1965
1966use List::Util qw(min max);
1604 1967
1605use CFClient::OpenGL; 1968use CFClient::OpenGL;
1606 1969
1607my %tex = ( 1970my %tex = (
1608 food => [ 1971 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1972 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1973 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ], 1974 ],
1612 grace => [ 1975 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1976 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1977 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1615 ], 1978 ],
1616 hp => [ 1979 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1981 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ], 1982 ],
1620 mana => [ 1983 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1984 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1985 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1623 ], 1986 ],
1624); 1987);
1625 1988
1626# eg. VGauge->new (gauge => 'food'), default gauge: food 1989# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new { 1990sub new {
… …
1646} 2009}
1647 2010
1648sub set_max { 2011sub set_max {
1649 my ($self, $max) = @_; 2012 my ($self, $max) = @_;
1650 2013
2014 return if $self->{max_val} == $max;
2015
1651 $self->{max_val} = $max; 2016 $self->{max_val} = $max;
2017 $self->update;
1652} 2018}
1653 2019
1654sub set_value { 2020sub set_value {
1655 my ($self, $val, $max) = @_; 2021 my ($self, $val, $max) = @_;
1656 2022
1657 $self->set_max ($max) 2023 $self->set_max ($max)
1658 if defined $max; 2024 if defined $max;
1659 2025
1660 $max = $self->{max_val}; 2026 return if $self->{val} == $val;
2027
1661 $self->{val} = $val; 2028 $self->{val} = $val;
1662
1663 $self->update; 2029 $self->update;
1664} 2030}
1665 2031
1666sub _draw { 2032sub _draw {
1667 my ($self) = @_; 2033 my ($self) = @_;
1668 2034
1669 my $tex = $tex{$self->{type}}; 2035 my $tex = $tex{$self->{type}};
2036 my ($t1, $t2, $t3) = @$tex;
1670 2037
1671 my ($w, $h) = ($self->{w}, $self->{h}); 2038 my ($w, $h) = ($self->{w}, $self->{h});
1672 2039
1673 if ($self->{vertical}) { 2040 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1; 2041 glRotate 90, 0, 0, 1;
… …
1676 2043
1677 ($w, $h) = ($h, $w); 2044 ($w, $h) = ($h, $w);
1678 } 2045 }
1679 2046
1680 my $ycut = $self->{val} / ($self->{max_val} || 1); 2047 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682 2048
1683 my $t1 = $tex->[0]; 2049 my $ycut1 = max 0, min 1, $ycut;
1684 my $t2 = $tex->[1]; 2050 my $ycut2 = max 0, min 1, $ycut - 1;
2051
2052 my $h1 = $self->{h} * (1 - $ycut1);
2053 my $h2 = $self->{h} * (1 - $ycut2);
1685 2054
1686 glEnable GL_BLEND; 2055 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2056 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D; 2057 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690 2059
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2060 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS; 2061 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0; 2062 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2063 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2064 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2065 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd; 2066 glEnd;
1701 2067
2068 my $ycut1 = List::Util::min 1, $ycut;
1702 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2069 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS; 2070 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2071 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2072 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2073 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2074 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1708 glEnd; 2075 glEnd;
2076
2077 if ($t3) {
2078 glBindTexture GL_TEXTURE_2D, $t3->{name};
2079 glBegin GL_QUADS;
2080 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2081 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2082 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2083 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2084 glEnd;
2085 }
1709 2086
1710 glDisable GL_BLEND; 2087 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D; 2088 glDisable GL_TEXTURE_2D;
1712} 2089}
1713 2090
… …
1719 2096
1720sub new { 2097sub new {
1721 my ($class, %arg) = @_; 2098 my ($class, %arg) = @_;
1722 2099
1723 my $self = $class->SUPER::new ( 2100 my $self = $class->SUPER::new (
1724 tooltip => $arg{type}, 2101 tooltip => $arg{type},
2102 can_hover => 1,
2103 can_events => 1,
1725 %arg, 2104 %arg,
1726 ); 2105 );
1727 2106
1728 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2107 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1729 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2108 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1730 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2109 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1731 2110
1732 $self 2111 $self
1733} 2112}
1734 2113
… …
1737 2116
1738 $self->{value}->set_fontsize ($fsize); 2117 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize); 2118 $self->{max} ->set_fontsize ($fsize);
1740} 2119}
1741 2120
2121sub set_max {
2122 my ($self, $max) = @_;
2123
2124 $self->{gauge}->set_max ($max);
2125 $self->{max}->set_text ($max);
2126}
2127
1742sub set_value { 2128sub set_value {
1743 my ($self, $val, $max) = @_; 2129 my ($self, $val, $max) = @_;
1744 2130
1745 $self->set_max ($max) 2131 $self->set_max ($max)
1746 if defined $max; 2132 if defined $max;
1747 2133
1748 $self->{gauge}->set_value ($val, $max); 2134 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val); 2135 $self->{value}->set_text ($val);
1750}
1751
1752sub set_max {
1753 my ($self, $max) = @_;
1754
1755 $self->{gauge}->set_max ($max);
1756 $self->{max}->set_text ($max);
1757} 2136}
1758 2137
1759############################################################################# 2138#############################################################################
1760 2139
1761package CFClient::UI::Slider; 2140package CFClient::UI::Slider;
… …
1771 qw(s1_slider.png s1_slider_bg.png); 2150 qw(s1_slider.png s1_slider_bg.png);
1772 2151
1773sub new { 2152sub new {
1774 my $class = shift; 2153 my $class = shift;
1775 2154
1776 # range [value, low, high, page] 2155 # range [value, low, high, page, unit]
1777 2156
1778 # TODO: 0-width page 2157 # TODO: 0-width page
1779 # TODO: req_w/h are wrong with vertical 2158 # TODO: req_w/h are wrong with vertical
1780 # TODO: calculations are off 2159 # TODO: calculations are off
1781 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
1782 fg => [1, 1, 1], 2161 fg => [1, 1, 1],
1783 active_fg => [0, 0, 0], 2162 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5],
1784 range => [0, 0, 100, 10], 2165 range => [0, 0, 100, 10, 0],
1785 req_w => 20, 2166 req_w => $::WIDTH / 80,
1786 req_h => 20, 2167 req_h => $::WIDTH / 80,
1787 vertical => 0, 2168 vertical => 0,
1788 can_hover => 1, 2169 can_hover => 1,
1789 inner_pad => 5, 2170 inner_pad => 0.02,
1790 @_ 2171 @_
1791 ); 2172 );
1792 2173
2174 $self->set_value ($self->{range}[0]);
2175 $self->update;
2176
1793 $self 2177 $self
2178}
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 }
1794} 2210}
1795 2211
1796sub size_request { 2212sub size_request {
1797 my ($self) = @_; 2213 my ($self) = @_;
1798 2214
… …
1804 2220
1805sub button_down { 2221sub button_down {
1806 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1807 2223
1808 $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
1809 $self->mouse_motion ($ev, $x, $y); 2228 $self->mouse_motion ($ev, $x, $y);
1810} 2229}
1811 2230
1812sub mouse_motion { 2231sub mouse_motion {
1813 my ($self, $ev, $x, $y) = @_; 2232 my ($self, $ev, $x, $y) = @_;
1814 2233
1815 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
1816 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2251 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100;
1817 2253
1818 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2254 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1819 2255
1820 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2256 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1821 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2257 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1822 2258
1823 $x -= $inner_pad_px; # substract the padding 2259 $value = ($value - $lo) / $range;
1824 $x = $x * ($hi - $lo) / $inner_w + $lo; 2260 $value = $value * $self->{scale} + $self->{offset};
1825 $x = $lo if $x < $lo;
1826 $x = $hi - $page if $x > $hi - $page;
1827 $self->{range}[0] = $x;
1828 2261
1829 $self->emit (changed => $x); 2262 $self->{knob_x} = $value - $knob_w * 0.5;
1830 $self->update; 2263 $self->{knob_w} = $knob_w;
1831 } 2264 });
1832}
1833 2265
1834# the inner_* stuff is for generating a padding for the slider handle, 2266 $self->SUPER::update;
1835# so that the handle doesn't leave the texture. This calculation isn't 100%
1836# correct propably, but it does the job for now
1837sub _calc_inner_pad_px {
1838 my ($self, $w) = @_;
1839 ($w / 100) * $self->{inner_pad} # % to pixels
1840} 2267}
1841 2268
1842sub _draw { 2269sub _draw {
1843 my ($self) = @_; 2270 my ($self) = @_;
1844 2271
1845 $self->SUPER::_draw (); 2272 $self->SUPER::_draw ();
1846 2273
1847 my ($w, $h) = @$self{qw(w h)}; 2274 glScale $self->{w}, $self->{h};
1848 2275
1849 if ($self->{vertical}) { 2276 if ($self->{vertical}) {
1850 # draw a vertical slider like a rotated horizontal slider 2277 # draw a vertical slider like a rotated horizontal slider
1851 2278
2279 glTranslate 1, 0, 0;
1852 glRotate 90, 0, 0, 1; 2280 glRotate 90, 0, 0, 1;
1853 glTranslate 0, -$self->{w}, 0;
1854
1855 ($w, $h) = ($h, $w);
1856 } 2281 }
1857 2282
1858 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2283 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1859 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2284 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1860 2285
1861 my ($value, $lo, $hi, $page) = @{$self->{range}};
1862
1863 $hi = $value + 1 if $lo == $hi;
1864
1865 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1866 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1867
1868 $page = int $page * $inner_w / ($hi - $lo);
1869 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1870
1871 $w -= $page;
1872 $page &= ~1;
1873 glTranslate $page * 0.5, 0, 0;
1874 $page ||= 2;
1875
1876 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1877 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1878
1879 glEnable GL_BLEND;
1880 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1881 glEnable GL_TEXTURE_2D; 2286 glEnable GL_TEXTURE_2D;
1882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2287 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1883 2288
1884 # draw background 2289 # draw background
1885 $tex[1]->draw_quad (0, 0, $w, $h); 2290 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1886 2291
1887 # draw handle 2292 # draw handle
1888 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2293 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1889 2294
1890 glDisable GL_BLEND;
1891 glDisable GL_TEXTURE_2D; 2295 glDisable GL_TEXTURE_2D;
1892} 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 (@_) }
1893 2338
1894############################################################################# 2339#############################################################################
1895 2340
1896package CFClient::UI::TextView; 2341package CFClient::UI::TextView;
1897 2342
… …
1901 2346
1902sub new { 2347sub new {
1903 my $class = shift; 2348 my $class = shift;
1904 2349
1905 my $self = $class->SUPER::new ( 2350 my $self = $class->SUPER::new (
1906 fontsize => 1, 2351 fontsize => 1,
2352 can_events => 0,
2353 #font => default_font
1907 @_, 2354 @_,
1908 2355
1909 layout => (new CFClient::Layout), 2356 layout => (new CFClient::Layout 1),
1910 par => [], 2357 par => [],
1911 height => 0, 2358 height => 0,
1912 children => [ 2359 children => [
1913 (new CFClient::UI::Empty expand => 1), 2360 (new CFClient::UI::Empty expand => 1),
1914 (new CFClient::UI::Slider vertical => 1), 2361 (new CFClient::UI::Slider vertical => 1),
1915 ], 2362 ],
1916 ); 2363 );
1917 2364
1918 $self->{children}[1]->connect (changed => sub { 2365 $self->{children}[1]->connect (changed => sub { $self->update });
1919 $self->update;
1920 });
1921 2366
1922 $self 2367 $self
1923} 2368}
1924 2369
1925sub set_fontsize { 2370sub set_fontsize {
… …
1927 2372
1928 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
1929 $self->reflow; 2374 $self->reflow;
1930} 2375}
1931 2376
2377sub size_allocate {
2378 my ($self, $w, $h) = @_;
2379
2380 $self->SUPER::size_allocate ($w, $h);
2381
2382 $self->{layout}->set_font ($self->{font}) if $self->{font};
2383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2384 $self->{layout}->set_width ($self->{children}[0]{w});
2385
2386 $self->reflow;
2387}
2388
1932sub text_height { 2389sub text_size {
1933 my ($self, $text) = @_; 2390 my ($self, $text, $indent) = @_;
1934 2391
1935 my $layout = $self->{layout}; 2392 my $layout = $self->{layout};
1936 2393
1937 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1938 $layout->set_width ($self->{w}); 2395 $layout->set_width ($self->{children}[0]{w} - $indent);
1939 $layout->set_text ($text); 2396 $layout->set_markup ($text);
1940 2397
1941 ($layout->size)[1] 2398 $layout->size
1942} 2399}
1943 2400
1944sub reflow { 2401sub reflow {
1945 my ($self) = @_; 2402 my ($self) = @_;
1946 2403
1947 $self->{need_reflow}++; 2404 $self->{need_reflow}++;
1948 $self->update; 2405 $self->update;
1949} 2406}
1950 2407
1951sub size_allocate { 2408sub set_offset {
2409 my ($self, $offset) = @_;
2410
2411 # todo: base offset on lines or so, not on pixels
2412 $self->{children}[1]->set_value ($offset);
2413}
2414
2415sub clear {
1952 my ($self, $w, $h) = @_; 2416 my ($self) = @_;
1953 2417
1954 $self->SUPER::size_allocate ($w, $h); 2418 $self->{par} = [];
1955 2419 $self->{height} = 0;
1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2420 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1957 $self->{layout}->set_width ($self->{children}[0]{w});
1958
1959 $self->reflow;
1960} 2421}
1961 2422
1962sub add_paragraph { 2423sub add_paragraph {
1963 my ($self, $color, $text) = @_; 2424 my ($self, $color, $text, $indent) = @_;
1964 2425
1965 #TODO: intelligently "reformat" paragraph 2426 for my $line (split /\n/, $text) {
1966 2427 my ($w, $h) = $self->text_size ($line);
1967 my $height = $self->text_height ($text);
1968
1969 $self->{height} += $height; 2428 $self->{height} += $h;
2429 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2430 }
1970 2431
1971 push @{$self->{par}}, [$height, $color, $text];
1972
1973 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2432 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1974 $self->{children}[1]->update;
1975} 2433}
1976 2434
1977sub update { 2435sub update {
1978 my ($self) = @_; 2436 my ($self) = @_;
1979 2437
… …
1981 2439
1982 return unless $self->{h} > 0; 2440 return unless $self->{h} > 0;
1983 2441
1984 delete $self->{texture}; 2442 delete $self->{texture};
1985 2443
1986 $ROOT->on_refresh ($self, sub { 2444 $ROOT->on_post_alloc ($self, sub {
2445 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2446
1987 if (delete $self->{need_reflow}) { 2447 if (delete $self->{need_reflow}) {
1988 my $height = 0; 2448 my $height = 0;
1989 2449
1990 $height += $_->[0] = $self->text_height ($_->[2]) 2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453
1991 for @{$self->{par}}; 2454 for (@{$self->{par}}) {
2455 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2456 $layout->set_width ($W - $_->[3]);
2457 $layout->set_markup ($_->[4]);
2458 my ($w, $h) = $layout->size;
2459 $_->[0] = $w + $_->[3];
2460 $_->[1] = $h;
2461 }
2462
2463 $height += $_->[1];
2464 }
1992 2465
1993 $self->{height} = $height; 2466 $self->{height} = $height;
1994 2467
1995 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2468 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1996 2469
1997 delete $self->{texture}; 2470 delete $self->{texture};
1998 } 2471 }
1999 2472
2000 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2473 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2001 glClearColor 0, 0, 0, 1; 2474 glClearColor 0.5, 0.5, 0.5, 0;
2002 glClear GL_COLOR_BUFFER_BIT; 2475 glClear GL_COLOR_BUFFER_BIT;
2003 2476
2477 my $top = int $self->{children}[1]{range}[0];
2478
2479 my $y0 = $top;
2480 my $y1 = $top + $H;
2481
2482 my $y = 0;
2483
2484 my $layout = $self->{layout};
2485
2486 $layout->set_font ($self->{font}) if $self->{font};
2487
2004 glEnable GL_BLEND; 2488 glEnable GL_BLEND;
2489 #TODO# not correct in windows where rgba is forced off
2005 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2490 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2006 glEnable GL_TEXTURE_2D;
2007 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2008
2009 my $top = int $self->{children}[1]{range}[0];
2010
2011 my $y0 = $top;
2012 my $y1 = $top + $self->{h};
2013
2014 my $y = 0;
2015
2016 my $layout = $self->{layout};
2017 2491
2018 for my $par (@{$self->{par}}) { 2492 for my $par (@{$self->{par}}) {
2019 my $h = $par->[0]; 2493 my $h = $par->[1];
2020 2494
2021 if ($y0 < $y + $h && $y < $y1) { 2495 if ($y0 < $y + $h && $y < $y1) {
2496 $layout->set_foreground (@{ $par->[2] });
2497 $layout->set_width ($W - $par->[3]);
2022 $layout->set_text ($par->[2]); 2498 $layout->set_markup ($par->[4]);
2023 2499
2024 glColor @{ $par->[1] }; 2500 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2025 my ($W, $H) = $layout->size; 2501
2026 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2502 glRasterPos $par->[3], $y - $y0;
2503 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2027 } 2504 }
2028 2505
2029 $y += $h; 2506 $y += $h;
2030 } 2507 }
2031 2508
2032 glDisable GL_TEXTURE_2D;
2033 glDisable GL_BLEND; 2509 glDisable GL_BLEND;
2034 }; 2510 };
2035 }); 2511 });
2036} 2512}
2037 2513
2038sub _draw { 2514sub _draw {
2039 my ($self) = @_; 2515 my ($self) = @_;
2040 2516
2041 if ($self->{texture}) {
2042 glEnable GL_TEXTURE_2D; 2517 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2519 glColor 1, 1, 1, 1;
2044 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2520 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2045 glDisable GL_TEXTURE_2D; 2521 glDisable GL_TEXTURE_2D;
2046 }
2047 2522
2048 $self->{children}[1]->draw; 2523 $self->{children}[1]->draw;
2049 2524
2050} 2525}
2051 2526
… …
2099 2574
2100sub new { 2575sub new {
2101 my $class = shift; 2576 my $class = shift;
2102 2577
2103 my $self = $class->SUPER::new ( 2578 my $self = $class->SUPER::new (
2104 state => 0, 2579 state => 0,
2105 connect_activate => \&toggle_flopper, 2580 on_activate => \&toggle_flopper,
2106 can_events => 1,
2107 @_ 2581 @_
2108 ); 2582 );
2109 2583
2110 if ($self->{state}) { 2584 if ($self->{state}) {
2111 $self->{state} = 0; 2585 $self->{state} = 0;
… …
2120 2594
2121 # TODO: use animation 2595 # TODO: use animation
2122 if ($self->{state} = !$self->{state}) { 2596 if ($self->{state} = !$self->{state}) {
2123 $CFClient::UI::ROOT->add ($self->{other}); 2597 $CFClient::UI::ROOT->add ($self->{other});
2124 $self->{other}->move ($self->coord2global (0, $self->{h})); 2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2125 $self->emit ("open"); 2599 $self->_emit ("open");
2126 } else { 2600 } else {
2127 $CFClient::UI::ROOT->remove ($self->{other}); 2601 $CFClient::UI::ROOT->remove ($self->{other});
2128 $self->emit ("close"); 2602 $self->_emit ("close");
2129 } 2603 }
2130 2604
2131 $self->emit (changed => $self->{state}); 2605 $self->_emit (changed => $self->{state});
2132} 2606}
2133 2607
2134############################################################################# 2608#############################################################################
2135 2609
2136package CFClient::UI::Tooltip; 2610package CFClient::UI::Tooltip;
… …
2146 @_, 2620 @_,
2147 can_events => 0, 2621 can_events => 0,
2148 ) 2622 )
2149} 2623}
2150 2624
2151sub set_text { 2625sub set_tooltip_from {
2152 my ($self, $text) = @_; 2626 my ($self, $widget) = @_;
2153 2627
2154 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8; 2628 $self->add (new CFClient::UI::Label
2155 $self->{label}->set_text ($text); 2629 markup => $widget->{tooltip},
2156 $self->add ($self->{label}); 2630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631 fontsize => 0.8,
2632 fg => [0, 0, 0, 1],
2633 ellipsise => 0,
2634 font => ($widget->{tooltip_font} || $::FONT_PROP),
2635 );
2157} 2636}
2158 2637
2159sub size_request { 2638sub size_request {
2160 my ($self) = @_; 2639 my ($self) = @_;
2161 2640
2162 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2641 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2163 2642
2164 $w = List::Util::min $::WIDTH * 0.2, $w; 2643 ($w + 4, $h + 4)
2644}
2165 2645
2166 ($w, $h) 2646sub size_allocate {
2647 my ($self, $w, $h) = @_;
2648
2649 $self->SUPER::size_allocate ($w - 4, $h - 4);
2650}
2651
2652sub _draw {
2653 my ($self) = @_;
2654
2655 glTranslate 0.375, 0.375;
2656
2657 my ($w, $h) = @$self{qw(w h)};
2658
2659 glColor 1, 0.8, 0.4;
2660 glBegin GL_QUADS;
2661 glVertex 0 , 0;
2662 glVertex 0 , $h;
2663 glVertex $w, $h;
2664 glVertex $w, 0;
2665 glEnd;
2666
2667 glColor 0, 0, 0;
2668 glBegin GL_LINE_LOOP;
2669 glVertex 0 , 0;
2670 glVertex 0 , $h;
2671 glVertex $w, $h;
2672 glVertex $w, 0;
2673 glEnd;
2674
2675 glTranslate 2 - 0.375, 2 - 0.375;
2676 $self->SUPER::_draw;
2167} 2677}
2168 2678
2169############################################################################# 2679#############################################################################
2170 2680
2681package CFClient::UI::Face;
2682
2683our @ISA = CFClient::UI::Base::;
2684
2685use CFClient::OpenGL;
2686
2687sub new {
2688 my $class = shift;
2689
2690 my $self = $class->SUPER::new (
2691 aspect => 1,
2692 can_events => 0,
2693 @_,
2694 );
2695
2696 if ($self->{anim} && $self->{animspeed}) {
2697 Scalar::Util::weaken (my $widget = $self);
2698
2699 $self->{timer} = Event->timer (
2700 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2701 hard => 1,
2702 interval => $self->{animspeed},
2703 cb => sub {
2704 ++$widget->{frame};
2705 $widget->update;
2706 },
2707 );
2708 }
2709
2710 $self
2711}
2712
2713sub size_request {
2714 (32, 8)
2715}
2716
2717sub update {
2718 my ($self) = @_;
2719
2720 return unless $self->{visible};
2721
2722 $self->SUPER::update;
2723}
2724
2725sub _draw {
2726 my ($self) = @_;
2727
2728 return unless $::CONN;
2729
2730 my $face;
2731
2732 if ($self->{frame}) {
2733 my $anim = $::CONN->{anim}[$self->{anim}];
2734
2735 $face = $anim->[ $self->{frame} % @$anim ]
2736 if $anim && @$anim;
2737 }
2738
2739 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2740
2741 if ($tex) {
2742 glEnable GL_TEXTURE_2D;
2743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2744 glColor 1, 1, 1, 1;
2745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2746 glDisable GL_TEXTURE_2D;
2747 }
2748}
2749
2750sub DESTROY {
2751 my ($self) = @_;
2752
2753 $self->{timer}->cancel
2754 if $self->{timer};
2755
2756 $self->SUPER::DESTROY;
2757}
2758
2759#############################################################################
2760
2761package CFClient::UI::Inventory;
2762
2763our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765sub new {
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 my $row = 0;
2790 for my $item (@items) {
2791 CFClient::Item::update_widgets $item;
2792
2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797 $row++;
2798 }
2799}
2800
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804}
2805
2806#############################################################################
2807
2808package CFClient::UI::Menu;
2809
2810our @ISA = CFClient::UI::FancyFrame::;
2811
2812use CFClient::OpenGL;
2813
2814sub new {
2815 my $class = shift;
2816
2817 my $self = $class->SUPER::new (
2818 items => [],
2819 z => 100,
2820 @_,
2821 );
2822
2823 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2824
2825 for my $item (@{ $self->{items} }) {
2826 my ($widget, $cb) = @$item;
2827
2828 # handle various types of items, only text for now
2829 if (!ref $widget) {
2830 $widget = new CFClient::UI::Label
2831 can_hover => 1,
2832 can_events => 1,
2833 text => $widget;
2834 }
2835
2836 $self->{item}{$widget} = $item;
2837
2838 $self->{vbox}->add ($widget);
2839 }
2840
2841 $self
2842}
2843
2844# popup given the event (must be a mouse button down event currently)
2845sub popup {
2846 my ($self, $ev) = @_;
2847
2848 $self->_emit ("popdown");
2849
2850 # maybe save $GRAB? must be careful about events...
2851 $GRAB = $self;
2852 $self->{button} = $ev->{button};
2853
2854 $self->show;
2855 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2856}
2857
2858sub mouse_motion {
2859 my ($self, $ev, $x, $y) = @_;
2860
2861 # TODO: should use vbox->find_widget or so
2862 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863 $self->{hover} = $self->{item}{$HOVER};
2864}
2865
2866sub button_up {
2867 my ($self, $ev, $x, $y) = @_;
2868
2869 if ($ev->{button} == $self->{button}) {
2870 undef $GRAB;
2871 $self->hide;
2872
2873 $self->_emit ("popdown");
2874 $self->{hover}[1]->() if $self->{hover};
2875 }
2876}
2877
2878#############################################################################
2879
2880package CFClient::UI::Statusbox;
2881
2882our @ISA = CFClient::UI::VBox::;
2883
2884sub new {
2885 my $class = shift;
2886
2887 $class->SUPER::new (
2888 fontsize => 0.8,
2889 @_,
2890 )
2891}
2892
2893sub reorder {
2894 my ($self) = @_;
2895 my $NOW = time;
2896
2897 while (my ($k, $v) = each %{ $self->{item} }) {
2898 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2899 }
2900
2901 my @widgets;
2902
2903 my @items = sort {
2904 $a->{pri} <=> $b->{pri}
2905 or $b->{id} <=> $a->{id}
2906 } values %{ $self->{item} };
2907
2908 my $count = 10 + 1;
2909 for my $item (@items) {
2910 last unless --$count;
2911
2912 push @widgets, $item->{label} ||= do {
2913 # TODO: doesn't handle markup well (read as: at all)
2914 my $short = $item->{count} > 1
2915 ? "<b>$item->{count} ×</b> $item->{text}"
2916 : $item->{text};
2917
2918 for ($short) {
2919 s/^\s+//;
2920 s/\s+/ /g;
2921 }
2922
2923 new CFClient::UI::Label
2924 markup => $short,
2925 tooltip => $item->{tooltip},
2926 tooltip_font => $::FONT_PROP,
2927 tooltip_width => 0.67,
2928 fontsize => $item->{fontsize} || $self->{fontsize},
2929 max_w => $::WIDTH * 0.44,
2930 fg => $item->{fg},
2931 can_events => 1,
2932 can_hover => 1
2933 };
2934 }
2935
2936 $self->clear;
2937 $self->SUPER::add (reverse @widgets);
2938}
2939
2940sub add {
2941 my ($self, $text, %arg) = @_;
2942
2943 $text =~ s/^\s+//;
2944 $text =~ s/\s+$//;
2945
2946 return unless $text;
2947
2948 my $timeout = time + ((delete $arg{timeout}) || 60);
2949
2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2951
2952 if (my $item = $self->{item}{$group}) {
2953 if ($item->{text} eq $text) {
2954 $item->{count}++;
2955 } else {
2956 $item->{count} = 1;
2957 $item->{text} = $item->{tooltip} = $text;
2958 }
2959 $item->{id} = ++$self->{id};
2960 $item->{timeout} = $timeout;
2961 delete $item->{label};
2962 } else {
2963 $self->{item}{$group} = {
2964 id => ++$self->{id},
2965 text => $text,
2966 timeout => $timeout,
2967 tooltip => $text,
2968 fg => [0.8, 0.8, 0.8, 0.8],
2969 pri => 0,
2970 count => 1,
2971 %arg,
2972 };
2973 }
2974
2975 $self->reorder;
2976}
2977
2978sub reconfigure {
2979 my ($self) = @_;
2980
2981 delete $_->{label}
2982 for values %{ $self->{item} || {} };
2983
2984 $self->reorder;
2985 $self->SUPER::reconfigure;
2986}
2987
2988#############################################################################
2989
2171package CFClient::UI::Root; 2990package CFClient::UI::Root;
2172 2991
2173our @ISA = CFClient::UI::Container::; 2992our @ISA = CFClient::UI::Container::;
2174 2993
2175use CFClient::OpenGL; 2994use CFClient::OpenGL;
2176 2995
2177sub check_size { 2996sub new {
2178 my ($self) = @_; 2997 my $class = shift;
2179 2998
2180 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2999 $class->SUPER::new (
2181} 3000 visible => 1,
2182 3001 @_,
2183sub size_request { 3002 )
2184 ($::WIDTH, $::HEIGHT)
2185} 3003}
2186 3004
2187sub configure { 3005sub configure {
2188 my ($self, $x, $y, $w, $h) = @_; 3006 my ($self, $x, $y, $w, $h) = @_;
2189 3007
2190 $self->SUPER::configure ($x, $y, $w, $h); 3008 $self->{w} = $w;
3009 $self->{h} = $h;
3010}
2191 3011
3012sub check_size {
3013 my ($self) = @_;
3014
3015 $self->size_allocate ($self->{w}, $self->{h})
3016 if $self->{w};
3017}
3018
3019sub size_request {
3020 my ($self) = @_;
3021
3022 ($self->{w}, $self->{h})
3023}
3024
3025sub size_allocate {
3026 my ($self, $w, $h) = @_;
3027
2192 for my $child (@{$self->{children}}) { 3028 for my $child ($self->children) {
2193 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2194 3030
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3032 if exists $child->{req_x};
3033
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3035 if exists $child->{req_y};
3036
2195 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2196 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039
2197 $child->configure ($X, $Y, $W,$H); 3040 $child->configure ($X, $Y, $W, $H);
2198 } 3041 }
2199} 3042}
2200 3043
2201sub _topleft { 3044sub coord2local {
2202 my ($self, $x, $y) = @_; 3045 my ($self, $x, $y) = @_;
2203 3046
2204 ($x, $y) 3047 ($x, $y)
2205} 3048}
2206 3049
3050sub coord2global {
3051 my ($self, $x, $y) = @_;
3052
3053 ($x, $y)
3054}
3055
2207sub update { 3056sub update {
2208 my ($self) = @_; 3057 my ($self) = @_;
2209 3058
2210 $self->check_size; 3059 $self->check_size;
2211 ::refresh (); 3060 $::WANT_REFRESH++;
2212} 3061}
2213 3062
2214sub add { 3063sub add {
2215 my ($self, $child) = @_; 3064 my ($self, @children) = @_;
2216 3065
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
3072 for my $child (@children) {
3073 $child->{is_toplevel} = 1;
3074
2217 # integerize window positions 3075 # integerise window positions
2218 $child->{x} = int $child->{x}; 3076 $child->{x} = int $child->{x};
2219 $child->{y} = int $child->{y}; 3077 $child->{y} = int $child->{y};
3078 }
2220 3079
2221 $self->SUPER::add ($child); 3080 $self->SUPER::add (@children);
3081}
3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 $w->set_invisible;
3092 }
2222} 3093}
2223 3094
2224sub on_refresh { 3095sub on_refresh {
2225 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2226 3097
2227 $self->{refresh_hook}{$id} = $cb; 3098 $self->{refresh_hook}{$id} = $cb;
2228} 3099}
2229 3100
3101sub on_post_alloc {
3102 my ($self, $id, $cb) = @_;
3103
3104 $self->{post_alloc_hook}{$id} = $cb;
3105}
3106
2230sub draw { 3107sub draw {
2231 my ($self) = @_; 3108 my ($self) = @_;
2232 3109
2233 while (my $rcb = delete $self->{refresh_hook}) { 3110 while ($self->{refresh_hook}) {
2234 $_->() for values %$rcb; 3111 $_->()
3112 for values %{delete $self->{refresh_hook}};
3113 }
3114
3115 if ($self->{check_size}) {
3116 my @queue;
3117
3118 for (;;) {
3119 if ($self->{check_size}) {
3120 #TODO use array-of-depth approach
3121
3122 @queue = sort { $a->{visible} <=> $b->{visible} }
3123 @queue, values %{delete $self->{check_size}};
3124 }
3125
3126 my $widget = pop @queue || last;
3127
3128 defined $widget->{visible} or last; # do not resize invisible widgets
3129
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131 ? @$widget{qw(user_w user_h)}
3132 : $widget->size_request;
3133
3134 if (delete $widget->{force_alloc}
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137
3138 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h;
3140
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3142
3143 $widget->{parent}->check_size
3144 if $widget->{parent};
3145 }
3146 }
3147 }
3148
3149 while ($self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) {
3151 my ($widget, $w, $h) = @$_;
3152
3153 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0;
3155
3156 $widget->{w} = $w;
3157 $widget->{h} = $h;
3158 $widget->emit (size_allocate => $w, $h);
3159 }
3160 }
3161
3162 while ($self->{post_alloc_hook}) {
3163 $_->()
3164 for values %{delete $self->{post_alloc_hook}};
2235 } 3165 }
2236 3166
2237 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3167 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2238 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2239 glClear GL_COLOR_BUFFER_BIT; 3169 glClear GL_COLOR_BUFFER_BIT;
2240 3170
2241 glMatrixMode GL_PROJECTION; 3171 glMatrixMode GL_PROJECTION;
2242 glLoadIdentity; 3172 glLoadIdentity;
2243 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3173 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2244 glMatrixMode GL_MODELVIEW; 3174 glMatrixMode GL_MODELVIEW;
2245 glLoadIdentity; 3175 glLoadIdentity;
2246 3176
2247 $self->_draw; 3177 $self->_draw;
2248} 3178}
… …
2250############################################################################# 3180#############################################################################
2251 3181
2252package CFClient::UI; 3182package CFClient::UI;
2253 3183
2254$ROOT = new CFClient::UI::Root; 3184$ROOT = new CFClient::UI::Root;
2255$TOOLTIP = new CFClient::UI::Tooltip; 3185$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2256 3186
22571 31871
2258 3188

Diff Legend

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