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.174 by root, Tue Apr 25 11:18:49 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
30 $TOOLTIP->show; 54 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 55 }
40 56
41 return; 57 return;
42 } 58 }
43 } 59 }
… …
47 delete $TOOLTIP->{owner}; 63 delete $TOOLTIP->{owner};
48} 64}
49 65
50# class methods for events 66# class methods for events
51sub feed_sdl_key_down_event { 67sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 68 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 69 if $FOCUS;
54} 70}
55 71
56sub feed_sdl_key_up_event { 72sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 73 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 74 if $FOCUS;
59} 75}
60 76
61sub feed_sdl_button_down_event { 77sub feed_sdl_button_down_event {
62 my ($ev) = @_; 78 my ($ev) = @_;
… …
71 check_tooltip; 87 check_tooltip;
72 } 88 }
73 89
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 90 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 91
76 if ($GRAB) { 92 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 93 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 94}
81 95
82sub feed_sdl_button_up_event { 96sub feed_sdl_button_up_event {
83 my ($ev) = @_; 97 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 98 my ($x, $y) = ($ev->{x}, $ev->{y});
85 99
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 100 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 101
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 102 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 103
90 if ($GRAB) { 104 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 105 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 106
95 if (!$BUTTON_STATE) { 107 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 108 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 109 $grab->update if $grab;
98 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 126 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 127
116 check_tooltip; 128 check_tooltip;
117 } 129 }
118 130
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 131 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 132 if $HOVER;
123} 133}
124 134
125# convert position array to integers 135# convert position array to integers
126sub harmonize { 136sub harmonize {
127 my ($vals) = @_; 137 my ($vals) = @_;
… …
131 for (@$vals) { 141 for (@$vals) {
132 my $i = int $_ + $rem; 142 my $i = int $_ + $rem;
133 $rem += $_ - $i; 143 $rem += $_ - $i;
134 $_ = $i; 144 $_ = $i;
135 } 145 }
146}
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;
136} 180}
137 181
138############################################################################# 182#############################################################################
139 183
140package CFClient::UI::Base; 184package CFClient::UI::Base;
… …
153 can_events => 1, 197 can_events => 1,
154 @_ 198 @_
155 }, $class; 199 }, $class;
156 200
157 for (keys %$self) { 201 for (keys %$self) {
158 if (/^connect_(.*)$/) { 202 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 203 $self->connect ($1 => delete $self->{$_});
160 } 204 }
161 } 205 }
162 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
163 $self 216 $self
164} 217}
165 218
166sub destroy { 219sub destroy {
167 my ($self) = @_; 220 my ($self) = @_;
… …
176 return if $self->{parent}; 229 return if $self->{parent};
177 230
178 $CFClient::UI::ROOT->add ($self); 231 $CFClient::UI::ROOT->add ($self);
179} 232}
180 233
181sub hide { 234sub center {
182 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};
183 270
184 undef $GRAB if $GRAB == $self; 271 undef $GRAB if $GRAB == $self;
185 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;
186 303
187 $self->{parent}->remove ($self) 304 $self->{parent}->remove ($self)
188 if $self->{parent}; 305 if $self->{parent};
189} 306}
190 307
… …
199} 316}
200 317
201sub set_size { 318sub set_size {
202 my ($self, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
203 320
204 $self->{user_w} = $w; 321 $self->{def_w} = $w;
205 $self->{user_h} = $h; 322 $self->{def_h} = $h;
206 323
207 $self->check_size; 324 $self->realloc;
208} 325}
209 326
210sub size_request { 327sub size_request {
211 require Carp; 328 require Carp;
212 Carp::confess "size_request is abstract"; 329 Carp::confess "size_request is abstract";
… …
232 $self->{y} = $y; 349 $self->{y} = $y;
233 $self->update; 350 $self->update;
234 } 351 }
235 352
236 if ($self->{w} != $w || $self->{h} != $h) { 353 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 354 return unless $self->{visible};
238 $self->{h} = $h;
239 355
240 $self->size_allocate ($w, $h); 356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
241 $self->update;
242 } 357 }
243} 358}
244 359
245sub size_allocate { 360sub size_allocate {
246 # nothing to be done 361 # nothing to be done
247} 362}
248 363
249sub children { 364sub children {
250} 365}
251 366
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260}
261
262sub set_max_size { 367sub set_max_size {
263 my ($self, $w, $h) = @_; 368 my ($self, $w, $h) = @_;
264 369
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 370 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 371 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 372}
268 373
269# return top left coordinates 374sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 375 my ($self, $tooltip) = @_;
272 376
273 $self->{parent} 377 $tooltip =~ s/^\s+//;
274 or Carp::confess "no parent widget in _topleft\n";#d# 378 $tooltip =~ s/\s+$//;
275 379
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 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 }
277} 388}
278 389
279# translate global coordinates to local coordinate system 390# translate global coordinates to local coordinate system
280sub coord2local { 391sub coord2local {
281 my ($self, $x, $y) = @_; 392 my ($self, $x, $y) = @_;
282 393
283 my ($X, $Y) = $self->_topleft; 394 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 395}
286 396
287# translate local coordinates to global coordinate system 397# translate local coordinates to global coordinate system
288sub coord2global { 398sub coord2global {
289 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
290 400
291 my ($X, $Y) = $self->_topleft; 401 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 402}
294 403
295sub focus_in { 404sub focus_in {
296 my ($self) = @_; 405 my ($self) = @_;
297 406
298 return if $FOCUS == $self; 407 return if $FOCUS == $self;
299 return unless $self->{can_focus}; 408 return unless $self->{can_focus};
300 409
301 my $focus = $FOCUS; $FOCUS = $self; 410 my $focus = $FOCUS; $FOCUS = $self;
302 411
303 $self->emit (focus_in => $focus); 412 $self->_emit (focus_in => $focus);
304 413
305 $focus->update if $focus; 414 $focus->update if $focus;
306 $FOCUS->update; 415 $FOCUS->update;
307} 416}
308 417
… …
311 420
312 return unless $FOCUS == $self; 421 return unless $FOCUS == $self;
313 422
314 my $focus = $FOCUS; undef $FOCUS; 423 my $focus = $FOCUS; undef $FOCUS;
315 424
316 $self->emit (focus_out => $focus); 425 $self->_emit (focus_out => $focus);
317 426
318 $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;
319} 431}
320 432
321sub mouse_motion { } 433sub mouse_motion { }
322sub button_up { } 434sub button_up { }
323sub key_down { } 435sub key_down { }
324sub key_up { } 436sub key_up { }
325 437
326sub button_down { 438sub button_down {
327 my ($self, $ev, $x, $y) = @_; 439 my ($self, $ev, $x, $y) = @_;
328 440
329 $self->focus_in; 441 $self->focus_in;
… …
332sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
333sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
334sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
335sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
336sub 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}
337 512
338sub draw { 513sub draw {
339 my ($self) = @_; 514 my ($self) = @_;
340 515
341 return unless $self->{h} && $self->{w}; 516 return unless $self->{h} && $self->{w};
… …
363 if ($ENV{PCLIENT_DEBUG}) { 538 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix; 539 glPushMatrix;
365 glColor 1, 1, 0, 1; 540 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP; 542 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0; 543 glVertex 0 , 0;
369 glVertex $self->{w}, 0; 544 glVertex $self->{w} - 1, 0;
370 glVertex $self->{w}, $self->{h}; 545 glVertex $self->{w} - 1, $self->{h} - 1;
371 glVertex 0 , $self->{h}; 546 glVertex 0 , $self->{h} - 1;
372 glEnd; 547 glEnd;
373 glPopMatrix; 548 glPopMatrix;
374 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;
375 } 550 }
376} 551}
377 552
378sub _draw { 553sub _draw {
379 my ($self) = @_; 554 my ($self) = @_;
380 555
381 warn "no draw defined for $self\n"; 556 warn "no draw defined for $self\n";
382} 557}
383 558
384sub find_widget {
385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
388
389 return $self
390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
392
393 ()
394}
395
396sub set_parent {
397 my ($self, $parent) = @_;
398
399 Scalar::Util::weaken ($self->{parent} = $parent);
400}
401
402sub check_size {
403 my ($self) = @_;
404
405 $self->{parent}
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426}
427
428sub update {
429 my ($self) = @_;
430
431 $self->{parent}->update
432 if $self->{parent};
433}
434
435sub connect {
436 my ($self, $signal, $cb) = @_;
437
438 push @{ $self->{signal_cb}{$signal} }, $cb;
439}
440
441sub emit {
442 my ($self, $signal, @args) = @_;
443
444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
445}
446
447sub DESTROY { 559sub DESTROY {
448 my ($self) = @_; 560 my ($self) = @_;
449 561
562 delete $WIDGET{$self+0};
450 #$self->deactivate; 563 #$self->deactivate;
451} 564}
452 565
453############################################################################# 566#############################################################################
454 567
… …
463 my $class = shift; 576 my $class = shift;
464 577
465 # range [value, low, high, page] 578 # range [value, low, high, page]
466 579
467 $class->SUPER::new ( 580 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 581 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 582 #active_bg => [1, 1, 1, 0.5],
470 @_ 583 @_
471 ) 584 )
472} 585}
473 586
474sub _draw { 587sub _draw {
475 my ($self) = @_; 588 my ($self) = @_;
476 589
590 my $color = $FOCUS == $self && $self->{active_bg}
591 ? $self->{active_bg}
592 : $self->{bg};
593
594 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 595 my ($w, $h) = @$self{qw(w h)};
478 596
479 glEnable GL_BLEND; 597 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 599 glColor @$color;
482 600
483 glBegin GL_QUADS; 601 glBegin GL_QUADS;
484 glVertex 0 , 0; 602 glVertex 0 , 0;
485 glVertex 0 , $h; 603 glVertex 0 , $h;
486 glVertex $w, $h; 604 glVertex $w, $h;
487 glVertex $w, 0; 605 glVertex $w, 0;
488 glEnd; 606 glEnd;
489 607
490 glDisable GL_BLEND; 608 glDisable GL_BLEND;
609 }
491} 610}
492 611
493############################################################################# 612#############################################################################
494 613
495package CFClient::UI::Empty; 614package CFClient::UI::Empty;
… …
527 646
528 $self 647 $self
529} 648}
530 649
531sub add { 650sub add {
532 my ($self, $child) = @_; 651 my ($self, @widgets) = @_;
533 652
534 $child->set_parent ($self); 653 $_->set_parent ($self)
654 for @widgets;
535 655
536 use sort 'stable'; 656 use sort 'stable';
537 657
538 $self->{children} = [ 658 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 659 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 660 @{$self->{children}}, @widgets
541 ]; 661 ];
542 662
543 $child->check_size; 663 $self->realloc;
544} 664}
545 665
546sub children { 666sub children {
547 @{ $_[0]{children} } 667 @{ $_[0]{children} }
548} 668}
… …
553 delete $child->{parent}; 673 delete $child->{parent};
554 $child->hide; 674 $child->hide;
555 675
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 676 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557 677
558 $self->check_size; 678 $self->realloc;
559 $self->update;
560} 679}
561 680
562sub clear { 681sub clear {
563 my ($self) = @_; 682 my ($self) = @_;
564 683
… …
567 686
568 for (@$children) { 687 for (@$children) {
569 delete $_->{parent}; 688 delete $_->{parent};
570 $_->hide; 689 $_->hide;
571 } 690 }
691
692 $self->realloc;
572} 693}
573 694
574sub find_widget { 695sub find_widget {
575 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
576 697
… …
629sub size_request { 750sub size_request {
630 $_[0]{children}[0]->size_request 751 $_[0]{children}[0]->size_request
631} 752}
632 753
633sub size_allocate { 754sub size_allocate {
634 my ($self, $w, $h) = @_; 755 my ($self, $w, $h, $changed) = @_;
635 756
636 $self->{children}[0]->configure (0, 0, $w, $h); 757 $self->{children}[0]->configure (0, 0, $w, $h);
637} 758}
638 759
639############################################################################# 760#############################################################################
… …
651} 772}
652 773
653sub update { 774sub update {
654 my ($self) = @_; 775 my ($self) = @_;
655 776
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 778 $self->SUPER::update;
658} 779}
659 780
660sub size_allocate { 781sub size_allocate {
661 my ($self, $w, $h) = @_; 782 my ($self, $w, $h, $changed) = @_;
662 783
663 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h, $changed);
664 $self->update; 785 $self->update
786 if $changed;
787}
788
789sub _render {
790 $_[0]{children}[0]->draw;
665} 791}
666 792
667sub render_child { 793sub render_child {
668 my ($self) = @_; 794 my ($self) = @_;
669 795
670 $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 {
671 glClearColor 0, 0, 0, 0; 797 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 798 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 799
800 $self->_render;
674 }; 801 };
675} 802}
676 803
677sub _draw { 804sub _draw {
678 my ($self) = @_; 805 my ($self) = @_;
… …
680 my ($w, $h) = ($self->w, $self->h); 807 my ($w, $h) = ($self->w, $self->h);
681 808
682 my $tex = $self->{texture} 809 my $tex = $self->{texture}
683 or return; 810 or return;
684 811
685 glEnable GL_BLEND;
686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
687 glEnable GL_TEXTURE_2D; 812 glEnable GL_TEXTURE_2D;
688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
689 glColor 0, 0, 0, 1; 814 glColor 1, 1, 1, 1;
690 815
691 $tex->draw_quad (0, 0, $w, $h); 816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
692 817
693 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D; 818 glDisable GL_TEXTURE_2D;
695} 819}
696 820
697############################################################################# 821#############################################################################
698 822
699package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
700 824
701our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
702
703sub new { die }
704
705sub size_request {
706 my ($self) = @_;
707
708 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
709 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
710
711 @$self{qw(child_w child_h)}
712}
713
714sub _draw {
715 my ($self) = @_;
716
717 $self->{children}[1]->draw;
718}
719
720
721#############################################################################
722
723package CFClient::UI::Frame;
724
725our @ISA = CFClient::UI::Bin::;
726
727use CFClient::OpenGL;
728 826
729sub new { 827sub new {
730 my $class = shift; 828 my $class = shift;
731 829
732 my $self = $class->SUPER::new ( 830 $class->SUPER::new (
733 bg => [1, 1, 1, 1], 831 scroll_x => 0,
734 border_bg => [1, 1, 1, 1], 832 scroll_y => 1,
735 border => 0.8,
736 @_ 833 @_,
737 ); 834 )
738
739 $self
740} 835}
741 836
742sub _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 {
743 my ($self) = @_; 859 my ($self, $x, $y) = @_;
744 860
745 my ($w, $h) = ($self->{w}, $self->{h}); 861 $self->{view_x} = int $x;
862 $self->{view_y} = int $y;
746 863
747 glEnable GL_BLEND; 864 $self->update;
748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
749 glEnable GL_TEXTURE_2D;
750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
751
752# glBegin GL_QUADS;
753# glColor 0, 0, 0, 0;
754# glVertex 0 , 0;
755# glVertex 0 , $h;
756# glVertex $w, $h;
757# glVertex $w, 0;
758# glEnd;
759
760
761 $self->child->draw;
762 glDisable GL_BLEND;
763 glDisable GL_TEXTURE_2D;
764} 865}
765 866
766############################################################################# 867# hmm, this does not work for topleft of $self... but we should not ask for that
868sub coord2local {
869 my ($self, $x, $y) = @_;
767 870
768package CFClient::UI::FancyFrame; 871 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
872}
769 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
770our @ISA = CFClient::UI::Bin::; 907our @ISA = CFClient::UI::HBox::;
771
772use CFClient::OpenGL;
773
774my @tex =
775 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
776 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
777 908
778sub new { 909sub new {
779 my $class = shift; 910 my $class = shift;
780 911
781 # 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;
782 1015
783 my $self = $class->SUPER::new ( 1016 my $self = $class->SUPER::new (
784 bg => [1, 1, 1, 1], 1017 bg => [1, 1, 1, 1],
785 border_bg => [1, 1, 1, 1], 1018 border_bg => [1, 1, 1, 1],
786 border => 0.8, 1019 border => 0.6,
1020 is_toplevel => 1,
787 can_events => 1, 1021 can_events => 1,
788 @_ 1022 @_
789 ); 1023 );
790 1024
791 $self->{title} &&= new CFClient::UI::Label 1025 $self->{title} &&= new CFClient::UI::Label
792 align => 0, 1026 align => 0,
793 valign => 1, 1027 valign => 1,
794 text => $self->{title}, 1028 text => $self->{title},
795 fontsize => 1; 1029 fontsize => $self->{border};
796 1030
797 $self 1031 $self
798} 1032}
799 1033
800sub border { 1034sub border {
… …
811 $h + $self->border * 2, 1045 $h + $self->border * 2,
812 ) 1046 )
813} 1047}
814 1048
815sub size_allocate { 1049sub size_allocate {
816 my ($self, $w, $h) = @_; 1050 my ($self, $w, $h, $changed) = @_;
1051
1052 return unless $changed;
817 1053
818 $h -= List::Util::max 0, $self->border * 2; 1054 $h -= List::Util::max 0, $self->border * 2;
819 $w -= List::Util::max 0, $self->border * 2; 1055 $w -= List::Util::max 0, $self->border * 2;
820 1056
821 $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)
822 if $self->{title}; 1058 if $self->{title};
823 1059
824 $self->child->configure ($self->border, $self->border, $w, $h); 1060 $self->child->configure ($self->border, $self->border, $w, $h);
825} 1061}
826 1062
827sub button_down { 1063sub button_down {
828 my ($self, $ev, $x, $y) = @_; 1064 my ($self, $ev, $x, $y) = @_;
829 1065
1066 my ($w, $h) = @$self{qw(w h)};
830 my $border = $self->border; 1067 my $border = $self->border;
831 1068
832 if ($x < $self->{w} && $x >= $self->{w} - $border 1069 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
833 && $y < $self->{h} && $y >= $self->{h} - $border) { 1070 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
834 1071
1072 if ($lr & $td) {
1073 my ($wx, $wy) = ($self->{x}, $self->{y});
835 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1074 my ($ox, $oy) = ($ev->{x}, $ev->{y});
836 my ($bw, $bh) = ($self->{w}, $self->{h}); 1075 my ($bw, $bh) = ($self->{w}, $self->{h});
837 1076
1077 my $mx = $x < $border;
1078 my $my = $y < $border;
1079
838 $self->{motion} = sub { 1080 $self->{motion} = sub {
839 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
840 1082
841 ($x, $y) = ($ev->{x}, $ev->{y}); 1083 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy;
842 1085
843 $self->{user_w} = $bw + $x - $ox; 1086 $self->{user_x} = $wx + $dx * $mx;
844 $self->{user_h} = $bh + $y - $oy; 1087 $self->{user_y} = $wy + $dy * $my;
845 $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;
846 }; 1092 };
847 1093
848 } elsif ($x >= 0 && $x < $self->{w} 1094 } elsif ($lr ^ $td) {
849 && $y >= 0 && $y < $border) {
850
851 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
852 my ($bx, $by) = ($self->{x}, $self->{y}); 1096 my ($bx, $by) = ($self->{x}, $self->{y});
853 1097
854 $self->{motion} = sub { 1098 $self->{motion} = sub {
855 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
856 1100
857 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
858 1102
859 $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});
860 $self->update; 1107 $self->realloc;
861 }; 1108 };
862 } 1109 }
863} 1110}
864 1111
865sub button_up { 1112sub button_up {
… …
878 my ($self) = @_; 1125 my ($self) = @_;
879 1126
880 my ($w, $h ) = ($self->{w}, $self->{h}); 1127 my ($w, $h ) = ($self->{w}, $self->{h});
881 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
882 1129
883 glEnable GL_BLEND;
884 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
885 glEnable GL_TEXTURE_2D; 1130 glEnable GL_TEXTURE_2D;
886 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
887 1132
888 my $border = $self->border; 1133 my $border = $self->border;
889 1134
890 glColor @{ $self->{border_bg} }; 1135 glColor @{ $self->{border_bg} };
891 $tex[1]->draw_quad (0, 0, $w, $border); 1136 $border[0]->draw_quad_alpha (0, 0, $w, $border);
892 $tex[3]->draw_quad (0, $border, $border, $ch); 1137 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
893 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1138 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
894 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1139 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
895 1140
896 my $bg = $tex[0]; 1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142 glColor @{ $self->{bg} };
897 1143
898 # TODO: repeat texture not scale 1144 # TODO: repeat texture not scale
899 my $rep_x = $cw / $bg->{w}; 1145 # solve this better(?)
900 my $rep_y = $ch / $bg->{h}; 1146 $bg->{s} = $cw / $bg->{w};
901 1147 $bg->{t} = $ch / $bg->{h};
902 glColor @{ $self->{bg} };
903
904 $bg->{s} = $rep_x;
905 $bg->{t} = $rep_y;
906 $bg->{wrap_mode} = 1;
907 $bg->draw_quad ($border, $border, $cw, $ch); 1148 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1149 }
908 1150
909 glDisable GL_TEXTURE_2D; 1151 glDisable GL_TEXTURE_2D;
910 glDisable GL_BLEND;
911 1152
912 $self->{title}->draw if $self->{title}; 1153 $self->{title}->draw if $self->{title};
1154
913 $self->child->draw; 1155 $self->child->draw;
914} 1156}
915 1157
916############################################################################# 1158#############################################################################
917 1159
… …
926sub new { 1168sub new {
927 my $class = shift; 1169 my $class = shift;
928 1170
929 $class->SUPER::new ( 1171 $class->SUPER::new (
930 col_expand => [], 1172 col_expand => [],
931 @_ 1173 @_,
932 ) 1174 )
1175}
1176
1177sub children {
1178 grep $_, map @$_, grep $_, @{ $_[0]{children} }
933} 1179}
934 1180
935sub add { 1181sub add {
936 my ($self, $x, $y, $child) = @_; 1182 my ($self, $x, $y, $child) = @_;
937 1183
938 $child->set_parent ($self); 1184 $child->set_parent ($self);
939 $self->{children}[$y][$x] = $child; 1185 $self->{children}[$y][$x] = $child;
940 1186
941 $child->check_size; 1187 $self->realloc;
942} 1188}
943 1189
944sub children {
945 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946}
947
948# 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?
949sub clear { 1191sub clear {
950 my ($self) = @_; 1192 my ($self) = @_;
951 1193
952 my @children = $self->children; 1194 my @children = $self->children;
953 delete $self->{children}; 1195 delete $self->{children};
… …
955 for (@children) { 1197 for (@children) {
956 delete $_->{parent}; 1198 delete $_->{parent};
957 $_->hide; 1199 $_->hide;
958 } 1200 }
959 1201
960 $self->update; 1202 $self->realloc;
961} 1203}
962 1204
963sub get_wh { 1205sub get_wh {
964 my ($self) = @_; 1206 my ($self) = @_;
965 1207
… …
992 (sum @$hs), 1234 (sum @$hs),
993 ) 1235 )
994} 1236}
995 1237
996sub size_allocate { 1238sub size_allocate {
997 my ($self, $w, $h) = @_; 1239 my ($self, $w, $h, $changed) = @_;
998 1240
999 my ($ws, $hs) = $self->get_wh; 1241 my ($ws, $hs) = $self->get_wh;
1000 1242
1001 my $req_w = sum @$ws; 1243 my $req_w = (sum @$ws) || 1;
1002 my $req_h = sum @$hs; 1244 my $req_h = (sum @$hs) || 1;
1003 1245
1004 # TODO: nicer code && do row_expand 1246 # TODO: nicer code && do row_expand
1005 my @col_expand = @{$self->{col_expand}}; 1247 my @col_expand = @{$self->{col_expand}};
1006 @col_expand = (1) x @$ws unless @col_expand; 1248 @col_expand = (1) x @$ws unless @col_expand;
1007 my $col_expand = (sum @col_expand) || 1; 1249 my $col_expand = (sum @col_expand) || 1;
… …
1061 } 1303 }
1062} 1304}
1063 1305
1064############################################################################# 1306#############################################################################
1065 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
1066package CFClient::UI::HBox; 1368package CFClient::UI::HBox;
1067 1369
1068# TODO: wrap into common Box base class
1069
1070our @ISA = CFClient::UI::Container::; 1370our @ISA = CFClient::UI::Box::;
1071 1371
1072sub size_request { 1372sub new {
1073 my ($self) = @_; 1373 my $class = shift;
1074 1374
1075 my @alloc = map [$_->size_request], @{$self->{children}}; 1375 $class->SUPER::new (
1076 1376 vertical => 0,
1077 ( 1377 @_,
1078 (List::Util::sum map $_->[0], @alloc),
1079 (List::Util::max map $_->[1], @alloc),
1080 ) 1378 )
1081} 1379}
1082 1380
1083sub size_allocate {
1084 my ($self, $w, $h) = @_;
1085
1086 ($h, $w) = ($w, $h);
1087
1088 my $children = $self->{children};
1089
1090 my @h = map $_->{req_w}, @$children;
1091
1092 my $req_h = List::Util::sum @h;
1093
1094 if ($req_h > $h) {
1095 # ah well, not enough space
1096 $_ *= $h / $req_h for @h;
1097 } else {
1098 my $exp = List::Util::sum map $_->{expand}, @$children;
1099 $exp ||= 1;
1100
1101 for (0 .. $#$children) {
1102 my $child = $children->[$_];
1103
1104 my $alloc_h = $h[$_];
1105 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1106 $h[$_] = $alloc_h;
1107 }
1108 }
1109
1110 CFClient::UI::harmonize \@h;
1111
1112 my $y = 0;
1113 for (0 .. $#$children) {
1114 my $child = $children->[$_];
1115 my $h = $h[$_];
1116 $child->configure ($y, 0, $h, $w);
1117
1118 $y += $h;
1119 }
1120
1121 1
1122}
1123
1124############################################################################# 1381#############################################################################
1125 1382
1126package CFClient::UI::VBox; 1383package CFClient::UI::VBox;
1127 1384
1128# TODO: wrap into common Box base class
1129
1130our @ISA = CFClient::UI::Container::; 1385our @ISA = CFClient::UI::Box::;
1131 1386
1132sub size_request { 1387sub new {
1133 my ($self) = @_; 1388 my $class = shift;
1134 1389
1135 my @alloc = map [$_->size_request], @{$self->{children}}; 1390 $class->SUPER::new (
1136 1391 vertical => 1,
1137 ( 1392 @_,
1138 (List::Util::max map $_->[0], @alloc),
1139 (List::Util::sum map $_->[1], @alloc),
1140 ) 1393 )
1141} 1394}
1142 1395
1143sub size_allocate {
1144 my ($self, $w, $h) = @_;
1145
1146 my $children = $self->{children};
1147
1148 my @h = map $_->{req_h}, @$children;
1149
1150 my $req_h = List::Util::sum @h;
1151
1152 if ($req_h > $h) {
1153 # ah well, not enough space
1154 $_ *= $h / $req_h for @h;
1155 } else {
1156 my $exp = List::Util::sum map $_->{expand}, @$children;
1157 $exp ||= 1;
1158
1159 for (0 .. $#$children) {
1160 my $child = $children->[$_];
1161
1162 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1163 }
1164 }
1165
1166 CFClient::UI::harmonize \@h;
1167
1168 my $y = 0;
1169 for (0 .. $#$children) {
1170 my $child = $children->[$_];
1171 my $h = $h[$_];
1172 $child->configure (0, $y, $w, $h);
1173
1174 $y += $h;
1175 }
1176
1177 1
1178}
1179
1180############################################################################# 1396#############################################################################
1181 1397
1182package CFClient::UI::Label; 1398package CFClient::UI::Label;
1183 1399
1184our @ISA = CFClient::UI::Base::; 1400our @ISA = CFClient::UI::DrawBG::;
1185 1401
1186use CFClient::OpenGL; 1402use CFClient::OpenGL;
1187 1403
1188sub new { 1404sub new {
1189 my ($class, %arg) = @_; 1405 my ($class, %arg) = @_;
1190 1406
1191 my $self = $class->SUPER::new ( 1407 my $self = $class->SUPER::new (
1192 fg => [1, 1, 1], 1408 fg => [1, 1, 1],
1409 #bg => none
1410 #active_bg => none
1193 #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),
1194 fontsize => 1, 1417 fontsize => 1,
1195 text => "",
1196 align => -1, 1418 align => -1,
1197 valign => -1, 1419 valign => -1,
1198 padding => 2, 1420 padding => 2,
1199 layout => new CFClient::Layout,
1200 can_events => 0, 1421 can_events => 0,
1201 %arg 1422 %arg
1202 ); 1423 );
1203 1424
1204 if (exists $self->{template}) { 1425 if (exists $self->{template}) {
1205 my $layout = new CFClient::Layout; 1426 my $layout = new CFClient::Layout;
1206 $layout->set_text (delete $self->{template}); 1427 $layout->set_text (delete $self->{template});
1207 $self->{template} = $layout; 1428 $self->{template} = $layout;
1208 } 1429 }
1209 1430
1210 $self->set_text (delete $self->{text}) if exists $self->{text}; 1431 if (exists $self->{markup}) {
1211 $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 }
1212 1436
1213 $self 1437 $self
1214} 1438}
1215 1439
1216sub escape { 1440sub escape($) {
1217 local $_ = $_[1]; 1441 local $_ = $_[0];
1218 1442
1219 s/&/&amp;/g; 1443 s/&/&amp;/g;
1220 s/>/&gt;/g; 1444 s/>/&gt;/g;
1221 s/</&lt;/g; 1445 s/</&lt;/g;
1222 1446
1223 $_[1] 1447 $_
1224} 1448}
1225 1449
1226sub update { 1450sub update {
1227 my ($self) = @_; 1451 my ($self) = @_;
1228 1452
1229 delete $self->{texture}; 1453 delete $self->{texture};
1230 $self->SUPER::update; 1454 $self->SUPER::update;
1231} 1455}
1232 1456
1233sub reconfigure {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237}
1238
1239sub set_text { 1457sub set_text {
1240 my ($self, $text) = @_; 1458 my ($self, $text) = @_;
1241 1459
1242 return if $self->{text} eq "T$text"; 1460 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text"; 1461 $self->{text} = "T$text";
1244 1462
1463 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1245 $self->{layout}->set_text ($text); 1464 $self->{layout}->set_text ($text);
1246 1465
1247 delete $self->{texture}; 1466 $self->realloc;
1248 $self->update; 1467 $self->update;
1249 $self->check_size;
1250} 1468}
1251 1469
1252sub set_markup { 1470sub set_markup {
1253 my ($self, $markup) = @_; 1471 my ($self, $markup) = @_;
1254 1472
1255 return if $self->{text} eq "M$markup"; 1473 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup"; 1474 $self->{text} = "M$markup";
1257 1475
1476 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1477
1478 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1258 $self->{layout}->set_markup ($markup); 1479 $self->{layout}->set_markup ($markup);
1259 1480
1260 delete $self->{texture}; 1481 $self->realloc;
1261 $self->update; 1482 $self->update;
1262 $self->check_size;
1263} 1483}
1264 1484
1265sub size_request { 1485sub size_request {
1266 my ($self) = @_; 1486 my ($self) = @_;
1267 1487
1268 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1488 $self->{layout}->set_font ($self->{font}) if $self->{font};
1269 $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});
1270 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1492 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1271 1493
1272 my ($w, $h) = $self->{layout}->size; 1494 my ($w, $h) = $self->{layout}->size;
1273 1495
1274 if (exists $self->{template}) { 1496 if (exists $self->{template}) {
… …
1286 $h + $self->{padding} * 2, 1508 $h + $self->{padding} * 2,
1287 ) 1509 )
1288} 1510}
1289 1511
1290sub size_allocate { 1512sub size_allocate {
1291 my ($self, $w, $h) = @_; 1513 my ($self, $w, $h, $changed) = @_;
1292 1514
1293 delete $self->{texture}; 1515 delete $self->{texture}
1516 if $changed;
1294} 1517}
1295 1518
1296sub set_fontsize { 1519sub set_fontsize {
1297 my ($self, $fontsize) = @_; 1520 my ($self, $fontsize) = @_;
1298 1521
1299 $self->{fontsize} = $fontsize; 1522 $self->{fontsize} = $fontsize;
1300 delete $self->{texture}; 1523 delete $self->{texture};
1301 $self->check_size; 1524
1302 $self->update; 1525 $self->realloc;
1303} 1526}
1304 1527
1305sub _draw { 1528sub _draw {
1306 my ($self) = @_; 1529 my ($self) = @_;
1307 1530
1531 $self->SUPER::_draw; # draw background, if applicable
1532
1308 my $tex = $self->{texture} ||= do { 1533 my $tex = $self->{texture} ||= do {
1534 $self->{layout}->set_foreground (@{$self->{fg}});
1309 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1535 $self->{layout}->set_font ($self->{font}) if $self->{font};
1310 $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});
1311 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1539 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1540
1312 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
1313 }; 1552 };
1314 1553
1315 glEnable GL_BLEND;
1316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1317 glEnable GL_TEXTURE_2D; 1554 glEnable GL_TEXTURE_2D;
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1319 1556
1557 if ($tex->{format} == GL_ALPHA) {
1320 glColor @{$self->{fg}}; 1558 glColor @{$self->{fg}};
1321
1322 $self->{ox} = int (
1323 $self->{align} < 0 ? $self->{padding}
1324 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1325 : ($self->{w} - $tex->{w}) * 0.5
1326 );
1327
1328 $self->{oy} = int (
1329 $self->{valign} < 0 ? $self->{padding}
1330 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1331 : ($self->{h} - $tex->{h}) * 0.5
1332 );
1333
1334 $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 }
1335 1563
1336 glDisable GL_TEXTURE_2D; 1564 glDisable GL_TEXTURE_2D;
1337 glDisable GL_BLEND;
1338} 1565}
1339 1566
1340############################################################################# 1567#############################################################################
1341 1568
1342package CFClient::UI::EntryBase; 1569package CFClient::UI::EntryBase;
… …
1355 active_fg => [0, 0, 0], 1582 active_fg => [0, 0, 0],
1356 can_hover => 1, 1583 can_hover => 1,
1357 can_focus => 1, 1584 can_focus => 1,
1358 valign => 0, 1585 valign => 0,
1359 can_events => 1, 1586 can_events => 1,
1587 #text => ...
1360 @_ 1588 @_
1361 ) 1589 )
1362} 1590}
1363 1591
1364sub _set_text { 1592sub _set_text {
… …
1374 $self->{text} = $text; 1602 $self->{text} = $text;
1375 1603
1376 $text =~ s/./*/g if $self->{hidden}; 1604 $text =~ s/./*/g if $self->{hidden};
1377 $self->{layout}->set_text ("$text "); 1605 $self->{layout}->set_text ("$text ");
1378 1606
1379 $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;
1380} 1617}
1381 1618
1382sub get_text { 1619sub get_text {
1383 $_[0]{text} 1620 $_[0]{text}
1384} 1621}
… …
1387 my ($self) = @_; 1624 my ($self) = @_;
1388 1625
1389 my ($w, $h) = $self->SUPER::size_request; 1626 my ($w, $h) = $self->SUPER::size_request;
1390 1627
1391 ($w + 1, $h) # add 1 for cursor 1628 ($w + 1, $h) # add 1 for cursor
1392}
1393
1394sub size_allocate {
1395 my ($self, $w, $h) = @_;
1396
1397 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1398}
1399
1400sub set_text {
1401 my ($self, $text) = @_;
1402
1403 $self->{cursor} = length $text;
1404 $self->_set_text ($text);
1405 $self->update;
1406} 1629}
1407 1630
1408sub key_down { 1631sub key_down {
1409 my ($self, $ev) = @_; 1632 my ($self, $ev) = @_;
1410 1633
… …
1412 my $sym = $ev->{sym}; 1635 my $sym = $ev->{sym};
1413 my $uni = $ev->{unicode}; 1636 my $uni = $ev->{unicode};
1414 1637
1415 my $text = $self->get_text; 1638 my $text = $self->get_text;
1416 1639
1417 if ($sym == 8) { 1640 if ($uni == 8) {
1418 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1641 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1419 } elsif ($sym == 127) { 1642 } elsif ($uni == 127) {
1420 substr $text, $self->{cursor}, 1, ""; 1643 substr $text, $self->{cursor}, 1, "";
1421 } elsif ($sym == CFClient::SDLK_LEFT) { 1644 } elsif ($sym == CFClient::SDLK_LEFT) {
1422 --$self->{cursor} if $self->{cursor}; 1645 --$self->{cursor} if $self->{cursor};
1423 } elsif ($sym == CFClient::SDLK_RIGHT) { 1646 } elsif ($sym == CFClient::SDLK_RIGHT) {
1424 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1647 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1425 } elsif ($sym == CFClient::SDLK_HOME) { 1648 } elsif ($sym == CFClient::SDLK_HOME) {
1426 $self->{cursor} = 0; 1649 $self->{cursor} = 0;
1427 } elsif ($sym == CFClient::SDLK_END) { 1650 } elsif ($sym == CFClient::SDLK_END) {
1428 $self->{cursor} = length $text; 1651 $self->{cursor} = length $text;
1429 } elsif ($sym == 27) { 1652 } elsif ($uni == 27) {
1430 $self->emit ('escape'); 1653 $self->_emit ('escape');
1431 } elsif ($uni) { 1654 } elsif ($uni) {
1432 substr $text, $self->{cursor}++, 0, chr $uni; 1655 substr $text, $self->{cursor}++, 0, chr $uni;
1433 } 1656 }
1434 1657
1435 $self->_set_text ($text); 1658 $self->_set_text ($text);
1436 $self->update; 1659
1660 $self->realloc;
1437} 1661}
1438 1662
1439sub focus_in { 1663sub focus_in {
1440 my ($self) = @_; 1664 my ($self) = @_;
1441 1665
… …
1521 if ($sym == 13) { 1745 if ($sym == 13) {
1522 unshift @{$self->{history}}, 1746 unshift @{$self->{history}},
1523 my $txt = $self->get_text; 1747 my $txt = $self->get_text;
1524 $self->{history_pointer} = -1; 1748 $self->{history_pointer} = -1;
1525 $self->{history_saveback} = ''; 1749 $self->{history_saveback} = '';
1526 $self->emit (activate => $txt); 1750 $self->_emit (activate => $txt);
1527 $self->update; 1751 $self->update;
1528 1752
1529 } elsif ($sym == CFClient::SDLK_UP) { 1753 } elsif ($sym == CFClient::SDLK_UP) {
1530 if ($self->{history_pointer} < 0) { 1754 if ($self->{history_pointer} < 0) {
1531 $self->{history_saveback} = $self->get_text; 1755 $self->{history_saveback} = $self->get_text;
… …
1570 my $class = shift; 1794 my $class = shift;
1571 1795
1572 $class->SUPER::new ( 1796 $class->SUPER::new (
1573 padding => 4, 1797 padding => 4,
1574 fg => [1, 1, 1], 1798 fg => [1, 1, 1],
1575 bg => [1, 1, 1, 0.2],
1576 active_fg => [0, 0, 1], 1799 active_fg => [0, 0, 1],
1577 can_hover => 1, 1800 can_hover => 1,
1578 align => 0, 1801 align => 0,
1579 valign => 0, 1802 valign => 0,
1580 can_events => 1, 1803 can_events => 1,
1581 @_ 1804 @_
1582 ) 1805 )
1583} 1806}
1584 1807
1808sub activate { }
1809
1585sub button_up { 1810sub button_up {
1586 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1587 1812
1813 $self->emit ("activate")
1588 if ($x >= 0 && $x < $self->{w} 1814 if $x >= 0 && $x < $self->{w}
1589 && $y >= 0 && $y < $self->{h}) { 1815 && $y >= 0 && $y < $self->{h};
1590 $self->emit ("activate");
1591 }
1592} 1816}
1593 1817
1594sub _draw { 1818sub _draw {
1595 my ($self) = @_; 1819 my ($self) = @_;
1596 1820
… …
1598 1822
1599 if ($GRAB == $self) { 1823 if ($GRAB == $self) {
1600 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1601 } 1825 }
1602 1826
1603 glEnable GL_BLEND;
1604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1605 glEnable GL_TEXTURE_2D; 1827 glEnable GL_TEXTURE_2D;
1606 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1607 glColor 0, 0, 0, 1; 1829 glColor 0, 0, 0, 1;
1608 1830
1609 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1831 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1610 1832
1611 glDisable GL_TEXTURE_2D; 1833 glDisable GL_TEXTURE_2D;
1612 glDisable GL_BLEND;
1613 1834
1614 $self->SUPER::_draw; 1835 $self->SUPER::_draw;
1615} 1836}
1616 1837
1617############################################################################# 1838#############################################################################
… …
1631 1852
1632 $class->SUPER::new ( 1853 $class->SUPER::new (
1633 padding => 2, 1854 padding => 2,
1634 fg => [1, 1, 1], 1855 fg => [1, 1, 1],
1635 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],
1636 state => 0, 1859 state => 0,
1637 can_hover => 1, 1860 can_hover => 1,
1638 @_ 1861 @_
1639 ) 1862 )
1640} 1863}
… …
1649 my ($self, $ev, $x, $y) = @_; 1872 my ($self, $ev, $x, $y) = @_;
1650 1873
1651 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1874 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1652 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1875 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1653 $self->{state} = !$self->{state}; 1876 $self->{state} = !$self->{state};
1654 $self->emit (changed => $self->{state}); 1877 $self->_emit (changed => $self->{state});
1655 } 1878 }
1656} 1879}
1657 1880
1658sub _draw { 1881sub _draw {
1659 my ($self) = @_; 1882 my ($self) = @_;
… …
1664 1887
1665 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;
1666 1889
1667 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1890 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1668 1891
1669 glEnable GL_BLEND; 1892 my $tex = $self->{state} ? $tex[1] : $tex[0];
1893
1670 glEnable GL_TEXTURE_2D; 1894 glEnable GL_TEXTURE_2D;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672
1673 my $tex = $self->{state} ? $tex[1] : $tex[0];
1674
1675 $tex->draw_quad (0, 0, $s, $s); 1895 $tex->draw_quad_alpha (0, 0, $s, $s);
1676
1677 glDisable GL_TEXTURE_2D; 1896 glDisable GL_TEXTURE_2D;
1678 glDisable GL_BLEND;
1679} 1897}
1680 1898
1681############################################################################# 1899#############################################################################
1682 1900
1683package CFClient::UI::Image; 1901package CFClient::UI::Image;
… …
1726 glTranslate 0, -$self->{w}, 0; 1944 glTranslate 0, -$self->{w}, 0;
1727 1945
1728 ($w, $h) = ($h, $w); 1946 ($w, $h) = ($h, $w);
1729 } 1947 }
1730 1948
1731 glEnable GL_BLEND;
1732 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1733 glEnable GL_TEXTURE_2D; 1949 glEnable GL_TEXTURE_2D;
1734 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1950 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1735 1951
1736 $tex->draw_quad (0, 0, $w, $h); 1952 $tex->draw_quad_alpha (0, 0, $w, $h);
1737 1953
1738 glDisable GL_BLEND;
1739 glDisable GL_TEXTURE_2D; 1954 glDisable GL_TEXTURE_2D;
1740} 1955}
1741 1956
1742############################################################################# 1957#############################################################################
1743 1958
… …
1932 qw(s1_slider.png s1_slider_bg.png); 2147 qw(s1_slider.png s1_slider_bg.png);
1933 2148
1934sub new { 2149sub new {
1935 my $class = shift; 2150 my $class = shift;
1936 2151
1937 # range [value, low, high, page] 2152 # range [value, low, high, page, unit]
1938 2153
1939 # TODO: 0-width page 2154 # TODO: 0-width page
1940 # TODO: req_w/h are wrong with vertical 2155 # TODO: req_w/h are wrong with vertical
1941 # TODO: calculations are off 2156 # TODO: calculations are off
1942 my $self = $class->SUPER::new ( 2157 my $self = $class->SUPER::new (
1943 fg => [1, 1, 1], 2158 fg => [1, 1, 1],
1944 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],
1945 range => [0, 0, 100, 10], 2162 range => [0, 0, 100, 10, 0],
1946 req_w => 20, 2163 req_w => $::WIDTH / 80,
1947 req_h => 20, 2164 req_h => $::WIDTH / 80,
1948 vertical => 0, 2165 vertical => 0,
1949 can_hover => 1, 2166 can_hover => 1,
1950 inner_pad => 5, 2167 inner_pad => 0.02,
1951 @_ 2168 @_
1952 ); 2169 );
1953 2170
2171 $self->set_value ($self->{range}[0]);
2172 $self->update;
2173
1954 $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 }
1955} 2209}
1956 2210
1957sub size_request { 2211sub size_request {
1958 my ($self) = @_; 2212 my ($self) = @_;
1959 2213
… …
1965 2219
1966sub button_down { 2220sub button_down {
1967 my ($self, $ev, $x, $y) = @_; 2221 my ($self, $ev, $x, $y) = @_;
1968 2222
1969 $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
1970 $self->mouse_motion ($ev, $x, $y); 2227 $self->mouse_motion ($ev, $x, $y);
1971} 2228}
1972 2229
1973sub mouse_motion { 2230sub mouse_motion {
1974 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
1975 2232
1976 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
1977 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2250 my ($value, $lo, $hi, $page) = @{$self->{range}};
2251 my $range = ($hi - $page - $lo) || 1e-100;
1978 2252
1979 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2253 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1980 2254
1981 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2255 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1982 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2256 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1983 2257
1984 $x -= $inner_pad_px; # substract the padding 2258 $value = ($value - $lo) / $range;
1985 $x = $x * ($hi - $lo) / $inner_w + $lo; 2259 $value = $value * $self->{scale} + $self->{offset};
1986 $x = $lo if $x < $lo;
1987 $x = $hi - $page if $x > $hi - $page;
1988 $self->{range}[0] = $x;
1989 2260
1990 $self->emit (changed => $x); 2261 $self->{knob_x} = $value - $knob_w * 0.5;
1991 $self->update; 2262 $self->{knob_w} = $knob_w;
1992 } 2263 });
1993}
1994 2264
1995# the inner_* stuff is for generating a padding for the slider handle, 2265 $self->SUPER::update;
1996# so that the handle doesn't leave the texture. This calculation isn't 100%
1997# correct propably, but it does the job for now
1998sub _calc_inner_pad_px {
1999 my ($self, $w) = @_;
2000 ($w / 100) * $self->{inner_pad} # % to pixels
2001} 2266}
2002 2267
2003sub _draw { 2268sub _draw {
2004 my ($self) = @_; 2269 my ($self) = @_;
2005 2270
2006 $self->SUPER::_draw (); 2271 $self->SUPER::_draw ();
2007 2272
2008 my ($w, $h) = @$self{qw(w h)}; 2273 glScale $self->{w}, $self->{h};
2009 2274
2010 if ($self->{vertical}) { 2275 if ($self->{vertical}) {
2011 # draw a vertical slider like a rotated horizontal slider 2276 # draw a vertical slider like a rotated horizontal slider
2012 2277
2278 glTranslate 1, 0, 0;
2013 glRotate 90, 0, 0, 1; 2279 glRotate 90, 0, 0, 1;
2014 glTranslate 0, -$self->{w}, 0;
2015
2016 ($w, $h) = ($h, $w);
2017 } 2280 }
2018 2281
2019 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2282 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2020 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2283 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2021 2284
2022 my ($value, $lo, $hi, $page) = @{$self->{range}};
2023
2024 $hi = $value + 1 if $lo == $hi;
2025
2026 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2027 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2028
2029 $page = int $page * $inner_w / ($hi - $lo);
2030 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2031
2032 $w -= $page;
2033 $page &= ~1;
2034 glTranslate $page * 0.5, 0, 0;
2035 $page ||= 2;
2036
2037 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2038 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2039
2040 glEnable GL_BLEND;
2041 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2042 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2044 2287
2045 # draw background 2288 # draw background
2046 $tex[1]->draw_quad (0, 0, $w, $h); 2289 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2047 2290
2048 # draw handle 2291 # draw handle
2049 $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);
2050 2293
2051 glDisable GL_BLEND;
2052 glDisable GL_TEXTURE_2D; 2294 glDisable GL_TEXTURE_2D;
2053} 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 (@_) }
2054 2337
2055############################################################################# 2338#############################################################################
2056 2339
2057package CFClient::UI::TextView; 2340package CFClient::UI::TextView;
2058 2341
… …
2067 fontsize => 1, 2350 fontsize => 1,
2068 can_events => 0, 2351 can_events => 0,
2069 #font => default_font 2352 #font => default_font
2070 @_, 2353 @_,
2071 2354
2072 layout => (new CFClient::Layout), 2355 layout => (new CFClient::Layout 1),
2073 par => [], 2356 par => [],
2074 height => 0, 2357 height => 0,
2075 children => [ 2358 children => [
2076 (new CFClient::UI::Empty expand => 1), 2359 (new CFClient::UI::Empty expand => 1),
2077 (new CFClient::UI::Slider vertical => 1), 2360 (new CFClient::UI::Slider vertical => 1),
2078 ], 2361 ],
2079 ); 2362 );
2080 2363
2081 $self->{children}[1]->connect (changed => sub { 2364 $self->{children}[1]->connect (changed => sub { $self->update });
2082 $self->update;
2083 });
2084 2365
2085 $self 2366 $self
2086} 2367}
2087 2368
2088sub set_fontsize { 2369sub set_fontsize {
… …
2090 2371
2091 $self->{fontsize} = $fontsize; 2372 $self->{fontsize} = $fontsize;
2092 $self->reflow; 2373 $self->reflow;
2093} 2374}
2094 2375
2095sub text_height {
2096 my ($self, $text) = @_;
2097
2098 my $layout = $self->{layout};
2099
2100 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2101 $layout->set_width ($self->{w});
2102 $layout->set_text ($text);
2103
2104 ($layout->size)[1]
2105}
2106
2107sub reflow {
2108 my ($self) = @_;
2109
2110 $self->{need_reflow}++;
2111 $self->update;
2112}
2113
2114sub size_allocate { 2376sub size_allocate {
2115 my ($self, $w, $h) = @_; 2377 my ($self, $w, $h, $changed) = @_;
2116 2378
2117 $self->SUPER::size_allocate ($w, $h); 2379 $self->SUPER::size_allocate ($w, $h, $changed);
2380
2381 return unless $changed;
2118 2382
2119 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2383 $self->{layout}->set_font ($self->{font}) if $self->{font};
2120 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2121 $self->{layout}->set_width ($self->{children}[0]{w}); 2385 $self->{layout}->set_width ($self->{children}[0]{w});
2122 2386
2123 $self->reflow; 2387 $self->reflow;
2124} 2388}
2125 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
2126sub add_paragraph { 2424sub add_paragraph {
2127 my ($self, $color, $text) = @_; 2425 my ($self, $color, $text, $indent) = @_;
2128 2426
2129 #TODO: intelligently "reformat" paragraph 2427 for my $line (split /\n/, $text) {
2130 2428 my ($w, $h) = $self->text_size ($line);
2131 my $height = $self->text_height ($text);
2132
2133 $self->{height} += $height; 2429 $self->{height} += $h;
2430 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2431 }
2134 2432
2135 push @{$self->{par}}, [$height, $color, $text];
2136
2137 $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]);
2138 $self->{children}[1]->update;
2139} 2434}
2140 2435
2141sub update { 2436sub update {
2142 my ($self) = @_; 2437 my ($self) = @_;
2143 2438
… …
2145 2440
2146 return unless $self->{h} > 0; 2441 return unless $self->{h} > 0;
2147 2442
2148 delete $self->{texture}; 2443 delete $self->{texture};
2149 2444
2150 $ROOT->on_refresh ($self, sub { 2445 $ROOT->on_post_alloc ($self, sub {
2446 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2447
2151 if (delete $self->{need_reflow}) { 2448 if (delete $self->{need_reflow}) {
2152 my $height = 0; 2449 my $height = 0;
2153 2450
2154 $height += $_->[0] = $self->text_height ($_->[2]) 2451 my $layout = $self->{layout};
2452
2453 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2454
2155 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 }
2156 2466
2157 $self->{height} = $height; 2467 $self->{height} = $height;
2158 2468
2159 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2469 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2160 2470
2161 delete $self->{texture}; 2471 delete $self->{texture};
2162 } 2472 }
2163 2473
2164 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2474 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2165 glClearColor 0, 0, 0, 1; 2475 glClearColor 0.5, 0.5, 0.5, 0;
2166 glClear GL_COLOR_BUFFER_BIT; 2476 glClear GL_COLOR_BUFFER_BIT;
2167 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
2168 glEnable GL_BLEND; 2489 glEnable GL_BLEND;
2490 #TODO# not correct in windows where rgba is forced off
2169 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2491 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2170 glEnable GL_TEXTURE_2D;
2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2172
2173 my $top = int $self->{children}[1]{range}[0];
2174
2175 my $y0 = $top;
2176 my $y1 = $top + $self->{h};
2177
2178 my $y = 0;
2179
2180 my $layout = $self->{layout};
2181
2182 $layout->set_font ($self->{font}) if $self->{font};
2183 2492
2184 for my $par (@{$self->{par}}) { 2493 for my $par (@{$self->{par}}) {
2185 my $h = $par->[0]; 2494 my $h = $par->[1];
2186 2495
2187 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]);
2188 $layout->set_text ($par->[2]); 2499 $layout->set_markup ($par->[4]);
2189 2500
2190 glColor @{ $par->[1] }; 2501 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2191 my ($W, $H) = $layout->size; 2502
2192 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;
2193 } 2505 }
2194 2506
2195 $y += $h; 2507 $y += $h;
2196 } 2508 }
2197 2509
2198 glDisable GL_TEXTURE_2D;
2199 glDisable GL_BLEND; 2510 glDisable GL_BLEND;
2200 }; 2511 };
2201 }); 2512 });
2202} 2513}
2203 2514
2204sub _draw { 2515sub _draw {
2205 my ($self) = @_; 2516 my ($self) = @_;
2206 2517
2207 if ($self->{texture}) {
2208 glEnable GL_TEXTURE_2D; 2518 glEnable GL_TEXTURE_2D;
2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2519 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2210 glColor 1, 1, 1, 1; 2520 glColor 1, 1, 1, 1;
2211 $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});
2212 glDisable GL_TEXTURE_2D; 2522 glDisable GL_TEXTURE_2D;
2213 }
2214 2523
2215 $self->{children}[1]->draw; 2524 $self->{children}[1]->draw;
2216 2525
2217} 2526}
2218 2527
… …
2266 2575
2267sub new { 2576sub new {
2268 my $class = shift; 2577 my $class = shift;
2269 2578
2270 my $self = $class->SUPER::new ( 2579 my $self = $class->SUPER::new (
2271 state => 0, 2580 state => 0,
2272 connect_activate => \&toggle_flopper, 2581 on_activate => \&toggle_flopper,
2273 @_ 2582 @_
2274 ); 2583 );
2275 2584
2276 if ($self->{state}) {
2277 $self->{state} = 0;
2278 $self->toggle_flopper;
2279 }
2280
2281 $self 2585 $self
2282} 2586}
2283 2587
2284sub toggle_flopper { 2588sub toggle_flopper {
2285 my ($self) = @_; 2589 my ($self) = @_;
2286 2590
2287 # TODO: use animation 2591 $self->{other}->toggle_visibility;
2288 if ($self->{state} = !$self->{state}) {
2289 $CFClient::UI::ROOT->add ($self->{other});
2290 $self->{other}->move ($self->coord2global (0, $self->{h}));
2291 $self->emit ("open");
2292 } else {
2293 $CFClient::UI::ROOT->remove ($self->{other});
2294 $self->emit ("close");
2295 }
2296
2297 $self->emit (changed => $self->{state});
2298} 2592}
2299 2593
2300############################################################################# 2594#############################################################################
2301 2595
2302package CFClient::UI::Tooltip; 2596package CFClient::UI::Tooltip;
… …
2312 @_, 2606 @_,
2313 can_events => 0, 2607 can_events => 0,
2314 ) 2608 )
2315} 2609}
2316 2610
2317sub set_markup { 2611sub set_tooltip_from {
2318 my ($self, $text) = @_; 2612 my ($self, $widget) = @_;
2319 2613
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2614 $self->add (new CFClient::UI::Label
2321 $self->{label}->set_markup ($text); 2615 markup => $widget->{tooltip},
2322 $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 );
2323} 2622}
2324 2623
2325sub size_request { 2624sub size_request {
2326 my ($self) = @_; 2625 my ($self) = @_;
2327 2626
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2627 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331 2628
2332 ($w + 4, $h + 4) 2629 ($w + 4, $h + 4)
2333} 2630}
2334 2631
2335sub size_allocate { 2632sub size_allocate {
2336 my ($self, $w, $h) = @_; 2633 my ($self, $w, $h, $changed) = @_;
2337 2634
2635 return unless $changed;
2636
2338 $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 });
2339} 2656}
2340 2657
2341sub _draw { 2658sub _draw {
2342 my ($self) = @_; 2659 my ($self) = @_;
2343 2660
2344 glPushMatrix;
2345 glTranslate 0.375, 0.375; 2661 glTranslate 0.375, 0.375;
2346 2662
2347 my ($w, $h) = @$self{qw(w h)}; 2663 my ($w, $h) = @$self{qw(w h)};
2348 2664
2349 glColor 1, 0.8, 0.4; 2665 glColor 1, 0.8, 0.4;
… …
2360 glVertex 0 , $h; 2676 glVertex 0 , $h;
2361 glVertex $w, $h; 2677 glVertex $w, $h;
2362 glVertex $w, 0; 2678 glVertex $w, 0;
2363 glEnd; 2679 glEnd;
2364 2680
2365 glPopMatrix; 2681 glTranslate 2 - 0.375, 2 - 0.375;
2366 2682
2367 glTranslate 2, 2;
2368 $self->SUPER::_draw; 2683 $self->SUPER::_draw;
2369} 2684}
2370 2685
2371############################################################################# 2686#############################################################################
2372 2687
… …
2377use CFClient::OpenGL; 2692use CFClient::OpenGL;
2378 2693
2379sub new { 2694sub new {
2380 my $class = shift; 2695 my $class = shift;
2381 2696
2382 $class->SUPER::new ( 2697 my $self = $class->SUPER::new (
2383 aspect => 1, 2698 aspect => 1,
2699 can_events => 0,
2384 @_, 2700 @_,
2385 ) 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
2386} 2718}
2387 2719
2388sub size_request { 2720sub size_request {
2389 (32, 8) 2721 (32, 8)
2390} 2722}
2391 2723
2724sub update {
2725 my ($self) = @_;
2726
2727 return unless $self->{visible};
2728
2729 $self->SUPER::update;
2730}
2731
2392sub draw { 2732sub _draw {
2393 my ($self) = @_; 2733 my ($self) = @_;
2394 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
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2746 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2396 2747
2397 if ($tex) { 2748 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D; 2749 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1; 2751 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2752 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D; 2753 glDisable GL_TEXTURE_2D;
2405 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 @_,
2406 } 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;
2407} 2988}
2408 2989
2409############################################################################# 2990#############################################################################
2410 2991
2411package CFClient::UI::Root; 2992package CFClient::UI::Root;
2412 2993
2413our @ISA = CFClient::UI::Container::; 2994our @ISA = CFClient::UI::Container::;
2414 2995
2415use CFClient::OpenGL; 2996use CFClient::OpenGL;
2416 2997
2417sub check_size { 2998sub new {
2418 my ($self) = @_; 2999 my $class = shift;
2419 3000
2420 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3001 my $self = $class->SUPER::new (
2421} 3002 visible => 1,
3003 @_,
3004 );
2422 3005
2423sub size_request { 3006 Scalar::Util::weaken ($self->{root} = $self);
2424 ($::WIDTH, $::HEIGHT) 3007
3008 $self
2425} 3009}
2426 3010
2427sub configure { 3011sub configure {
2428 my ($self, $x, $y, $w, $h) = @_; 3012 my ($self, $x, $y, $w, $h) = @_;
2429 3013
2430 $self->SUPER::configure ($x, $y, $w, $h); 3014 $self->{w} = $w;
3015 $self->{h} = $h;
3016}
2431 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
2432 for my $child (@{$self->{children}}) { 3036 for my $child ($self->children) {
2433 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)};
2434 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
2435 $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;
2436 $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
2437 $child->configure ($X, $Y, $W,$H); 3050 $child->configure ($X, $Y, $W, $H);
2438 } 3051 }
2439} 3052}
2440 3053
2441sub _topleft { 3054sub coord2local {
2442 my ($self, $x, $y) = @_; 3055 my ($self, $x, $y) = @_;
2443 3056
2444 ($x, $y) 3057 ($x, $y)
2445} 3058}
2446 3059
3060sub coord2global {
3061 my ($self, $x, $y) = @_;
3062
3063 ($x, $y)
3064}
3065
2447sub update { 3066sub update {
2448 my ($self) = @_; 3067 my ($self) = @_;
2449 3068
2450 $self->check_size; 3069 $::WANT_REFRESH++;
2451 ::refresh ();
2452} 3070}
2453 3071
2454sub add { 3072sub add {
2455 my ($self, $child) = @_; 3073 my ($self, @children) = @_;
2456 3074
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1;
3077
2457 # integerize window positions 3078 # integerise window positions
2458 $child->{x} = int $child->{x}; 3079 $child->{x} = int $child->{x};
2459 $child->{y} = int $child->{y}; 3080 $child->{y} = int $child->{y};
3081 }
2460 3082
2461 $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 }
2462} 3096}
2463 3097
2464sub on_refresh { 3098sub on_refresh {
2465 my ($self, $id, $cb) = @_; 3099 my ($self, $id, $cb) = @_;
2466 3100
2467 $self->{refresh_hook}{$id} = $cb; 3101 $self->{refresh_hook}{$id} = $cb;
2468} 3102}
2469 3103
3104sub on_post_alloc {
3105 my ($self, $id, $cb) = @_;
3106
3107 $self->{post_alloc_hook}{$id} = $cb;
3108}
3109
2470sub draw { 3110sub draw {
2471 my ($self) = @_; 3111 my ($self) = @_;
2472 3112
2473 while (my $rcb = delete $self->{refresh_hook}) { 3113 while ($self->{refresh_hook}) {
2474 $_->() 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}};
2475 } 3171 }
2476 3172
2477 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3173 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2478 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2479 glClear GL_COLOR_BUFFER_BIT; 3175 glClear GL_COLOR_BUFFER_BIT;
2480 3176
2481 glMatrixMode GL_PROJECTION; 3177 glMatrixMode GL_PROJECTION;
2482 glLoadIdentity; 3178 glLoadIdentity;
2483 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3179 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2484 glMatrixMode GL_MODELVIEW; 3180 glMatrixMode GL_MODELVIEW;
2485 glLoadIdentity; 3181 glLoadIdentity;
2486 3182
2487 $self->_draw; 3183 $self->_draw;
2488} 3184}
… …
2490############################################################################# 3186#############################################################################
2491 3187
2492package CFClient::UI; 3188package CFClient::UI;
2493 3189
2494$ROOT = new CFClient::UI::Root; 3190$ROOT = new CFClient::UI::Root;
2495$TOOLTIP = new CFClient::UI::Tooltip; 3191$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2496 3192
24971 31931
2498 3194

Diff Legend

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