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.146 by elmex, Fri Apr 21 15:03:46 2006 UTC vs.
Revision 1.234 by root, Thu May 25 16:24:44 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 abtract"; 274 Carp::confess "size_request is abstract";
146} 275}
147 276
148sub configure { 277sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 278 my ($self, $x, $y, $w, $h) = @_;
150 279
… …
152 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 281 my $w2 = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 282 my $h2 = List::Util::min $h, int $w / $self->{aspect};
154 283
155 # use alignment to adjust x, y 284 # use alignment to adjust x, y
156 285
157 $x += ($w - $w2) * 0.5; 286 $x += int +($w - $w2) * 0.5;
158 $y += ($h - $h2) * 0.5; 287 $y += int +($h - $h2) * 0.5;
159 288
160 ($w, $h) = ($w2, $h2); 289 ($w, $h) = ($w2, $h2);
161 } 290 }
162 291
163 if ($self->{x} != $x || $self->{y} != $y) { 292 if ($self->{x} != $x || $self->{y} != $y) {
… …
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
428 $self->check_size; 623 $self->check_size;
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
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 772
561sub new { die } 773sub new {
774 my $class = shift;
775
776 $class->SUPER::new (
777 scroll_x => 0,
778 scroll_y => 1,
779 @_,
780 )
781}
562 782
563sub size_request { 783sub size_request {
564 my ($self) = @_; 784 my ($self) = @_;
565 785
566 @$self{qw(child_w child_h)} = $self->child->size_request; 786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568 787
569 @$self{qw(child_w child_h)} 788 @$self{qw(child_w child_h)}
570} 789}
571 790
791sub size_allocate {
792 my ($self, $w, $h) = @_;
793
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
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 )
905}
906
572sub _draw { 907sub _draw {
573 my ($self) = @_; 908 my ($self) = @_;
574 909
575 $self->{children}[1]->draw; 910 if ($self->{bg}) {
576} 911 my ($w, $h) = @$self{qw(w h)};
577 912
913 glEnable GL_BLEND;
914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
915 glColor @{ $self->{bg} };
578 916
579#############################################################################
580
581package CFClient::UI::Frame;
582
583our @ISA = CFClient::UI::Bin::;
584
585use CFClient::OpenGL;
586
587sub size_request {
588 my ($self) = @_;
589 my $chld = $self->child
590 or return (0, 0);
591
592 $chld->move (2, 2);
593
594 map { $_ + 4 } $chld->size_request;
595}
596
597sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_;
599
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601}
602
603sub _draw {
604 my ($self) = @_;
605
606 my $chld = $self->child;
607
608 my ($w, $h) = $chld->size_request;
609
610 glBegin GL_QUADS; 917 glBegin GL_QUADS;
611 glColor 0, 0, 0;
612 glVertex 0 , 0; 918 glVertex 0 , 0;
613 glVertex 0 , $h + 4; 919 glVertex 0 , $h;
614 glVertex $w + 4 , $h + 4; 920 glVertex $w, $h;
615 glVertex $w + 4 , 0; 921 glVertex $w, 0;
616 glEnd; 922 glEnd;
617 923
618 $chld->draw; 924 glDisable GL_BLEND;
925 }
926
927 $self->SUPER::_draw;
619} 928}
620 929
621############################################################################# 930#############################################################################
622 931
623package CFClient::UI::FancyFrame; 932package CFClient::UI::FancyFrame;
… …
634 my $class = shift; 943 my $class = shift;
635 944
636 # TODO: user_x, user_y, overwrite moveto? 945 # TODO: user_x, user_y, overwrite moveto?
637 946
638 my $self = $class->SUPER::new ( 947 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 948 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 949 border_bg => [1, 1, 1, 1],
641 border => 0.8, 950 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1,
642 @_ 953 @_
643 ); 954 );
644 955
645 $self->{title} &&= new CFClient::UI::Label 956 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 957 align => 0,
647 valign => 1, 958 valign => 1,
648 text => $self->{title}, 959 text => $self->{title},
649 fontsize => 1; 960 fontsize => $self->{border};
650 961
651 $self 962 $self
652} 963}
653 964
654sub border { 965sub border {
655 int $_[0]{border} * $::FONTSIZE 966 int $_[0]{border} * $::FONTSIZE
656} 967}
657 968
658sub size_request { 969sub size_request {
659 my ($self) = @_; 970 my ($self) = @_;
660
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662 971
663 my ($w, $h) = $self->SUPER::size_request; 972 my ($w, $h) = $self->SUPER::size_request;
664 973
665 ( 974 (
666 $w + $self->border * 2, 975 $w + $self->border * 2,
… …
672 my ($self, $w, $h) = @_; 981 my ($self, $w, $h) = @_;
673 982
674 $h -= List::Util::max 0, $self->border * 2; 983 $h -= List::Util::max 0, $self->border * 2;
675 $w -= List::Util::max 0, $self->border * 2; 984 $w -= List::Util::max 0, $self->border * 2;
676 985
677 $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)
678 if $self->{title}; 987 if $self->{title};
679 988
680 $self->child->configure ($self->border, $self->border, $w, $h); 989 $self->child->configure ($self->border, $self->border, $w, $h);
681} 990}
682 991
683sub button_down { 992sub button_down {
684 my ($self, $ev, $x, $y) = @_; 993 my ($self, $ev, $x, $y) = @_;
685 994
995 my ($w, $h) = @$self{qw(w h)};
686 my $border = $self->border; 996 my $border = $self->border;
687 997
688 if ($x < $self->{w} && $x >= $self->{w} - $border 998 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
689 && $y < $self->{h} && $y >= $self->{h} - $border) { 999 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
690 1000
1001 if ($lr & $td) {
1002 my ($wx, $wy) = ($self->{x}, $self->{y});
691 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1003 my ($ox, $oy) = ($ev->{x}, $ev->{y});
692 my ($bw, $bh) = ($self->{w}, $self->{h}); 1004 my ($bw, $bh) = ($self->{w}, $self->{h});
693 1005
1006 my $mx = $x < $border;
1007 my $my = $y < $border;
1008
694 $self->{motion} = sub { 1009 $self->{motion} = sub {
695 my ($ev, $x, $y) = @_; 1010 my ($ev, $x, $y) = @_;
696 1011
697 ($x, $y) = ($ev->{x}, $ev->{y}); 1012 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy;
698 1014
699 $self->{user_w} = $bw + $x - $ox; 1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
700 $self->{user_h} = $bh + $y - $oy; 1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
701 $self->check_size; 1018 $self->check_size;
702 }; 1019 };
703 1020
704 } elsif ($x >= 0 && $x < $self->{w} 1021 } elsif ($lr ^ $td) {
705 && $y >= 0 && $y < $border) {
706
707 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1022 my ($ox, $oy) = ($ev->{x}, $ev->{y});
708 my ($bx, $by) = ($self->{x}, $self->{y}); 1023 my ($bx, $by) = ($self->{x}, $self->{y});
709 1024
710 $self->{motion} = sub { 1025 $self->{motion} = sub {
711 my ($ev, $x, $y) = @_; 1026 my ($ev, $x, $y) = @_;
… …
734 my ($self) = @_; 1049 my ($self) = @_;
735 1050
736 my ($w, $h ) = ($self->{w}, $self->{h}); 1051 my ($w, $h ) = ($self->{w}, $self->{h});
737 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
738 1053
739 glEnable GL_BLEND;
740 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 1054 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
743 1056
744 my $border = $self->border; 1057 my $border = $self->border;
745 1058
746 glColor @{ $self->{border_bg} }; 1059 glColor @{ $self->{border_bg} };
747 $tex[1]->draw_quad (0, 0, $w, $border); 1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
748 $tex[3]->draw_quad (0, $border, $border, $ch); 1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
750 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
751 1064
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
752 my $bg = $tex[0]; 1066 my $bg = $tex[0];
753 1067
754 # TODO: repeat texture not scale 1068 # TODO: repeat texture not scale
755 my $rep_x = $cw / $bg->{w}; 1069 my $rep_x = $cw / $bg->{w};
756 my $rep_y = $ch / $bg->{h}; 1070 my $rep_y = $ch / $bg->{h};
757 1071
758 glColor @{ $self->{bg} }; 1072 glColor @{ $self->{bg} };
759 1073
760 $bg->{s} = $rep_x; 1074 $bg->{s} = $rep_x;
761 $bg->{t} = $rep_y; 1075 $bg->{t} = $rep_y;
762 $bg->{wrap_mode} = 1; 1076 $bg->{wrap_mode} = 1;
763 $bg->draw_quad ($border, $border, $cw, $ch); 1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 }
764 1079
765 glDisable GL_TEXTURE_2D; 1080 glDisable GL_TEXTURE_2D;
766 glDisable GL_BLEND;
767 1081
768 $self->{title}->draw if $self->{title}; 1082 $self->{title}->draw if $self->{title};
1083
769 $self->child->draw; 1084 $self->child->draw;
770} 1085}
771 1086
772############################################################################# 1087#############################################################################
773 1088
… …
782sub new { 1097sub new {
783 my $class = shift; 1098 my $class = shift;
784 1099
785 $class->SUPER::new ( 1100 $class->SUPER::new (
786 col_expand => [], 1101 col_expand => [],
787 @_ 1102 @_,
788 ) 1103 )
789} 1104}
790 1105
791sub add { 1106sub add {
792 my ($self, $x, $y, $child) = @_; 1107 my ($self, $x, $y, $child) = @_;
… …
795 $self->{children}[$y][$x] = $child; 1110 $self->{children}[$y][$x] = $child;
796 1111
797 $child->check_size; 1112 $child->check_size;
798} 1113}
799 1114
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
800# TODO: move to container class maybe? send childs a signal on removal? 1119# TODO: move to container class maybe? send childs a signal on removal?
801sub clear { 1120sub clear {
802 my ($self) = @_; 1121 my ($self) = @_;
803 1122
1123 my @children = $self->children;
804 delete $self->{children}; 1124 delete $self->{children};
1125
1126 for (@children) {
1127 delete $_->{parent};
1128 $_->hide;
1129 }
1130
805 $self->update; 1131 $self->update;
806} 1132}
807 1133
808sub get_wh { 1134sub get_wh {
809 my ($self) = @_; 1135 my ($self) = @_;
… …
815 or next; 1141 or next;
816 1142
817 for my $x (0 .. $#$row) { 1143 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 1144 my $widget = $row->[$x]
819 or next; 1145 or next;
820 my ($w, $h) = $widget->size_request; 1146 my ($w, $h) = @$widget{qw(req_w req_h)};
821 1147
822 $w[$x] = max $w[$x], $w; 1148 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 1149 $h[$y] = max $h[$y], $h;
824 } 1150 }
825 } 1151 }
… …
930 1256
931 ($h, $w) = ($w, $h); 1257 ($h, $w) = ($w, $h);
932 1258
933 my $children = $self->{children}; 1259 my $children = $self->{children};
934 1260
935 my @h = map +($_->size_request)[0], @$children; 1261 my @h = map $_->{req_w}, @$children;
936 1262
937 my $req_h = List::Util::sum @h; 1263 my $req_h = List::Util::sum @h;
938 1264
939 if ($req_h > $h) { 1265 if ($req_h > $h) {
940 # ah well, not enough space 1266 # ah well, not enough space
… …
986} 1312}
987 1313
988sub size_allocate { 1314sub size_allocate {
989 my ($self, $w, $h) = @_; 1315 my ($self, $w, $h) = @_;
990 1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
991 my $children = $self->{children}; 1319 my $children = $self->{children};
992 1320
993 my @h = map +($_->size_request)[1], @$children; 1321 my @h = map $_->{req_h}, @$children;
994 1322
995 my $req_h = List::Util::sum @h; 1323 my $req_h = List::Util::sum @h;
996 1324
997 if ($req_h > $h) { 1325 if ($req_h > $h) {
998 # ah well, not enough space 1326 # ah well, not enough space
… …
1024 1352
1025############################################################################# 1353#############################################################################
1026 1354
1027package CFClient::UI::Label; 1355package CFClient::UI::Label;
1028 1356
1029our @ISA = CFClient::UI::Base::; 1357our @ISA = CFClient::UI::DrawBG::;
1030 1358
1031use CFClient::OpenGL; 1359use CFClient::OpenGL;
1032 1360
1033sub new { 1361sub new {
1034 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1035 1363
1036 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1365 fg => [1, 1, 1],
1366 #bg => none
1367 #active_bg => none
1368 #font => default_font
1369 #text => initial text
1370 #markup => initial narkup
1371 #max_w => maximum pixel width
1372 ellipsise => 3, # end
1373 layout => (new CFClient::Layout),
1038 fontsize => 1, 1374 fontsize => 1,
1039 text => "",
1040 align => -1, 1375 align => -1,
1041 valign => -1, 1376 valign => -1,
1042 padding => 2, 1377 padding => 2,
1043 layout => new CFClient::Layout, 1378 can_events => 0,
1044 %arg 1379 %arg
1045 ); 1380 );
1046 1381
1047 if (exists $self->{template}) { 1382 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1383 my $layout = new CFClient::Layout;
1049 $layout->set_text (delete $self->{template}); 1384 $layout->set_text (delete $self->{template});
1050 $self->{template} = $layout; 1385 $self->{template} = $layout;
1051 } 1386 }
1052 1387
1053 $self->set_text (delete $self->{text}) if exists $self->{text}; 1388 if (exists $self->{markup}) {
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1389 $self->set_markup (delete $self->{markup});
1390 } else {
1391 $self->set_text (delete $self->{text});
1392 }
1055 1393
1056 $self 1394 $self
1057} 1395}
1058 1396
1059sub escape_text { 1397sub escape($) {
1060 local $_ = $_[1]; 1398 local $_ = $_[0];
1061 1399
1062 s/&/&amp;/g; 1400 s/&/&amp;/g;
1063 s/>/&gt;/g; 1401 s/>/&gt;/g;
1064 s/</&lt;/g; 1402 s/</&lt;/g;
1065 1403
1066 $_[1] 1404 $_
1405}
1406
1407sub update {
1408 my ($self) = @_;
1409
1410 delete $self->{texture};
1411 $self->SUPER::update;
1067} 1412}
1068 1413
1069sub set_text { 1414sub set_text {
1070 my ($self, $text) = @_; 1415 my ($self, $text) = @_;
1071 1416
1417 return if $self->{text} eq "T$text";
1418 $self->{text} = "T$text";
1419
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1072 $self->{layout}->set_text ($text); 1421 $self->{layout}->set_text ($text);
1073 1422
1074 delete $self->{texture};
1075 $self->update; 1423 $self->update;
1424 $self->check_size;
1076} 1425}
1077 1426
1078sub set_markup { 1427sub set_markup {
1079 my ($self, $markup) = @_; 1428 my ($self, $markup) = @_;
1080 1429
1430 return if $self->{text} eq "M$markup";
1431 $self->{text} = "M$markup";
1432
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1081 $self->{layout}->set_markup ($markup); 1436 $self->{layout}->set_markup ($markup);
1082 1437
1083 delete $self->{texture};
1084 $self->update; 1438 $self->update;
1439 $self->check_size;
1085} 1440}
1086 1441
1087sub size_request { 1442sub size_request {
1088 my ($self) = @_; 1443 my ($self) = @_;
1089 1444
1090 $self->{layout}->set_width; 1445 $self->{layout}->set_font ($self->{font}) if $self->{font};
1446 $self->{layout}->set_width ($self->{max_w} || -1);
1447 $self->{layout}->set_ellipsise ($self->{ellipsise});
1448 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1449 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1450
1093 my ($w, $h) = $self->{layout}->size; 1451 my ($w, $h) = $self->{layout}->size;
1094 1452
1095 if (exists $self->{template}) { 1453 if (exists $self->{template}) {
1454 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1455 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1456
1098 my ($w2, $h2) = $self->{template}->size; 1457 my ($w2, $h2) = $self->{template}->size;
1099 1458
1100 $w = List::Util::max $w, $w2; 1459 $w = List::Util::max $w, $w2;
… …
1115 1474
1116sub set_fontsize { 1475sub set_fontsize {
1117 my ($self, $fontsize) = @_; 1476 my ($self, $fontsize) = @_;
1118 1477
1119 $self->{fontsize} = $fontsize; 1478 $self->{fontsize} = $fontsize;
1479 delete $self->{texture};
1480
1120 $self->update; 1481 $self->update;
1482 $self->check_size;
1121} 1483}
1122 1484
1123sub _draw { 1485sub _draw {
1124 my ($self) = @_; 1486 my ($self) = @_;
1125 1487
1488 $self->SUPER::_draw; # draw background, if applicable
1489
1126 my $tex = $self->{texture} ||= do { 1490 my $tex = $self->{texture} ||= do {
1491 $self->{layout}->set_foreground (@{$self->{fg}});
1492 $self->{layout}->set_font ($self->{font}) if $self->{font};
1127 $self->{layout}->set_width ($self->{w}); 1493 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1128 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497
1129 new_from_layout CFClient::Texture $self->{layout} 1498 my $tex = new_from_layout CFClient::Texture $self->{layout};
1499
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1502 : ($self->{w} - $tex->{w}) * 0.5);
1503
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1506 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1130 }; 1509 };
1131 1510
1132 glEnable GL_BLEND;
1133 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1134 glEnable GL_TEXTURE_2D; 1511 glEnable GL_TEXTURE_2D;
1135 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1136 1513
1514 if ($tex->{format} == GL_ALPHA) {
1137 glColor @{$self->{fg}}; 1515 glColor @{$self->{fg}};
1138
1139 $self->{ox} = int (
1140 $self->{align} < 0 ? $self->{padding}
1141 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1142 : ($self->{w} - $tex->{w}) * 0.5
1143 );
1144
1145 $self->{oy} = int (
1146 $self->{valign} < 0 ? $self->{padding}
1147 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1148 : ($self->{h} - $tex->{h}) * 0.5
1149 );
1150
1151 $tex->draw_quad ($self->{ox}, $self->{oy}); 1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1517 } else {
1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1519 }
1152 1520
1153 glDisable GL_TEXTURE_2D; 1521 glDisable GL_TEXTURE_2D;
1154 glDisable GL_BLEND;
1155} 1522}
1156 1523
1157############################################################################# 1524#############################################################################
1158 1525
1159package CFClient::UI::EntryBase; 1526package CFClient::UI::EntryBase;
… …
1164 1531
1165sub new { 1532sub new {
1166 my $class = shift; 1533 my $class = shift;
1167 1534
1168 $class->SUPER::new ( 1535 $class->SUPER::new (
1169 fg => [1, 1, 1], 1536 fg => [1, 1, 1],
1170 bg => [0, 0, 0, 0.2], 1537 bg => [0, 0, 0, 0.2],
1171 active_bg => [1, 1, 1, 0.5], 1538 active_bg => [1, 1, 1, 0.5],
1172 active_fg => [0, 0, 0], 1539 active_fg => [0, 0, 0],
1173 can_hover => 1, 1540 can_hover => 1,
1174 can_focus => 1, 1541 can_focus => 1,
1175 valign => 0, 1542 valign => 0,
1543 can_events => 1,
1544 #text => ...
1176 @_ 1545 @_
1177 ) 1546 )
1178} 1547}
1179 1548
1180sub _set_text { 1549sub _set_text {
… …
1190 $self->{text} = $text; 1559 $self->{text} = $text;
1191 1560
1192 $text =~ s/./*/g if $self->{hidden}; 1561 $text =~ s/./*/g if $self->{hidden};
1193 $self->{layout}->set_text ("$text "); 1562 $self->{layout}->set_text ("$text ");
1194 1563
1195 $self->emit (changed => $self->{text}); 1564 $self->_emit (changed => $self->{text});
1196}
1197
1198sub get_text {
1199 $_[0]{text}
1200}
1201
1202sub size_request {
1203 my ($self) = @_;
1204
1205 my ($w, $h) = $self->SUPER::size_request;
1206
1207 ($w + 1, $h) # add 1 for cursor
1208}
1209
1210sub size_allocate {
1211 my ($self, $w, $h) = @_;
1212
1213 $self->_set_text ($self->{text});
1214} 1565}
1215 1566
1216sub set_text { 1567sub set_text {
1217 my ($self, $text) = @_; 1568 my ($self, $text) = @_;
1218 1569
1219 $self->{cursor} = length $text; 1570 $self->{cursor} = length $text;
1220 $self->_set_text ($text); 1571 $self->_set_text ($text);
1221 $self->update; 1572 $self->update;
1573 $self->check_size;
1574}
1575
1576sub get_text {
1577 $_[0]{text}
1578}
1579
1580sub size_request {
1581 my ($self) = @_;
1582
1583 my ($w, $h) = $self->SUPER::size_request;
1584
1585 ($w + 1, $h) # add 1 for cursor
1222} 1586}
1223 1587
1224sub key_down { 1588sub key_down {
1225 my ($self, $ev) = @_; 1589 my ($self, $ev) = @_;
1226 1590
… …
1228 my $sym = $ev->{sym}; 1592 my $sym = $ev->{sym};
1229 my $uni = $ev->{unicode}; 1593 my $uni = $ev->{unicode};
1230 1594
1231 my $text = $self->get_text; 1595 my $text = $self->get_text;
1232 1596
1233 if ($sym == 8) { 1597 if ($uni == 8) {
1234 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1598 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1235 } elsif ($sym == 127) { 1599 } elsif ($uni == 127) {
1236 substr $text, $self->{cursor}, 1, ""; 1600 substr $text, $self->{cursor}, 1, "";
1237 } elsif ($sym == CFClient::SDLK_LEFT) { 1601 } elsif ($sym == CFClient::SDLK_LEFT) {
1238 --$self->{cursor} if $self->{cursor}; 1602 --$self->{cursor} if $self->{cursor};
1239 } elsif ($sym == CFClient::SDLK_RIGHT) { 1603 } elsif ($sym == CFClient::SDLK_RIGHT) {
1240 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1604 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1241 } elsif ($sym == CFClient::SDLK_HOME) { 1605 } elsif ($sym == CFClient::SDLK_HOME) {
1242 $self->{cursor} = 0; 1606 $self->{cursor} = 0;
1243 } elsif ($sym == CFClient::SDLK_END) { 1607 } elsif ($sym == CFClient::SDLK_END) {
1244 $self->{cursor} = length $text; 1608 $self->{cursor} = length $text;
1245 } elsif ($sym == 27) { 1609 } elsif ($uni == 27) {
1246 $self->emit ('escape'); 1610 $self->_emit ('escape');
1247 } elsif ($uni) { 1611 } elsif ($uni) {
1248 substr $text, $self->{cursor}++, 0, chr $uni; 1612 substr $text, $self->{cursor}++, 0, chr $uni;
1249 } 1613 }
1250 1614
1251 $self->_set_text ($text); 1615 $self->_set_text ($text);
1252 $self->update; 1616 $self->update;
1617 $self->check_size;
1253} 1618}
1254 1619
1255sub focus_in { 1620sub focus_in {
1256 my ($self) = @_; 1621 my ($self) = @_;
1257 1622
… …
1333 my ($self, $ev) = @_; 1698 my ($self, $ev) = @_;
1334 1699
1335 my $sym = $ev->{sym}; 1700 my $sym = $ev->{sym};
1336 1701
1337 if ($sym == 13) { 1702 if ($sym == 13) {
1703 unshift @{$self->{history}},
1704 my $txt = $self->get_text;
1705 $self->{history_pointer} = -1;
1706 $self->{history_saveback} = '';
1338 $self->emit (activate => $self->get_text); 1707 $self->_emit (activate => $txt);
1339 $self->update; 1708 $self->update;
1709
1710 } elsif ($sym == CFClient::SDLK_UP) {
1711 if ($self->{history_pointer} < 0) {
1712 $self->{history_saveback} = $self->get_text;
1713 }
1714 if (@{$self->{history} || []} > 0) {
1715 $self->{history_pointer}++;
1716 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1717 $self->{history_pointer} = @{$self->{history} || []} - 1;
1718 }
1719 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1720 }
1721
1722 } elsif ($sym == CFClient::SDLK_DOWN) {
1723 $self->{history_pointer}--;
1724 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1725
1726 if ($self->{history_pointer} >= 0) {
1727 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1728 } else {
1729 $self->set_text ($self->{history_saveback});
1730 }
1340 1731
1341 } else { 1732 } else {
1342 $self->SUPER::key_down ($ev); 1733 $self->SUPER::key_down ($ev);
1343 } 1734 }
1344 1735
… …
1358 1749
1359sub new { 1750sub new {
1360 my $class = shift; 1751 my $class = shift;
1361 1752
1362 $class->SUPER::new ( 1753 $class->SUPER::new (
1363 padding => 4, 1754 padding => 4,
1364 fg => [1, 1, 1], 1755 fg => [1, 1, 1],
1365 bg => [1, 1, 1, 0.2],
1366 active_fg => [0, 0, 1], 1756 active_fg => [0, 0, 1],
1367 can_hover => 1, 1757 can_hover => 1,
1368 align => 0, 1758 align => 0,
1369 valign => 0, 1759 valign => 0,
1760 can_events => 1,
1370 @_ 1761 @_
1371 ) 1762 )
1372} 1763}
1373 1764
1765sub activate { }
1766
1374sub button_up { 1767sub button_up {
1375 my ($self, $ev, $x, $y) = @_; 1768 my ($self, $ev, $x, $y) = @_;
1376 1769
1770 $self->emit ("activate")
1377 if ($x >= 0 && $x < $self->{w} 1771 if $x >= 0 && $x < $self->{w}
1378 && $y >= 0 && $y < $self->{h}) { 1772 && $y >= 0 && $y < $self->{h};
1379 $self->emit ("activate");
1380 }
1381} 1773}
1382 1774
1383sub _draw { 1775sub _draw {
1384 my ($self) = @_; 1776 my ($self) = @_;
1385 1777
… …
1387 1779
1388 if ($GRAB == $self) { 1780 if ($GRAB == $self) {
1389 $self->{fg} = $self->{active_fg}; 1781 $self->{fg} = $self->{active_fg};
1390 } 1782 }
1391 1783
1392 glEnable GL_BLEND;
1393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1394 glEnable GL_TEXTURE_2D; 1784 glEnable GL_TEXTURE_2D;
1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1396 glColor 0, 0, 0, 1; 1786 glColor 0, 0, 0, 1;
1397 1787
1398 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1788 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1399 1789
1400 glDisable GL_TEXTURE_2D; 1790 glDisable GL_TEXTURE_2D;
1401 glDisable GL_BLEND;
1402 1791
1403 $self->SUPER::_draw; 1792 $self->SUPER::_draw;
1404} 1793}
1405 1794
1406############################################################################# 1795#############################################################################
… …
1420 1809
1421 $class->SUPER::new ( 1810 $class->SUPER::new (
1422 padding => 2, 1811 padding => 2,
1423 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1424 active_fg => [1, 1, 0], 1813 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5],
1425 state => 0, 1816 state => 0,
1426 can_hover => 1, 1817 can_hover => 1,
1427 @_ 1818 @_
1428 ) 1819 )
1429} 1820}
… …
1438 my ($self, $ev, $x, $y) = @_; 1829 my ($self, $ev, $x, $y) = @_;
1439 1830
1440 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1441 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1442 $self->{state} = !$self->{state}; 1833 $self->{state} = !$self->{state};
1443 $self->emit (changed => $self->{state}); 1834 $self->_emit (changed => $self->{state});
1444 } 1835 }
1445} 1836}
1446 1837
1447sub _draw { 1838sub _draw {
1448 my ($self) = @_; 1839 my ($self) = @_;
… …
1453 1844
1454 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1845 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1455 1846
1456 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1457 1848
1458 glEnable GL_BLEND; 1849 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850
1459 glEnable GL_TEXTURE_2D; 1851 glEnable GL_TEXTURE_2D;
1460 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1461
1462 my $tex = $self->{state} ? $tex[1] : $tex[0];
1463
1464 $tex->draw_quad (0, 0, $s, $s); 1852 $tex->draw_quad_alpha (0, 0, $s, $s);
1465
1466 glDisable GL_TEXTURE_2D; 1853 glDisable GL_TEXTURE_2D;
1467 glDisable GL_BLEND;
1468} 1854}
1469 1855
1470############################################################################# 1856#############################################################################
1471 1857
1472package CFClient::UI::Image; 1858package CFClient::UI::Image;
… …
1479our %loaded_images; 1865our %loaded_images;
1480 1866
1481sub new { 1867sub new {
1482 my $class = shift; 1868 my $class = shift;
1483 1869
1484 my $self = $class->SUPER::new (@_); 1870 my $self = $class->SUPER::new (can_events => 0, @_);
1485 1871
1486 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 1872 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1487 1873
1488 $loaded_images{$self->{image}} ||= 1874 $loaded_images{$self->{image}} ||=
1489 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 1875 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1490 1876
1491 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 1877 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1878
1879 Scalar::Util::weaken $loaded_images{$self->{image}};
1492 1880
1493 $self->{aspect} = $tex->{w} / $tex->{h}; 1881 $self->{aspect} = $tex->{w} / $tex->{h};
1494 1882
1495 $self 1883 $self
1496} 1884}
… …
1513 glTranslate 0, -$self->{w}, 0; 1901 glTranslate 0, -$self->{w}, 0;
1514 1902
1515 ($w, $h) = ($h, $w); 1903 ($w, $h) = ($h, $w);
1516 } 1904 }
1517 1905
1518 glEnable GL_BLEND;
1519 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1520 glEnable GL_TEXTURE_2D; 1906 glEnable GL_TEXTURE_2D;
1521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1907 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1522 1908
1523 $tex->draw_quad (0, 0, $w, $h); 1909 $tex->draw_quad_alpha (0, 0, $w, $h);
1524 1910
1525 glDisable GL_BLEND;
1526 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1527} 1912}
1528 1913
1529############################################################################# 1914#############################################################################
1530 1915
1531package CFClient::UI::VGauge; 1916package CFClient::UI::VGauge;
1532 1917
1533our @ISA = CFClient::UI::Base::; 1918our @ISA = CFClient::UI::Base::;
1919
1920use List::Util qw(min max);
1534 1921
1535use CFClient::OpenGL; 1922use CFClient::OpenGL;
1536 1923
1537my %tex = ( 1924my %tex = (
1538 food => [ 1925 food => [
1539 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1926 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1540 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1927 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1541 ], 1928 ],
1542 grace => [ 1929 grace => [
1543 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1930 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1544 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1931 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1545 ], 1932 ],
1546 hp => [ 1933 hp => [
1547 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1934 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1548 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1935 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1549 ], 1936 ],
1550 mana => [ 1937 mana => [
1551 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1938 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1552 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1939 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1553 ], 1940 ],
1554); 1941);
1555 1942
1556# eg. VGauge->new (gauge => 'food'), default gauge: food 1943# eg. VGauge->new (gauge => 'food'), default gauge: food
1557sub new { 1944sub new {
… …
1576} 1963}
1577 1964
1578sub set_max { 1965sub set_max {
1579 my ($self, $max) = @_; 1966 my ($self, $max) = @_;
1580 1967
1968 return if $self->{max_val} == $max;
1969
1581 $self->{max_val} = $max; 1970 $self->{max_val} = $max;
1971 $self->update;
1582} 1972}
1583 1973
1584sub set_value { 1974sub set_value {
1585 my ($self, $val, $max) = @_; 1975 my ($self, $val, $max) = @_;
1586 1976
1587 $self->set_max ($max) 1977 $self->set_max ($max)
1588 if defined $max; 1978 if defined $max;
1589 1979
1590 $max = $self->{max_val}; 1980 return if $self->{val} == $val;
1981
1591 $self->{val} = $val; 1982 $self->{val} = $val;
1592
1593 $self->update; 1983 $self->update;
1594} 1984}
1595 1985
1596sub _draw { 1986sub _draw {
1597 my ($self) = @_; 1987 my ($self) = @_;
1598 1988
1599 my $tex = $tex{$self->{type}}; 1989 my $tex = $tex{$self->{type}};
1990 my ($t1, $t2, $t3) = @$tex;
1600 1991
1601 my ($w, $h) = ($self->{w}, $self->{h}); 1992 my ($w, $h) = ($self->{w}, $self->{h});
1602 1993
1603 if ($self->{vertical}) { 1994 if ($self->{vertical}) {
1604 glRotate 90, 0, 0, 1; 1995 glRotate 90, 0, 0, 1;
… …
1606 1997
1607 ($w, $h) = ($h, $w); 1998 ($w, $h) = ($h, $w);
1608 } 1999 }
1609 2000
1610 my $ycut = $self->{val} / ($self->{max_val} || 1); 2001 my $ycut = $self->{val} / ($self->{max_val} || 1);
1611 $ycut = 1 if $self->{val} > $self->{max_val};
1612 2002
1613 my $t1 = $tex->[0]; 2003 my $ycut1 = max 0, min 1, $ycut;
1614 my $t2 = $tex->[1]; 2004 my $ycut2 = max 0, min 1, $ycut - 1;
2005
2006 my $h1 = $self->{h} * (1 - $ycut1);
2007 my $h2 = $self->{h} * (1 - $ycut2);
1615 2008
1616 glEnable GL_BLEND; 2009 glEnable GL_BLEND;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618 glEnable GL_TEXTURE_2D; 2011 glEnable GL_TEXTURE_2D;
1619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1620 2013
1621 my $h1 = $self->{h} - $ycut * $self->{h};
1622 my $h2 = $ycut * $self->{h};
1623
1624 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2014 glBindTexture GL_TEXTURE_2D, $t1->{name};
1625 glBegin GL_QUADS; 2015 glBegin GL_QUADS;
1626 glTexCoord 0 , 0; glVertex 0 , 0; 2016 glTexCoord 0 , 0; glVertex 0 , 0;
1627 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2017 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1628 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2018 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1629 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2019 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1630 glEnd; 2020 glEnd;
1631 2021
2022 my $ycut1 = List::Util::min 1, $ycut;
1632 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2023 glBindTexture GL_TEXTURE_2D, $t2->{name};
1633 glBegin GL_QUADS; 2024 glBegin GL_QUADS;
1634 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2025 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1635 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2026 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1636 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2027 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1637 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2028 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1638 glEnd; 2029 glEnd;
2030
2031 if ($t3) {
2032 glBindTexture GL_TEXTURE_2D, $t3->{name};
2033 glBegin GL_QUADS;
2034 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2035 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2036 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2037 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2038 glEnd;
2039 }
1639 2040
1640 glDisable GL_BLEND; 2041 glDisable GL_BLEND;
1641 glDisable GL_TEXTURE_2D; 2042 glDisable GL_TEXTURE_2D;
1642} 2043}
1643 2044
… …
1646package CFClient::UI::Gauge; 2047package CFClient::UI::Gauge;
1647 2048
1648our @ISA = CFClient::UI::VBox::; 2049our @ISA = CFClient::UI::VBox::;
1649 2050
1650sub new { 2051sub new {
1651 my ($class, %arg) = shift; 2052 my ($class, %arg) = @_;
1652 2053
1653 my $self = $class->SUPER::new ( 2054 my $self = $class->SUPER::new (
1654 @_, 2055 tooltip => $arg{type},
2056 can_hover => 1,
2057 can_events => 1,
2058 %arg,
1655 ); 2059 );
1656 2060
1657 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2061 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1658 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2062 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1659 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2063 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1660 2064
1661 $self 2065 $self
1662} 2066}
1663 2067
1664sub set_fontsize { 2068sub set_fontsize {
1665 my ($self, $fsize) = @_; 2069 my ($self, $fsize) = @_;
1666 2070
1667 $self->{value}->set_fontsize ($fsize); 2071 $self->{value}->set_fontsize ($fsize);
1668 $self->{max} ->set_fontsize ($fsize); 2072 $self->{max} ->set_fontsize ($fsize);
1669 $self->update; 2073}
2074
2075sub set_max {
2076 my ($self, $max) = @_;
2077
2078 $self->{gauge}->set_max ($max);
2079 $self->{max}->set_text ($max);
1670} 2080}
1671 2081
1672sub set_value { 2082sub set_value {
1673 my ($self, $val, $max) = @_; 2083 my ($self, $val, $max) = @_;
1674 2084
1675 $self->set_max ($max) 2085 $self->set_max ($max)
1676 if defined $max; 2086 if defined $max;
1677 2087
1678 $self->{gauge}->set_value ($val, $max); 2088 $self->{gauge}->set_value ($val, $max);
1679 $self->{value}->set_text ($val); 2089 $self->{value}->set_text ($val);
1680}
1681
1682sub set_max {
1683 my ($self, $max) = @_;
1684
1685 $self->{gauge}->set_max ($max);
1686 $self->{max}->set_text ($max);
1687} 2090}
1688 2091
1689############################################################################# 2092#############################################################################
1690 2093
1691package CFClient::UI::Slider; 2094package CFClient::UI::Slider;
… …
1701 qw(s1_slider.png s1_slider_bg.png); 2104 qw(s1_slider.png s1_slider_bg.png);
1702 2105
1703sub new { 2106sub new {
1704 my $class = shift; 2107 my $class = shift;
1705 2108
1706 # range [value, low, high, page] 2109 # range [value, low, high, page, unit]
1707 2110
1708 # TODO: 0-width page 2111 # TODO: 0-width page
1709 # TODO: req_w/h are wrong with vertical 2112 # TODO: req_w/h are wrong with vertical
1710 # TODO: calculations are off 2113 # TODO: calculations are off
1711 my $self = $class->SUPER::new ( 2114 my $self = $class->SUPER::new (
1712 fg => [1, 1, 1], 2115 fg => [1, 1, 1],
1713 active_fg => [0, 0, 0], 2116 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5],
1714 range => [0, 0, 100, 10], 2119 range => [0, 0, 100, 10, 0],
1715 req_w => 20, 2120 req_w => $::WIDTH / 80,
1716 req_h => 20, 2121 req_h => $::WIDTH / 80,
1717 vertical => 0, 2122 vertical => 0,
1718 can_hover => 1, 2123 can_hover => 1,
1719 inner_pad => 5, 2124 inner_pad => 0.02,
1720 @_ 2125 @_
1721 ); 2126 );
1722 2127
2128 $self->set_value ($self->{range}[0]);
2129 $self->update;
2130
1723 $self 2131 $self
2132}
2133
2134sub set_range {
2135 my ($self, $range) = @_;
2136
2137 $self->{range} = $range;
2138
2139 $self->update;
2140}
2141
2142sub set_value {
2143 my ($self, $value) = @_;
2144
2145 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2146
2147 $hi = $lo + 1 if $hi <= $lo;
2148
2149 $page = $hi - $lo if $page > $hi - $lo;
2150
2151 $value = $lo if $value < $lo;
2152 $value = $hi - $page if $value > $hi - $page;
2153
2154 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2155 if $unit;
2156
2157 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2158
2159 if ($value != $old_value) {
2160 $self->_emit (changed => $value);
2161 $self->update;
2162 }
1724} 2163}
1725 2164
1726sub size_request { 2165sub size_request {
1727 my ($self) = @_; 2166 my ($self) = @_;
1728 2167
… …
1734 2173
1735sub button_down { 2174sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 2175 my ($self, $ev, $x, $y) = @_;
1737 2176
1738 $self->SUPER::button_down ($ev, $x, $y); 2177 $self->SUPER::button_down ($ev, $x, $y);
2178
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180
1739 $self->mouse_motion ($ev, $x, $y); 2181 $self->mouse_motion ($ev, $x, $y);
1740} 2182}
1741 2183
1742sub mouse_motion { 2184sub mouse_motion {
1743 my ($self, $ev, $x, $y) = @_; 2185 my ($self, $ev, $x, $y) = @_;
1744 2186
1745 if ($GRAB == $self) { 2187 if ($GRAB == $self) {
2188 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2189
2190 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193
2194 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2195 }
2196}
2197
2198sub update {
2199 my ($self) = @_;
2200
2201 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2202 $self->set_value ($self->{range}[0]);
2203
1746 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2204 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100;
1747 2206
1748 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2207 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1749 2208
1750 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2209 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1751 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2210 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1752 2211
1753 $x -= $inner_pad_px; # substract the padding 2212 $value = ($value - $lo) / $range;
1754 $x = $x * ($hi - $lo) / $inner_w + $lo; 2213 $value = $value * $self->{scale} + $self->{offset};
1755 $x = $lo if $x < $lo;
1756 $x = $hi - $page if $x > $hi - $page;
1757 $self->{range}[0] = $x;
1758 2214
1759 $self->emit (changed => $x); 2215 $self->{knob_x} = $value - $knob_w * 0.5;
1760 $self->update; 2216 $self->{knob_w} = $knob_w;
1761 } 2217 });
1762}
1763 2218
1764# the inner_* stuff is for generating a padding for the slider handle, 2219 $self->SUPER::update;
1765# so that the handle doesn't leave the texture. This calculation isn't 100%
1766# correct propably, but it does the job for now
1767sub _calc_inner_pad_px {
1768 my ($self, $w) = @_;
1769 ($w / 100) * $self->{inner_pad} # % to pixels
1770} 2220}
1771 2221
1772sub _draw { 2222sub _draw {
1773 my ($self) = @_; 2223 my ($self) = @_;
1774 2224
1775 $self->SUPER::_draw (); 2225 $self->SUPER::_draw ();
1776 2226
1777 my ($w, $h) = @$self{qw(w h)}; 2227 glScale $self->{w}, $self->{h};
1778 2228
1779 if ($self->{vertical}) { 2229 if ($self->{vertical}) {
1780 # draw a vertical slider like a rotated horizontal slider 2230 # draw a vertical slider like a rotated horizontal slider
1781 2231
2232 glTranslate 1, 0, 0;
1782 glRotate 90, 0, 0, 1; 2233 glRotate 90, 0, 0, 1;
1783 glTranslate 0, -$self->{w}, 0;
1784
1785 ($w, $h) = ($h, $w);
1786 } 2234 }
1787 2235
1788 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2236 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1789 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2237 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1790 2238
1791 my ($value, $lo, $hi, $page) = @{$self->{range}};
1792
1793 $hi = $value + 1 if $lo == $hi;
1794
1795 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1796 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1797
1798 $page = int $page * $inner_w / ($hi - $lo);
1799 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1800
1801 $w -= $page;
1802 $page &= ~1;
1803 glTranslate $page * 0.5, 0, 0;
1804 $page ||= 2;
1805
1806 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1807 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1808
1809 glEnable GL_BLEND;
1810 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1811 glEnable GL_TEXTURE_2D; 2239 glEnable GL_TEXTURE_2D;
1812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2240 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1813 2241
1814 # draw background 2242 # draw background
1815 $tex[1]->draw_quad (0, 0, $w, $h); 2243 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1816 2244
1817 # draw handle 2245 # draw handle
1818 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2246 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1819 2247
1820 glDisable GL_BLEND;
1821 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
1822} 2249}
2250
2251#############################################################################
2252
2253package CFClient::UI::ValSlider;
2254
2255our @ISA = CFClient::UI::HBox::;
2256
2257sub new {
2258 my ($class, %arg) = @_;
2259
2260 my $range = delete $arg{range};
2261
2262 my $self = $class->SUPER::new (
2263 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2264 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2265 to_value => sub { shift },
2266 from_value => sub { shift },
2267 %arg,
2268 );
2269
2270 $self->{slider}->connect (changed => sub {
2271 my ($self, $value) = @_;
2272 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2273 $self->{parent}->emit (changed => $value);
2274 });
2275
2276# $self->{entry}->connect (changed => sub {
2277# my ($self, $value) = @_;
2278# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2279# $self->{parent}->emit (changed => $value);
2280# });
2281
2282 $self->add ($self->{slider}, $self->{entry});
2283
2284 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2285
2286 $self
2287}
2288
2289sub set_range { shift->{slider}->set_range (@_) }
2290sub set_value { shift->{slider}->set_value (@_) }
1823 2291
1824############################################################################# 2292#############################################################################
1825 2293
1826package CFClient::UI::TextView; 2294package CFClient::UI::TextView;
1827 2295
… …
1831 2299
1832sub new { 2300sub new {
1833 my $class = shift; 2301 my $class = shift;
1834 2302
1835 my $self = $class->SUPER::new ( 2303 my $self = $class->SUPER::new (
1836 fontsize => 1, 2304 fontsize => 1,
2305 can_events => 0,
2306 #font => default_font
1837 @_, 2307 @_,
1838 2308
1839 layout => (new CFClient::Layout), 2309 layout => (new CFClient::Layout 1),
1840 par => [], 2310 par => [],
1841 height => 0, 2311 height => 0,
1842 children => [ 2312 children => [
1843 (new CFClient::UI::Empty expand => 1), 2313 (new CFClient::UI::Empty expand => 1),
1844 (new CFClient::UI::Slider vertical => 1), 2314 (new CFClient::UI::Slider vertical => 1),
1845 ], 2315 ],
1846 ); 2316 );
1847 2317
1848 $self->{children}[1]->connect (changed => sub { 2318 $self->{children}[1]->connect (changed => sub { $self->update });
1849 $self->update;
1850 });
1851 2319
1852 $self 2320 $self
1853} 2321}
1854 2322
1855sub set_fontsize { 2323sub set_fontsize {
… …
1857 2325
1858 $self->{fontsize} = $fontsize; 2326 $self->{fontsize} = $fontsize;
1859 $self->reflow; 2327 $self->reflow;
1860} 2328}
1861 2329
2330sub size_allocate {
2331 my ($self, $w, $h) = @_;
2332
2333 $self->SUPER::size_allocate ($w, $h);
2334
2335 $self->{layout}->set_font ($self->{font}) if $self->{font};
2336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337 $self->{layout}->set_width ($self->{children}[0]{w});
2338
2339 $self->reflow;
2340}
2341
1862sub text_height { 2342sub text_size {
1863 my ($self, $text) = @_; 2343 my ($self, $text, $indent) = @_;
1864 2344
1865 my $layout = $self->{layout}; 2345 my $layout = $self->{layout};
1866 2346
1867 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2347 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1868 $layout->set_width ($self->{w}); 2348 $layout->set_width ($self->{children}[0]{w} - $indent);
1869 $layout->set_text ($text); 2349 $layout->set_markup ($text);
1870 2350
1871 ($layout->size)[1] 2351 $layout->size
1872} 2352}
1873 2353
1874sub reflow { 2354sub reflow {
1875 my ($self) = @_; 2355 my ($self) = @_;
1876 2356
1877 $self->{need_reflow}++; 2357 $self->{need_reflow}++;
1878 $self->update; 2358 $self->update;
1879} 2359}
1880 2360
1881sub size_allocate { 2361sub set_offset {
2362 my ($self, $offset) = @_;
2363
2364 # todo: base offset on lines or so, not on pixels
2365 $self->{children}[1]->set_value ($offset);
2366}
2367
2368sub clear {
1882 my ($self, $w, $h) = @_; 2369 my ($self) = @_;
1883 2370
1884 $self->SUPER::size_allocate ($w, $h); 2371 $self->{par} = [];
1885 2372 $self->{height} = 0;
1886 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2373 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1887 $self->{layout}->set_width ($self->{children}[0]{w});
1888
1889 $self->reflow;
1890} 2374}
1891 2375
1892sub add_paragraph { 2376sub add_paragraph {
1893 my ($self, $color, $text) = @_; 2377 my ($self, $color, $text, $indent) = @_;
1894 2378
1895 #TODO: intelligently "reformat" paragraph 2379 for my $line (split /\n/, $text) {
1896 2380 my ($w, $h) = $self->text_size ($line);
1897 my $height = $self->text_height ($text);
1898
1899 $self->{height} += $height; 2381 $self->{height} += $h;
2382 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2383 }
1900 2384
1901 push @{$self->{par}}, [$height, $color, $text];
1902
1903 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2385 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1904 $self->{children}[1]->update;
1905} 2386}
1906 2387
1907sub update { 2388sub update {
1908 my ($self) = @_; 2389 my ($self) = @_;
1909 2390
… …
1911 2392
1912 return unless $self->{h} > 0; 2393 return unless $self->{h} > 0;
1913 2394
1914 delete $self->{texture}; 2395 delete $self->{texture};
1915 2396
1916 $ROOT->on_refresh ($self, sub { 2397 $ROOT->on_post_alloc ($self, sub {
2398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399
1917 if (delete $self->{need_reflow}) { 2400 if (delete $self->{need_reflow}) {
1918 my $height = 0; 2401 my $height = 0;
1919 2402
1920 $height += $_->[0] = $self->text_height ($_->[2]) 2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406
1921 for @{$self->{par}}; 2407 for (@{$self->{par}}) {
2408 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2409 $layout->set_width ($W - $_->[3]);
2410 $layout->set_markup ($_->[4]);
2411 my ($w, $h) = $layout->size;
2412 $_->[0] = $w + $_->[3];
2413 $_->[1] = $h;
2414 }
2415
2416 $height += $_->[1];
2417 }
1922 2418
1923 $self->{height} = $height; 2419 $self->{height} = $height;
1924 2420
1925 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2421 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1926 2422
1927 delete $self->{texture}; 2423 delete $self->{texture};
1928 } 2424 }
1929 2425
1930 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1931 glClearColor 0, 0, 0, 1; 2427 glClearColor 0.5, 0.5, 0.5, 0;
1932 glClear GL_COLOR_BUFFER_BIT; 2428 glClear GL_COLOR_BUFFER_BIT;
1933 2429
2430 my $top = int $self->{children}[1]{range}[0];
2431
2432 my $y0 = $top;
2433 my $y1 = $top + $H;
2434
2435 my $y = 0;
2436
2437 my $layout = $self->{layout};
2438
2439 $layout->set_font ($self->{font}) if $self->{font};
2440
1934 glEnable GL_BLEND; 2441 glEnable GL_BLEND;
2442 #TODO# not correct in windows where rgba is forced off
1935 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2443 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1936 glEnable GL_TEXTURE_2D;
1937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1938
1939 my $top = int $self->{children}[1]{range}[0];
1940
1941 my $y0 = $top;
1942 my $y1 = $top + $self->{h};
1943
1944 my $y = 0;
1945
1946 my $layout = $self->{layout};
1947 2444
1948 for my $par (@{$self->{par}}) { 2445 for my $par (@{$self->{par}}) {
1949 my $h = $par->[0]; 2446 my $h = $par->[1];
1950 2447
1951 if ($y0 < $y + $h && $y < $y1) { 2448 if ($y0 < $y + $h && $y < $y1) {
2449 $layout->set_foreground (@{ $par->[2] });
2450 $layout->set_width ($W - $par->[3]);
1952 $layout->set_text ($par->[2]); 2451 $layout->set_markup ($par->[4]);
1953 2452
1954 glColor @{ $par->[1] }; 2453 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1955 my ($W, $H) = $layout->size; 2454
1956 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2455 glRasterPos $par->[3], $y - $y0;
2456 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
1957 } 2457 }
1958 2458
1959 $y += $h; 2459 $y += $h;
1960 } 2460 }
1961 2461
1962 glDisable GL_TEXTURE_2D;
1963 glDisable GL_BLEND; 2462 glDisable GL_BLEND;
1964 }; 2463 };
1965 }); 2464 });
1966} 2465}
1967 2466
1968sub _draw { 2467sub _draw {
1969 my ($self) = @_; 2468 my ($self) = @_;
1970 2469
1971 if ($self->{texture}) {
1972 glEnable GL_TEXTURE_2D; 2470 glEnable GL_TEXTURE_2D;
1973 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 1, 1, 1, 1;
1974 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2473 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1975 glDisable GL_TEXTURE_2D; 2474 glDisable GL_TEXTURE_2D;
1976 }
1977 2475
1978 $self->{children}[1]->draw; 2476 $self->{children}[1]->draw;
1979 2477
1980} 2478}
1981 2479
… …
2029 2527
2030sub new { 2528sub new {
2031 my $class = shift; 2529 my $class = shift;
2032 2530
2033 my $self = $class->SUPER::new ( 2531 my $self = $class->SUPER::new (
2034 state => 0, 2532 state => 0,
2035 connect_activate => \&toggle_flopper, 2533 connect_activate => \&toggle_flopper,
2036 @_ 2534 @_
2037 ); 2535 );
2038 2536
2039 if ($self->{state}) { 2537 if ($self->{state}) {
… …
2049 2547
2050 # TODO: use animation 2548 # TODO: use animation
2051 if ($self->{state} = !$self->{state}) { 2549 if ($self->{state} = !$self->{state}) {
2052 $CFClient::UI::ROOT->add ($self->{other}); 2550 $CFClient::UI::ROOT->add ($self->{other});
2053 $self->{other}->move ($self->coord2global (0, $self->{h})); 2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2054 $self->emit ("open"); 2552 $self->_emit ("open");
2055 } else { 2553 } else {
2056 $CFClient::UI::ROOT->remove ($self->{other}); 2554 $CFClient::UI::ROOT->remove ($self->{other});
2057 $self->emit ("close"); 2555 $self->_emit ("close");
2058 } 2556 }
2059 2557
2060 $self->emit (changed => $self->{state}); 2558 $self->_emit (changed => $self->{state});
2061} 2559}
2062 2560
2063############################################################################# 2561#############################################################################
2064 2562
2563package CFClient::UI::Tooltip;
2564
2565our @ISA = CFClient::UI::Bin::;
2566
2567use CFClient::OpenGL;
2568
2569sub new {
2570 my $class = shift;
2571
2572 $class->SUPER::new (
2573 @_,
2574 can_events => 0,
2575 )
2576}
2577
2578sub set_tooltip_from {
2579 my ($self, $widget) = @_;
2580
2581 $self->add (new CFClient::UI::Label
2582 markup => $widget->{tooltip},
2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8,
2585 fg => [0, 0, 0, 1],
2586 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP),
2588 );
2589}
2590
2591sub size_request {
2592 my ($self) = @_;
2593
2594 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2595
2596 ($w + 4, $h + 4)
2597}
2598
2599sub size_allocate {
2600 my ($self, $w, $h) = @_;
2601
2602 $self->SUPER::size_allocate ($w - 4, $h - 4);
2603}
2604
2605sub _draw {
2606 my ($self) = @_;
2607
2608 glTranslate 0.375, 0.375;
2609
2610 my ($w, $h) = @$self{qw(w h)};
2611
2612 glColor 1, 0.8, 0.4;
2613 glBegin GL_QUADS;
2614 glVertex 0 , 0;
2615 glVertex 0 , $h;
2616 glVertex $w, $h;
2617 glVertex $w, 0;
2618 glEnd;
2619
2620 glColor 0, 0, 0;
2621 glBegin GL_LINE_LOOP;
2622 glVertex 0 , 0;
2623 glVertex 0 , $h;
2624 glVertex $w, $h;
2625 glVertex $w, 0;
2626 glEnd;
2627
2628 glTranslate 2 - 0.375, 2 - 0.375;
2629 $self->SUPER::_draw;
2630}
2631
2632#############################################################################
2633
2634package CFClient::UI::Face;
2635
2636our @ISA = CFClient::UI::Base::;
2637
2638use CFClient::OpenGL;
2639
2640sub new {
2641 my $class = shift;
2642
2643 my $self = $class->SUPER::new (
2644 aspect => 1,
2645 can_events => 0,
2646 @_,
2647 );
2648
2649 if ($self->{anim} && $self->{animspeed}) {
2650 Scalar::Util::weaken (my $widget = $self);
2651
2652 $self->{timer} = Event->timer (
2653 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2654 hard => 1,
2655 interval => $self->{animspeed},
2656 cb => sub {
2657 ++$widget->{frame};
2658 $widget->update;
2659 },
2660 );
2661 }
2662
2663 $self
2664}
2665
2666sub size_request {
2667 (32, 8)
2668}
2669
2670sub update {
2671 my ($self) = @_;
2672
2673 return unless $self->{visible};
2674
2675 $self->SUPER::update;
2676}
2677
2678sub _draw {
2679 my ($self) = @_;
2680
2681 return unless $::CONN;
2682
2683 my $face;
2684
2685 if ($self->{frame}) {
2686 my $anim = $::CONN->{anim}[$self->{anim}];
2687
2688 $face = $anim->[ $self->{frame} % @$anim ]
2689 if $anim && @$anim;
2690 }
2691
2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2693
2694 if ($tex) {
2695 glEnable GL_TEXTURE_2D;
2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2697 glColor 1, 1, 1, 1;
2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2699 glDisable GL_TEXTURE_2D;
2700 }
2701}
2702
2703sub DESTROY {
2704 my ($self) = @_;
2705
2706 $self->{timer}->cancel
2707 if $self->{timer};
2708
2709 $self->SUPER::DESTROY;
2710}
2711
2712#############################################################################
2713
2714package CFClient::UI::InventoryItem;
2715
2716our @ISA = CFClient::UI::HBox::;
2717
2718sub new {
2719 my $class = shift;
2720
2721 my %args = @_;
2722
2723 my $item = delete $args{item};
2724
2725 my $desc = CFClient::Item::desc_string $item;
2726
2727 my $self = $class->SUPER::new (
2728 can_hover => 1,
2729 can_events => 1,
2730 tooltip => ((CFClient::UI::Label::escape $desc)
2731 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732 connect_button_down => sub {
2733 my ($self, $ev, $x, $y) = @_;
2734
2735 # todo: maybe put examine on 1? but should just be a tooltip :(
2736 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737 my $targ = $::CONN->{player}{tag};
2738
2739 if ($item->{container} == $::CONN->{player}{tag}) {
2740 $targ = $main::OPENCONT;
2741 }
2742
2743 $::CONN->send ("move $targ $item->{tag} 0");
2744 } elsif ($ev->{button} == 1) {
2745 $::CONN->send ("examine $item->{tag}");
2746 } elsif ($ev->{button} == 2) {
2747 $::CONN->send ("apply $item->{tag}");
2748 } elsif ($ev->{button} == 3) {
2749 my @menu_items = (
2750 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753 (
2754 $item->{flags} & Crossfire::Protocol::F_LOCKED
2755 ? (
2756 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757 )
2758 : (
2759 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761 )
2762 ),
2763 );
2764
2765 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766 }
2767
2768 1
2769 },
2770 %args
2771 );
2772
2773
2774 $self->add (new CFClient::UI::Face
2775 can_events => 0,
2776 face => $item->{face},
2777 anim => $item->{anim},
2778 animspeed => $item->{animspeed},
2779 );
2780
2781 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783 $self->{item} = $item;
2784
2785 $self->update_item;
2786
2787 $self
2788}
2789
2790sub update_item {
2791 my ($self) = @_;
2792
2793 my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795 $self->{name_lbl}->set_text ($desc);
2796}
2797
2798#############################################################################
2799
2800package CFClient::UI::Inventory;
2801
2802our @ISA = CFClient::UI::ScrolledWindow::;
2803
2804sub new {
2805 my $class = shift;
2806
2807 my $self = $class->SUPER::new (
2808 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2809 @_,
2810 );
2811
2812 $self
2813}
2814
2815sub set_items {
2816 my ($self, $items) = @_;
2817
2818 $self->{scrolled}->clear;
2819 return unless $items;
2820
2821 my @items = sort {
2822 ($a->{type} <=> $b->{type})
2823 or ($a->{name} cmp $b->{name})
2824 } @$items;
2825
2826 $self->{real_items} = \@items;
2827
2828 my $row = 0;
2829 for my $item (@items) {
2830 CFClient::Item::update_widgets $item;
2831
2832 $self->{scrolled}->add (0, $row, $item->{face_widget});
2833 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2834 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2835
2836 $row++;
2837 }
2838
2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840}
2841
2842sub size_request {
2843 my ($self) = @_;
2844 ($self->{req_w}, $self->{req_h});
2845}
2846
2847#############################################################################
2848
2849package CFClient::UI::Menu;
2850
2851our @ISA = CFClient::UI::FancyFrame::;
2852
2853use CFClient::OpenGL;
2854
2855sub new {
2856 my $class = shift;
2857
2858 my $self = $class->SUPER::new (
2859 items => [],
2860 z => 100,
2861 @_,
2862 );
2863
2864 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2865
2866 for my $item (@{ $self->{items} }) {
2867 my ($widget, $cb) = @$item;
2868
2869 # handle various types of items, only text for now
2870 if (!ref $widget) {
2871 $widget = new CFClient::UI::Label
2872 can_hover => 1,
2873 can_events => 1,
2874 text => $widget;
2875 }
2876
2877 $self->{item}{$widget} = $item;
2878
2879 $self->{vbox}->add ($widget);
2880 }
2881
2882 $self
2883}
2884
2885# popup given the event (must be a mouse button down event currently)
2886sub popup {
2887 my ($self, $ev) = @_;
2888
2889 $self->_emit ("popdown");
2890
2891 # maybe save $GRAB? must be careful about events...
2892 $GRAB = $self;
2893 $self->{button} = $ev->{button};
2894
2895 $self->show;
2896 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2897}
2898
2899sub mouse_motion {
2900 my ($self, $ev, $x, $y) = @_;
2901
2902 # TODO: should use vbox->find_widget or so
2903 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2904 $self->{hover} = $self->{item}{$HOVER};
2905}
2906
2907sub button_up {
2908 my ($self, $ev, $x, $y) = @_;
2909
2910 if ($ev->{button} == $self->{button}) {
2911 undef $GRAB;
2912 $self->hide;
2913
2914 $self->_emit ("popdown");
2915 $self->{hover}[1]->() if $self->{hover};
2916 }
2917}
2918
2919#############################################################################
2920
2921package CFClient::UI::Statusbox;
2922
2923our @ISA = CFClient::UI::VBox::;
2924
2925sub new {
2926 my $class = shift;
2927
2928 $class->SUPER::new (
2929 fontsize => 0.8,
2930 @_,
2931 )
2932}
2933
2934sub reorder {
2935 my ($self) = @_;
2936 my $NOW = time;
2937
2938 while (my ($k, $v) = each %{ $self->{item} }) {
2939 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2940 }
2941
2942 my @widgets;
2943
2944 my @items = sort {
2945 $a->{pri} <=> $b->{pri}
2946 or $b->{id} <=> $a->{id}
2947 } values %{ $self->{item} };
2948
2949 my $count = 10 + 1;
2950 for my $item (@items) {
2951 last unless --$count;
2952
2953 push @widgets, $item->{label} ||= do {
2954 # TODO: doesn't handle markup well (read as: at all)
2955 my $short = $item->{count} > 1
2956 ? "<b>$item->{count} ×</b> $item->{text}"
2957 : $item->{text};
2958
2959 for ($short) {
2960 s/^\s+//;
2961 s/\s+/ /g;
2962 }
2963
2964 new CFClient::UI::Label
2965 markup => $short,
2966 tooltip => $item->{tooltip},
2967 tooltip_font => $::FONT_PROP,
2968 tooltip_width => 0.67,
2969 fontsize => $item->{fontsize} || $self->{fontsize},
2970 max_w => $::WIDTH * 0.44,
2971 fg => $item->{fg},
2972 can_events => 1,
2973 can_hover => 1
2974 };
2975 }
2976
2977 $self->clear;
2978 $self->SUPER::add (reverse @widgets);
2979}
2980
2981sub add {
2982 my ($self, $text, %arg) = @_;
2983
2984 $text =~ s/^\s+//;
2985 $text =~ s/\s+$//;
2986
2987 return unless $text;
2988
2989 my $timeout = time + ((delete $arg{timeout}) || 60);
2990
2991 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2992
2993 if (my $item = $self->{item}{$group}) {
2994 if ($item->{text} eq $text) {
2995 $item->{count}++;
2996 } else {
2997 $item->{count} = 1;
2998 $item->{text} = $item->{tooltip} = $text;
2999 }
3000 $item->{id} = ++$self->{id};
3001 $item->{timeout} = $timeout;
3002 delete $item->{label};
3003 } else {
3004 $self->{item}{$group} = {
3005 id => ++$self->{id},
3006 text => $text,
3007 timeout => $timeout,
3008 tooltip => $text,
3009 fg => [0.8, 0.8, 0.8, 0.8],
3010 pri => 0,
3011 count => 1,
3012 %arg,
3013 };
3014 }
3015
3016 $self->reorder;
3017}
3018
3019sub reconfigure {
3020 my ($self) = @_;
3021
3022 delete $_->{label}
3023 for values %{ $self->{item} || {} };
3024
3025 $self->reorder;
3026 $self->SUPER::reconfigure;
3027}
3028
3029#############################################################################
3030
2065package CFClient::UI::Root; 3031package CFClient::UI::Root;
2066 3032
2067our @ISA = CFClient::UI::Container::; 3033our @ISA = CFClient::UI::Container::;
2068 3034
2069use CFClient::OpenGL; 3035use CFClient::OpenGL;
2070 3036
2071sub check_size { 3037sub new {
2072 my ($self) = @_; 3038 my $class = shift;
2073 3039
2074 $self->configure (0, 0, $::WITH, $::HEIGHT); 3040 $class->SUPER::new (
2075} 3041 @_,
2076 3042 )
2077sub size_request {
2078 ($::WIDTH, $::HEIGHT)
2079} 3043}
2080 3044
2081sub configure { 3045sub configure {
2082 my ($self, $x, $y, $w, $h) = @_; 3046 my ($self, $x, $y, $w, $h) = @_;
2083 3047
2084 $self->SUPER::configure ($x, $y, $w, $h); 3048 $self->{w} = $w;
2085 3049 $self->{h} = $h;
2086 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2087 for @{$self->{children}};
2088} 3050}
2089 3051
2090sub _topleft { 3052sub check_size {
3053 my ($self) = @_;
3054
3055 $self->size_allocate ($self->{w}, $self->{h})
3056 if $self->{w};
3057}
3058
3059sub size_request {
3060 my ($self) = @_;
3061
3062 ($self->{w}, $self->{h})
3063}
3064
3065sub size_allocate {
3066 my ($self, $w, $h) = @_;
3067
3068 for my $child ($self->children) {
3069 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3070
3071 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3072 if exists $child->{req_x};
3073
3074 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3075 if exists $child->{req_y};
3076
3077 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3078 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079
3080 $child->configure ($X, $Y, $W, $H);
3081 }
3082}
3083
3084sub coord2local {
2091 my ($self, $x, $y) = @_; 3085 my ($self, $x, $y) = @_;
2092 3086
2093 ($x, $y) 3087 ($x, $y)
2094} 3088}
2095 3089
3090sub coord2global {
3091 my ($self, $x, $y) = @_;
3092
3093 ($x, $y)
3094}
3095
2096sub update { 3096sub update {
2097 my ($self) = @_; 3097 my ($self) = @_;
2098 3098
2099 $self->check_size; 3099 $self->check_size;
2100 ::refresh (); 3100 $::WANT_REFRESH++;
2101} 3101}
2102 3102
2103sub add { 3103sub add {
2104 my ($self, $child) = @_; 3104 my ($self, @children) = @_;
2105 3105
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111
3112 for my $child (@children) {
3113 $child->{is_toplevel} = 1;
3114
2106 # integerize window positions 3115 # integerise window positions
2107 $child->{x} = int $child->{x}; 3116 $child->{x} = int $child->{x};
2108 $child->{y} = int $child->{y}; 3117 $child->{y} = int $child->{y};
3118 }
2109 3119
2110 $self->SUPER::add ($child); 3120 $self->SUPER::add (@children);
3121}
3122
3123sub remove {
3124 my ($self, @children) = @_;
3125
3126 $self->SUPER::remove (@children);
3127
3128 while (@children) {
3129 my $w = pop @children;
3130 push @children, $w->children;
3131 $w->set_invisible;
3132 }
2111} 3133}
2112 3134
2113sub on_refresh { 3135sub on_refresh {
2114 my ($self, $id, $cb) = @_; 3136 my ($self, $id, $cb) = @_;
2115 3137
2116 $self->{refresh_hook}{$id} = $cb; 3138 $self->{refresh_hook}{$id} = $cb;
2117} 3139}
2118 3140
3141sub on_post_alloc {
3142 my ($self, $id, $cb) = @_;
3143
3144 $self->{post_alloc_hook}{$id} = $cb;
3145}
3146
2119sub draw { 3147sub draw {
2120 my ($self) = @_; 3148 my ($self) = @_;
2121 3149
2122 while (my $rcb = delete $self->{refresh_hook}) { 3150 while ($self->{refresh_hook}) {
2123 $_->() for values %$rcb; 3151 $_->()
3152 for values %{delete $self->{refresh_hook}};
3153 }
3154
3155 if ($self->{check_size}) {
3156 my @queue = ([], []);
3157
3158 for (;;) {
3159 if ($self->{check_size}) {
3160 # heuristic: check containers last
3161 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3162 for values %{delete $self->{check_size}}
3163 }
3164
3165 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3166
3167 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3168 ? @$widget{qw(user_w user_h)}
3169 : $widget->size_request;
3170
3171 if (delete $widget->{force_alloc}
3172 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174
3175 $widget->{req_w} = $w;
3176 $widget->{req_h} = $h;
3177
3178 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3179
3180 $widget->{parent}->check_size
3181 if $widget->{parent};
3182 }
3183 }
3184 }
3185
3186 while ($self->{size_alloc}) {
3187 for (values %{delete $self->{size_alloc}}) {
3188 my ($widget, $w, $h) = @$_;
3189
3190 $w = 0 if $w < 0;
3191 $h = 0 if $h < 0;
3192
3193 $widget->{w} = $w;
3194 $widget->{h} = $h;
3195 $widget->emit (size_allocate => $w, $h);
3196 }
3197 }
3198
3199 while ($self->{post_alloc_hook}) {
3200 $_->()
3201 for values %{delete $self->{post_alloc_hook}};
2124 } 3202 }
2125 3203
2126 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3204 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2127 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3205 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2128 glClear GL_COLOR_BUFFER_BIT; 3206 glClear GL_COLOR_BUFFER_BIT;
2129 3207
2130 glMatrixMode GL_PROJECTION; 3208 glMatrixMode GL_PROJECTION;
2131 glLoadIdentity; 3209 glLoadIdentity;
2132 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3210 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2133 glMatrixMode GL_MODELVIEW; 3211 glMatrixMode GL_MODELVIEW;
2134 glLoadIdentity; 3212 glLoadIdentity;
2135 3213
2136 $self->_draw; 3214 $self->_draw;
2137} 3215}
… …
2139############################################################################# 3217#############################################################################
2140 3218
2141package CFClient::UI; 3219package CFClient::UI;
2142 3220
2143$ROOT = new CFClient::UI::Root; 3221$ROOT = new CFClient::UI::Root;
3222$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2144 3223
21451 32241
2146 3225

Diff Legend

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