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

Diff Legend

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