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

Diff Legend

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