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.233 by root, Thu May 25 03:42:40 2006 UTC

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

Diff Legend

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