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.163 by root, Mon Apr 24 06:40:29 2006 UTC vs.
Revision 1.255 by root, Mon May 29 02:01:56 2006 UTC

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

Diff Legend

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