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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 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;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
16sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
17 if (!$GRAB) { 47 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
22 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
23 54
24 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
25 56
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 58
28 $TOOLTIP->set_markup ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31 } 61 }
32 62
33 return; 63 return;
34 } 64 }
… …
39 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
40} 70}
41 71
42# class methods for events 72# class methods for events
43sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 75 if $FOCUS;
46} 76}
47 77
48sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 80 if $FOCUS;
51} 81}
52 82
53sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
54 my ($ev) = @_; 84 my ($ev) = @_;
… …
63 check_tooltip; 93 check_tooltip;
64 } 94 }
65 95
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 97
68 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 100}
73 101
74sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
75 my ($ev) = @_; 103 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
77 105
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 107
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 109
82 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 112
87 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 115 $grab->update if $grab;
90 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 133
108 check_tooltip; 134 check_tooltip;
109 } 135 }
110 136
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 138 if $HOVER;
115} 139}
116 140
117# convert position array to integers 141# convert position array to integers
118sub harmonize { 142sub harmonize {
119 my ($vals) = @_; 143 my ($vals) = @_;
… …
125 $rem += $_ - $i; 149 $rem += $_ - $i;
126 $_ = $i; 150 $_ = $i;
127 } 151 }
128} 152}
129 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
130############################################################################# 195#############################################################################
131 196
132package CFClient::UI::Base; 197package CFClient::UI::Base;
133 198
134use strict; 199use strict;
… …
137 202
138sub new { 203sub new {
139 my $class = shift; 204 my $class = shift;
140 205
141 my $self = bless { 206 my $self = bless {
142 x => 0, 207 x => "center",
143 y => 0, 208 y => "center",
144 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
145 can_events => 1, 212 can_events => 1,
146 @_ 213 @_
147 }, $class; 214 }, $class;
148 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
149 for (keys %$self) { 218 for (keys %$self) {
150 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
152 } 221 }
153 } 222 }
154 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
155 $self 236 $self
156} 237}
157 238
158sub destroy { 239sub destroy {
159 my ($self) = @_; 240 my ($self) = @_;
… …
168 return if $self->{parent}; 249 return if $self->{parent};
169 250
170 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
171} 252}
172 253
173sub hide { 254sub set_visible {
174 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
175 278
176 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
178 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
179 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
180 if $self->{parent}; 313 if $self->{parent};
181} 314}
182 315
183sub move { 316sub move_abs {
184 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
185 318
186 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
189 322
190 $self->update; 323 $self->update;
191} 324}
192 325
193sub set_size { 326sub set_size {
194 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
195 328
196 $self->{user_w} = $w; 329 $self->{force_w} = $w;
197 $self->{user_h} = $h; 330 $self->{force_h} = $h;
198 331
199 $self->check_size; 332 $self->realloc;
200} 333}
201 334
202sub size_request { 335sub size_request {
203 require Carp; 336 require Carp;
204 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
206 339
207sub configure { 340sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
209 342
210 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
213 348
214 # use alignment to adjust x, y 349 # use alignment to adjust x, y
215 350
216 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 353 }
221 354
222 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 356 $self->{x} = $x;
224 $self->{y} = $y; 357 $self->{y} = $y;
225 $self->update; 358 $self->update;
226 } 359 }
227 360
228 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
229 $self->{w} = $w; 364 $self->{alloc_w} = $w;
230 $self->{h} = $h; 365 $self->{alloc_h} = $h;
231 366
232 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 368 }
235} 369}
236 370
237sub size_allocate { 371sub size_allocate {
238 # nothing to be done 372 # nothing to be done
239} 373}
240 374
241sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
242} 381}
243 382
244sub set_max_size { 383sub set_max_size {
245 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
246 385
247 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
249} 388}
250 389
251# return top left coordinates 390sub set_tooltip {
252sub _topleft {
253 my ($self, $x, $y) = @_; 391 my ($self, $tooltip) = @_;
254 392
255 $self->{parent} 393 $tooltip =~ s/^\s+//;
256 or Carp::confess "no parent widget in _topleft\n";#d# 394 $tooltip =~ s/\s+$//;
257 395
258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 396 return if $self->{tooltip} eq $tooltip;
397
398 $self->{tooltip} = $tooltip;
399
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip;
403 }
259} 404}
260 405
261# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
262sub coord2local { 407sub coord2local {
263 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
264 409
265 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266 ($x - $X, $y - $Y)
267} 411}
268 412
269# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
270sub coord2global { 414sub coord2global {
271 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
272 416
273 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274 ($x + $X, $y + $Y)
275} 418}
276 419
277sub focus_in { 420sub focus_in {
278 my ($self) = @_; 421 my ($self) = @_;
279 422
280 return if $FOCUS == $self; 423 return if $FOCUS == $self;
281 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
282 425
283 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
284 427
285 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
286 429
287 $focus->update if $focus; 430 $focus->update if $focus;
288 $FOCUS->update; 431 $FOCUS->update;
289} 432}
290 433
… …
293 436
294 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
295 438
296 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
297 440
298 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
299 442
300 $focus->update if $focus; #? 443 $focus->update if $focus; #?
301}
302 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
303sub mouse_motion { } 449sub mouse_motion { 0 }
304sub button_up { } 450sub button_up { 0 }
305sub key_down { } 451sub key_down { 0 }
306sub key_up { } 452sub key_up { 0 }
307 453
308sub button_down { 454sub button_down {
309 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
310 456
311 $self->focus_in; 457 $self->focus_in;
312}
313 458
314sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
315sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
316sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
317sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
318sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
319 535
320sub draw { 536sub draw {
321 my ($self) = @_; 537 my ($self) = @_;
322 538
323 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
324 550
325 glPushMatrix; 551 glPushMatrix;
326 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
327 $self->_draw; 553 $self->_draw;
328 glPopMatrix; 554 glPopMatrix;
… …
340 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
341 glEnd; 567 glEnd;
342 glDisable GL_BLEND; 568 glDisable GL_BLEND;
343 } 569 }
344 570
345 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
346 glPushMatrix; 572 glPushMatrix;
347 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
348 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
349 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
350 glVertex 0 , 0; 576 glVertex 0 , 0;
351 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
352 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
353 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
354 glEnd; 580 glEnd;
355 glPopMatrix; 581 glPopMatrix;
356 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
357 } 583 }
358} 584}
359 585
360sub _draw { 586sub _draw {
361 my ($self) = @_; 587 my ($self) = @_;
362 588
363 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
364} 590}
365 591
366sub find_widget {
367 my ($self, $x, $y) = @_;
368
369 return () unless $self->{can_events};
370
371 return $self
372 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
373 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
374
375 ()
376}
377
378sub set_parent {
379 my ($self, $parent) = @_;
380
381 Scalar::Util::weaken ($self->{parent} = $parent);
382}
383
384sub check_size {
385 my ($self) = @_;
386
387 $self->{parent}
388 or return 1;
389
390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
393
394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
395 $self->{req_w} = $w;
396 $self->{req_h} = $h;
397
398 $self->{parent}->check_size
399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
407 }
408}
409
410sub update {
411 my ($self) = @_;
412
413 $self->{parent}->update
414 if $self->{parent};
415}
416
417sub connect {
418 my ($self, $signal, $cb) = @_;
419
420 push @{ $self->{signal_cb}{$signal} }, $cb;
421}
422
423sub emit {
424 my ($self, $signal, @args) = @_;
425
426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
427}
428
429sub DESTROY { 592sub DESTROY {
430 my ($self) = @_; 593 my ($self) = @_;
431 594
595 delete $WIDGET{$self+0};
432 #$self->deactivate; 596 #$self->deactivate;
433} 597}
434 598
435############################################################################# 599#############################################################################
436 600
… …
445 my $class = shift; 609 my $class = shift;
446 610
447 # range [value, low, high, page] 611 # range [value, low, high, page]
448 612
449 $class->SUPER::new ( 613 $class->SUPER::new (
450 bg => [0, 0, 0, 0.2], 614 #bg => [0, 0, 0, 0.2],
451 active_bg => [1, 1, 1, 0.5], 615 #active_bg => [1, 1, 1, 0.5],
452 @_ 616 @_
453 ) 617 )
454} 618}
455 619
456sub _draw { 620sub _draw {
457 my ($self) = @_; 621 my ($self) = @_;
458 622
623 my $color = $FOCUS == $self && $self->{active_bg}
624 ? $self->{active_bg}
625 : $self->{bg};
626
627 if ($color && (@$color < 4 || $color->[3])) {
459 my ($w, $h) = @$self{qw(w h)}; 628 my ($w, $h) = @$self{qw(w h)};
460 629
461 glEnable GL_BLEND; 630 glEnable GL_BLEND;
462 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
463 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 632 glColor @$color;
464 633
465 glBegin GL_QUADS; 634 glBegin GL_QUADS;
466 glVertex 0 , 0; 635 glVertex 0 , 0;
467 glVertex 0 , $h; 636 glVertex 0 , $h;
468 glVertex $w, $h; 637 glVertex $w, $h;
469 glVertex $w, 0; 638 glVertex $w, 0;
470 glEnd; 639 glEnd;
471 640
472 glDisable GL_BLEND; 641 glDisable GL_BLEND;
642 }
473} 643}
474 644
475############################################################################# 645#############################################################################
476 646
477package CFClient::UI::Empty; 647package CFClient::UI::Empty;
… …
482 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
483 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
484} 654}
485 655
486sub size_request { 656sub size_request {
487 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
488} 660}
489 661
490sub draw { } 662sub draw { }
491 663
492############################################################################# 664#############################################################################
… …
496our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
497 669
498sub new { 670sub new {
499 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
500 672
501 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
502 674
503 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
504 children => [], 676 children => [],
505 can_events => 0, 677 can_events => 0,
506 %arg, 678 %arg,
507 ); 679 );
680
508 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
509 683
510 $self 684 $self
511} 685}
512 686
513sub add { 687sub add {
514 my ($self, $child) = @_; 688 my ($self, @widgets) = @_;
515 689
516 $child->set_parent ($self); 690 $_->set_parent ($self)
691 for @widgets;
517 692
518 use sort 'stable'; 693 use sort 'stable';
519 694
520 $self->{children} = [ 695 $self->{children} = [
521 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
522 @{$self->{children}}, $child 697 @{$self->{children}}, @widgets
523 ]; 698 ];
524 699
525 $child->check_size; 700 $self->realloc;
526} 701}
527 702
528sub children { 703sub children {
529 @{ $_[0]{children} } 704 @{ $_[0]{children} }
530} 705}
… …
535 delete $child->{parent}; 710 delete $child->{parent};
536 $child->hide; 711 $child->hide;
537 712
538 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
539 714
540 $self->check_size; 715 $self->realloc;
541 $self->update;
542} 716}
543 717
544sub clear { 718sub clear {
545 my ($self) = @_; 719 my ($self) = @_;
546 720
… …
549 723
550 for (@$children) { 724 for (@$children) {
551 delete $_->{parent}; 725 delete $_->{parent};
552 $_->hide; 726 $_->hide;
553 } 727 }
728
729 $self->realloc;
554} 730}
555 731
556sub find_widget { 732sub find_widget {
557 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
558 734
559 $x -= $self->{x}; 735 $x -= $self->{x};
560 $y -= $self->{y}; 736 $y -= $self->{y};
561 737
562 my $res; 738 my $res;
563 739
564 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
565 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
566 and return $res; 742 and return $res;
567 } 743 }
568 744
569 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
618 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
619} 795}
620 796
621############################################################################# 797#############################################################################
622 798
799# back-buffered drawing area
800
623package CFClient::UI::Window; 801package CFClient::UI::Window;
624 802
625our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
626 804
627use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
633} 811}
634 812
635sub update { 813sub update {
636 my ($self) = @_; 814 my ($self) = @_;
637 815
638 # we want to do this delayed... 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 817 $self->SUPER::update;
641}
642
643sub render_chld {
644 my ($self) = @_;
645
646 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647 glClearColor 0, 0, 0, 1;
648 glClear GL_COLOR_BUFFER_BIT;
649 $self->child->draw;
650 };
651} 818}
652 819
653sub size_allocate { 820sub size_allocate {
654 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
655 822
656 $self->child->configure (0, 0, $w, $h); 823 $self->SUPER::size_allocate ($w, $h);
824 $self->update;
825}
657 826
827sub _render {
828 my ($self) = @_;
829
830 $self->{children}[0]->draw;
831}
832
833sub render_child {
834 my ($self) = @_;
835
836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
837 glClearColor 0, 0, 0, 0;
838 glClear GL_COLOR_BUFFER_BIT;
839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
658 $self->render_chld; 847 $self->_render;
848 };
659} 849}
660 850
661sub _draw { 851sub _draw {
662 my ($self) = @_; 852 my ($self) = @_;
663 853
664 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
665 855
666 my $tex = $self->{texture} 856 my $tex = $self->{texture}
667 or return; 857 or return;
668 858
669 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861 glColor 1, 1, 1, 1;
673 862
674 $tex->draw_quad (0, 0, $w, $h); 863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675 864
676 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 865 glDisable GL_TEXTURE_2D;
678} 866}
679 867
680############################################################################# 868#############################################################################
681 869
682package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
683 871
684our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
685
686sub new { die }
687
688sub size_request {
689 my ($self) = @_;
690
691 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
693
694 @$self{qw(child_w child_h)}
695}
696
697sub _draw {
698 my ($self) = @_;
699
700 $self->{children}[1]->draw;
701}
702
703
704#############################################################################
705
706package CFClient::UI::Frame;
707
708our @ISA = CFClient::UI::Bin::;
709
710use CFClient::OpenGL;
711 873
712sub new { 874sub new {
713 my $class = shift; 875 my $class = shift;
714 876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
884sub size_request {
885 my ($self) = @_;
886
887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
888
889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
893}
894
895sub size_allocate {
896 my ($self, $w, $h) = @_;
897
898 my $child = $self->child;
899
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902
903 $self->child->configure (0, 0, $w, $h);
904 $self->update;
905}
906
907sub set_offset {
908 my ($self, $x, $y) = @_;
909
910 $self->{view_x} = int $x;
911 $self->{view_y} = int $y;
912
913 $self->update;
914}
915
916# hmm, this does not work for topleft of $self... but we should not ask for that
917sub coord2local {
918 my ($self, $x, $y) = @_;
919
920 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
921}
922
923sub coord2global {
924 my ($self, $x, $y) = @_;
925
926 $x = List::Util::min $self->{w}, $x - $self->{view_x};
927 $y = List::Util::min $self->{h}, $y - $self->{view_y};
928
929 $self->SUPER::coord2global ($x, $y)
930}
931
932sub find_widget {
933 my ($self, $x, $y) = @_;
934
935 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
937 ) {
938 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939 } else {
940 $self->CFClient::UI::Base::find_widget ($x, $y)
941 }
942}
943
944sub _render {
945 my ($self) = @_;
946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951
952 $self->SUPER::_render;
953}
954
955#############################################################################
956
957package CFClient::UI::ScrolledWindow;
958
959our @ISA = CFClient::UI::HBox::;
960
961sub new {
962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
965
966 my $self;
967
968 my $slider = new CFClient::UI::Slider
969 vertical => 1,
970 range => [0, 0, 1, 0.01], # HACK fix
971 on_changed => sub {
972 $self->{vp}->set_offset (0, $_[1]);
973 },
974 ;
975
715 my $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
716 bg => [1, 1, 1, 1], 977 vp => (new CFClient::UI::ViewPort expand => 1),
717 border_bg => [1, 1, 1, 1], 978 slider => $slider,
718 border => 0.8, 979 %arg,
719 @_
720 ); 980 );
721 981
982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
984
722 $self 985 $self
723} 986}
724 987
725sub _draw { 988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
992}
993
994sub update {
995 my ($self) = @_;
996
997 $self->SUPER::update;
998
999 # todo: overwrite size_allocate of child
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002}
1003
1004sub size_allocate {
726 my ($self) = @_; 1005 my ($self, $w, $h) = @_;
727 1006
728 my ($w, $h) = ($self->{w}, $self->{h}); 1007 $self->SUPER::size_allocate ($w, $h);
729 1008
730 glEnable GL_BLEND; 1009 my $child = $self->{vp}->child;
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1010 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
732 glEnable GL_TEXTURE_2D;
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734
735# glBegin GL_QUADS;
736# glColor 0, 0, 0, 0;
737# glVertex 0 , 0;
738# glVertex 0 , $h;
739# glVertex $w, $h;
740# glVertex $w, 0;
741# glEnd;
742
743
744 $self->child->draw;
745 glDisable GL_BLEND;
746 glDisable GL_TEXTURE_2D;
747} 1011}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
748 1015
749############################################################################# 1016#############################################################################
750 1017
751package CFClient::UI::FancyFrame; 1018package CFClient::UI::Frame;
752 1019
753our @ISA = CFClient::UI::Bin::; 1020our @ISA = CFClient::UI::Bin::;
754 1021
755use CFClient::OpenGL; 1022use CFClient::OpenGL;
756
757my @tex =
758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
759 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
760 1023
761sub new { 1024sub new {
762 my $class = shift; 1025 my $class = shift;
763 1026
764 # TODO: user_x, user_y, overwrite moveto? 1027 $class->SUPER::new (
1028 bg => undef,
1029 @_,
1030 )
1031}
1032
1033sub _draw {
1034 my ($self) = @_;
1035
1036 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)};
1038
1039 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} };
1042
1043 glBegin GL_QUADS;
1044 glVertex 0 , 0;
1045 glVertex 0 , $h;
1046 glVertex $w, $h;
1047 glVertex $w, 0;
1048 glEnd;
1049
1050 glDisable GL_BLEND;
1051 }
1052
1053 $self->SUPER::_draw;
1054}
1055
1056#############################################################################
1057
1058package CFClient::UI::FancyFrame;
1059
1060our @ISA = CFClient::UI::Bin::;
1061
1062use CFClient::OpenGL;
1063
1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071
1072sub new {
1073 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
765 1076
766 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
769 border => 0.8, 1080 border => 0.6,
770 can_events => 1, 1081 can_events => 1,
771 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
772 ); 1085 );
773 1086
774 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
775 align => 0, 1088 align => 0,
776 valign => 1, 1089 valign => 1,
777 text => $self->{title}, 1090 text => $title,
778 fontsize => 1; 1091 fontsize => $self->{border}
1092 if defined $title;
779 1093
780 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
781} 1102}
782 1103
783sub border { 1104sub border {
784 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
785} 1106}
786 1107
787sub size_request { 1108sub size_request {
788 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
789 1113
790 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
791 1115
792 ( 1116 (
793 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
796} 1120}
797 1121
798sub size_allocate { 1122sub size_allocate {
799 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
800 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
801 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
802 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
803 1135
804 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
805 if $self->{title};
806
807 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
808} 1137}
809 1138
810sub button_down { 1139sub button_down {
811 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
812 1141
1142 my ($w, $h) = @$self{qw(w h)};
813 my $border = $self->border; 1143 my $border = $self->border;
814 1144
815 if ($x < $self->{w} && $x >= $self->{w} - $border 1145 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816 && $y < $self->{h} && $y >= $self->{h} - $border) { 1146 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817 1147
1148 if ($lr & $td) {
1149 my ($wx, $wy) = ($self->{x}, $self->{y});
818 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1150 my ($ox, $oy) = ($ev->{x}, $ev->{y});
819 my ($bw, $bh) = ($self->{w}, $self->{h}); 1151 my ($bw, $bh) = ($self->{w}, $self->{h});
820 1152
1153 my $mx = $x < $border;
1154 my $my = $y < $border;
1155
821 $self->{motion} = sub { 1156 $self->{motion} = sub {
822 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
823 1158
824 ($x, $y) = ($ev->{x}, $ev->{y}); 1159 my $dx = $ev->{x} - $ox;
1160 my $dy = $ev->{y} - $oy;
825 1161
826 $self->{user_w} = $bw + $x - $ox; 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
827 $self->{user_h} = $bh + $y - $oy; 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
828 $self->check_size; 1164
1165 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
829 }; 1167 };
830 1168
831 } elsif ($x >= 0 && $x < $self->{w} 1169 } elsif ($lr ^ $td) {
832 && $y >= 0 && $y < $border) {
833
834 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
835 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
836 1172
837 $self->{motion} = sub { 1173 $self->{motion} = sub {
838 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
839 1175
840 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
841 1177
842 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
843 $self->update;
844 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
845 } 1184 1
846} 1185}
847 1186
848sub button_up { 1187sub button_up {
849 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
850 1189
851 delete $self->{motion}; 1190 !!delete $self->{motion}
852} 1191}
853 1192
854sub mouse_motion { 1193sub mouse_motion {
855 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
856 1195
857 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
858} 1199}
859 1200
860sub _draw { 1201sub _draw {
861 my ($self) = @_; 1202 my ($self) = @_;
862 1203
1204 my $child = $self->{children}[0];
1205
863 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
864 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
865 1208
866 glEnable GL_BLEND;
867 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
868 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
870 1211
871 my $border = $self->border; 1212 my $border = $self->border;
872 1213
873 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
874 $tex[1]->draw_quad (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
875 $tex[3]->draw_quad (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
877 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
878 1219
879 my $bg = $tex[0]; 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1221 glColor @{ $self->{bg} };
880 1222
881 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
882 my $rep_x = $cw / $bg->{w}; 1224 # solve this better(?)
883 my $rep_y = $ch / $bg->{h}; 1225 $bg->{s} = $cw / $bg->{w};
884 1226 $bg->{t} = $ch / $bg->{h};
885 glColor @{ $self->{bg} };
886
887 $bg->{s} = $rep_x;
888 $bg->{t} = $rep_y;
889 $bg->{wrap_mode} = 1;
890 $bg->draw_quad ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1228 }
891 1229
892 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
893 glDisable GL_BLEND;
894 1231
895 $self->{title}->draw if $self->{title};
896 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
897} 1238}
898 1239
899############################################################################# 1240#############################################################################
900 1241
901package CFClient::UI::Table; 1242package CFClient::UI::Table;
… …
909sub new { 1250sub new {
910 my $class = shift; 1251 my $class = shift;
911 1252
912 $class->SUPER::new ( 1253 $class->SUPER::new (
913 col_expand => [], 1254 col_expand => [],
914 @_ 1255 @_,
915 ) 1256 )
1257}
1258
1259sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} }
916} 1261}
917 1262
918sub add { 1263sub add {
919 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
920 1265
921 $child->set_parent ($self); 1266 $child->set_parent ($self);
922 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
923 1268
924 $child->check_size; 1269 $self->realloc;
925} 1270}
926 1271
927sub children {
928 grep $_, map @$_, grep $_, @{ $_[0]{children} }
929}
930
931# TODO: move to container class maybe? send childs a signal on removal? 1272# TODO: move to container class maybe? send children a signal on removal?
932sub clear { 1273sub clear {
933 my ($self) = @_; 1274 my ($self) = @_;
934 1275
935 my @children = $self->children; 1276 my @children = $self->children;
936 delete $self->{children}; 1277 delete $self->{children};
… …
938 for (@children) { 1279 for (@children) {
939 delete $_->{parent}; 1280 delete $_->{parent};
940 $_->hide; 1281 $_->hide;
941 } 1282 }
942 1283
943 $self->update; 1284 $self->realloc;
944} 1285}
945 1286
946sub get_wh { 1287sub get_wh {
947 my ($self) = @_; 1288 my ($self) = @_;
948 1289
… …
979sub size_allocate { 1320sub size_allocate {
980 my ($self, $w, $h) = @_; 1321 my ($self, $w, $h) = @_;
981 1322
982 my ($ws, $hs) = $self->get_wh; 1323 my ($ws, $hs) = $self->get_wh;
983 1324
984 my $req_w = sum @$ws; 1325 my $req_w = (sum @$ws) || 1;
985 my $req_h = sum @$hs; 1326 my $req_h = (sum @$hs) || 1;
986 1327
987 # TODO: nicer code && do row_expand 1328 # TODO: nicer code && do row_expand
988 my @col_expand = @{$self->{col_expand}}; 1329 my @col_expand = @{$self->{col_expand}};
989 @col_expand = (1) x @$ws unless @col_expand; 1330 @col_expand = (1) x @$ws unless @col_expand;
990 my $col_expand = (sum @col_expand) || 1; 1331 my $col_expand = (sum @col_expand) || 1;
… …
1044 } 1385 }
1045} 1386}
1046 1387
1047############################################################################# 1388#############################################################################
1048 1389
1049package CFClient::UI::HBox; 1390package CFClient::UI::Box;
1050
1051# TODO: wrap into common Box base class
1052 1391
1053our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Container::;
1054 1393
1055sub size_request { 1394sub size_request {
1056 my ($self) = @_; 1395 my ($self) = @_;
1057 1396
1058 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $self->{vertical}
1059 1398 ? (
1060 ( 1399 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1061 (List::Util::sum map $_->[0], @alloc), 1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1062 (List::Util::max map $_->[1], @alloc), 1401 )
1063 ) 1402 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 )
1064} 1406}
1065 1407
1066sub size_allocate { 1408sub size_allocate {
1067 my ($self, $w, $h) = @_; 1409 my ($self, $w, $h) = @_;
1068 1410
1069 ($h, $w) = ($w, $h); 1411 my $space = $self->{vertical} ? $h : $w;
1070
1071 my $children = $self->{children}; 1412 my $children = $self->{children};
1072 1413
1073 my @h = map $_->{req_w}, @$children; 1414 my @req;
1074 1415
1075 my $req_h = List::Util::sum @h; 1416 if ($self->{homogeneous}) {
1076 1417 @req = ($space / (@$children || 1)) x @$children;
1077 if ($req_h > $h) {
1078 # ah well, not enough space
1079 $_ *= $h / $req_h for @h;
1080 } else { 1418 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1420 my $req = List::Util::sum @req;
1421
1422 if ($req > $space) {
1423 # ah well, not enough space
1424 $_ *= $space / $req for @req;
1425 } else {
1081 my $exp = List::Util::sum map $_->{expand}, @$children; 1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1082 $exp ||= 1;
1083 1427
1428 $space = ($space - $req) / $expand; # remaining space to give away
1429
1430 $req[$_] += $space * $children->[$_]{expand}
1084 for (0 .. $#$children) { 1431 for 0 .. $#$children;
1085 my $child = $children->[$_];
1086
1087 my $alloc_h = $h[$_];
1088 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1089 $h[$_] = $alloc_h;
1090 } 1432 }
1091 } 1433 }
1092 1434
1093 CFClient::UI::harmonize \@h; 1435 CFClient::UI::harmonize \@req;
1094 1436
1095 my $y = 0; 1437 my $pos = 0;
1096 for (0 .. $#$children) { 1438 for (0 .. $#$children) {
1097 my $child = $children->[$_];
1098 my $h = $h[$_]; 1439 my $alloc = $req[$_];
1099 $child->configure ($y, 0, $h, $w); 1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1100 1441
1101 $y += $h; 1442 $pos += $alloc;
1102 } 1443 }
1103 1444
1104 1 1445 1
1105} 1446}
1106 1447
1107############################################################################# 1448#############################################################################
1108 1449
1450package CFClient::UI::HBox;
1451
1452our @ISA = CFClient::UI::Box::;
1453
1454sub new {
1455 my $class = shift;
1456
1457 $class->SUPER::new (
1458 vertical => 0,
1459 @_,
1460 )
1461}
1462
1463#############################################################################
1464
1109package CFClient::UI::VBox; 1465package CFClient::UI::VBox;
1110 1466
1111# TODO: wrap into common Box base class
1112
1113our @ISA = CFClient::UI::Container::; 1467our @ISA = CFClient::UI::Box::;
1114 1468
1115sub size_request { 1469sub new {
1116 my ($self) = @_; 1470 my $class = shift;
1117 1471
1118 my @alloc = map [$_->size_request], @{$self->{children}}; 1472 $class->SUPER::new (
1119 1473 vertical => 1,
1120 ( 1474 @_,
1121 (List::Util::max map $_->[0], @alloc),
1122 (List::Util::sum map $_->[1], @alloc),
1123 ) 1475 )
1124} 1476}
1125 1477
1126sub size_allocate {
1127 my ($self, $w, $h) = @_;
1128
1129 my $children = $self->{children};
1130
1131 my @h = map $_->{req_h}, @$children;
1132
1133 my $req_h = List::Util::sum @h;
1134
1135 if ($req_h > $h) {
1136 # ah well, not enough space
1137 $_ *= $h / $req_h for @h;
1138 } else {
1139 my $exp = List::Util::sum map $_->{expand}, @$children;
1140 $exp ||= 1;
1141
1142 for (0 .. $#$children) {
1143 my $child = $children->[$_];
1144
1145 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1146 }
1147 }
1148
1149 CFClient::UI::harmonize \@h;
1150
1151 my $y = 0;
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154 my $h = $h[$_];
1155 $child->configure (0, $y, $w, $h);
1156
1157 $y += $h;
1158 }
1159
1160 1
1161}
1162
1163############################################################################# 1478#############################################################################
1164 1479
1165package CFClient::UI::Label; 1480package CFClient::UI::Label;
1166 1481
1167our @ISA = CFClient::UI::Base::; 1482our @ISA = CFClient::UI::DrawBG::;
1168 1483
1169use CFClient::OpenGL; 1484use CFClient::OpenGL;
1170 1485
1171sub new { 1486sub new {
1172 my ($class, %arg) = @_; 1487 my ($class, %arg) = @_;
1173 1488
1174 my $self = $class->SUPER::new ( 1489 my $self = $class->SUPER::new (
1175 fg => [1, 1, 1], 1490 fg => [1, 1, 1],
1491 #bg => none
1492 #active_bg => none
1176 #font => default_font 1493 #font => default_font
1494 #text => initial text
1495 #markup => initial narkup
1496 #max_w => maximum pixel width
1497 ellipsise => 3, # end
1498 layout => (new CFClient::Layout),
1177 fontsize => 1, 1499 fontsize => 1,
1178 text => "",
1179 align => -1, 1500 align => -1,
1180 valign => -1, 1501 valign => -1,
1181 padding => 2, 1502 padding_x => 2,
1182 layout => new CFClient::Layout, 1503 padding_y => 2,
1183 can_events => 0, 1504 can_events => 0,
1184 %arg 1505 %arg
1185 ); 1506 );
1186 1507
1187 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
1188 my $layout = new CFClient::Layout; 1509 my $layout = new CFClient::Layout;
1189 $layout->set_text (delete $self->{template}); 1510 $layout->set_text (delete $self->{template});
1190 $self->{template} = $layout; 1511 $self->{template} = $layout;
1191 } 1512 }
1192 1513
1193 $self->set_text (delete $self->{text}) if exists $self->{text}; 1514 if (exists $self->{markup}) {
1194 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1515 $self->set_markup (delete $self->{markup});
1516 } else {
1517 $self->set_text (delete $self->{text});
1518 }
1195 1519
1196 $self 1520 $self
1197} 1521}
1198 1522
1199sub escape { 1523sub escape($) {
1200 local $_ = $_[1]; 1524 local $_ = $_[0];
1201 1525
1202 s/&/&amp;/g; 1526 s/&/&amp;/g;
1203 s/>/&gt;/g; 1527 s/>/&gt;/g;
1204 s/</&lt;/g; 1528 s/</&lt;/g;
1205 1529
1206 $_[1] 1530 $_
1531}
1532
1533sub update {
1534 my ($self) = @_;
1535
1536 delete $self->{texture};
1537 $self->SUPER::update;
1207} 1538}
1208 1539
1209sub set_text { 1540sub set_text {
1210 my ($self, $text) = @_; 1541 my ($self, $text) = @_;
1211 1542
1543 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text";
1545
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1212 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1213 1548
1214 delete $self->{texture}; 1549 $self->realloc;
1215 $self->check_size;
1216 $self->update; 1550 $self->update;
1217} 1551}
1218 1552
1219sub set_markup { 1553sub set_markup {
1220 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1221 1555
1556 return if $self->{text} eq "M$markup";
1557 $self->{text} = "M$markup";
1558
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1222 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1223 1563
1224 delete $self->{texture}; 1564 $self->realloc;
1225 $self->check_size;
1226 $self->update; 1565 $self->update;
1227} 1566}
1228 1567
1229sub size_request { 1568sub size_request {
1230 my ($self) = @_; 1569 my ($self) = @_;
1231 1570
1232 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1571 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $self->{layout}->set_width ($self->{max_w} || -1); 1572 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1235 1576
1236 my ($w, $h) = $self->{layout}->size; 1577 my ($w, $h) = $self->{layout}->size;
1237 1578
1238 if (exists $self->{template}) { 1579 if (exists $self->{template}) {
… …
1243 1584
1244 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1245 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1246 } 1587 }
1247 1588
1248 ( 1589 ($w, $h)
1249 $w + $self->{padding} * 2,
1250 $h + $self->{padding} * 2,
1251 )
1252} 1590}
1253 1591
1254sub size_allocate { 1592sub size_allocate {
1255 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1256 1594
1595 delete $self->{ox};
1596
1257 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1258} 1599}
1259 1600
1260sub set_fontsize { 1601sub set_fontsize {
1261 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1262 1603
1263 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1264 delete $self->{texture}; 1605 delete $self->{texture};
1265 $self->check_size; 1606
1266 $self->update; 1607 $self->realloc;
1267} 1608}
1268 1609
1269sub _draw { 1610sub _draw {
1270 my ($self) = @_; 1611 my ($self) = @_;
1271 1612
1613 $self->SUPER::_draw; # draw background, if applicable
1614
1272 my $tex = $self->{texture} ||= do { 1615 my $tex = $self->{texture} ||= do {
1616 $self->{layout}->set_foreground (@{$self->{fg}});
1273 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1617 $self->{layout}->set_font ($self->{font}) if $self->{font};
1274 $self->{layout}->set_width ($self->{w}); 1618 $self->{layout}->set_width ($self->{w});
1619 $self->{layout}->set_ellipsise ($self->{ellipsise});
1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1622
1276 new_from_layout CFClient::Texture $self->{layout} 1623 new_from_layout CFClient::Texture $self->{layout}
1277 }; 1624 };
1278 1625
1279 glEnable GL_BLEND; 1626 unless (exists $self->{ox}) {
1280 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1629 : ($self->{w} - $tex->{w}) * 0.5);
1630
1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1633 : ($self->{h} - $tex->{h}) * 0.5);
1634 };
1635
1281 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283 1638
1639 if ($tex->{format} == GL_ALPHA) {
1284 glColor @{$self->{fg}}; 1640 glColor @{$self->{fg}};
1285
1286 $self->{ox} = int (
1287 $self->{align} < 0 ? $self->{padding}
1288 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1289 : ($self->{w} - $tex->{w}) * 0.5
1290 );
1291
1292 $self->{oy} = int (
1293 $self->{valign} < 0 ? $self->{padding}
1294 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1295 : ($self->{h} - $tex->{h}) * 0.5
1296 );
1297
1298 $tex->draw_quad ($self->{ox}, $self->{oy}); 1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 }
1299 1645
1300 glDisable GL_TEXTURE_2D; 1646 glDisable GL_TEXTURE_2D;
1301 glDisable GL_BLEND;
1302} 1647}
1303 1648
1304############################################################################# 1649#############################################################################
1305 1650
1306package CFClient::UI::EntryBase; 1651package CFClient::UI::EntryBase;
… …
1319 active_fg => [0, 0, 0], 1664 active_fg => [0, 0, 0],
1320 can_hover => 1, 1665 can_hover => 1,
1321 can_focus => 1, 1666 can_focus => 1,
1322 valign => 0, 1667 valign => 0,
1323 can_events => 1, 1668 can_events => 1,
1669 #text => ...
1324 @_ 1670 @_
1325 ) 1671 )
1326} 1672}
1327 1673
1328sub _set_text { 1674sub _set_text {
… …
1338 $self->{text} = $text; 1684 $self->{text} = $text;
1339 1685
1340 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1341 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1342 1688
1343 $self->emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690}
1691
1692sub set_text {
1693 my ($self, $text) = @_;
1694
1695 $self->{cursor} = length $text;
1696 $self->_set_text ($text);
1697
1698 $self->realloc;
1344} 1699}
1345 1700
1346sub get_text { 1701sub get_text {
1347 $_[0]{text} 1702 $_[0]{text}
1348} 1703}
… …
1351 my ($self) = @_; 1706 my ($self) = @_;
1352 1707
1353 my ($w, $h) = $self->SUPER::size_request; 1708 my ($w, $h) = $self->SUPER::size_request;
1354 1709
1355 ($w + 1, $h) # add 1 for cursor 1710 ($w + 1, $h) # add 1 for cursor
1356}
1357
1358sub size_allocate {
1359 my ($self, $w, $h) = @_;
1360
1361 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1362}
1363
1364sub set_text {
1365 my ($self, $text) = @_;
1366
1367 $self->{cursor} = length $text;
1368 $self->_set_text ($text);
1369 $self->update;
1370} 1711}
1371 1712
1372sub key_down { 1713sub key_down {
1373 my ($self, $ev) = @_; 1714 my ($self, $ev) = @_;
1374 1715
… …
1376 my $sym = $ev->{sym}; 1717 my $sym = $ev->{sym};
1377 my $uni = $ev->{unicode}; 1718 my $uni = $ev->{unicode};
1378 1719
1379 my $text = $self->get_text; 1720 my $text = $self->get_text;
1380 1721
1381 if ($sym == 8) { 1722 if ($uni == 8) {
1382 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1723 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1383 } elsif ($sym == 127) { 1724 } elsif ($uni == 127) {
1384 substr $text, $self->{cursor}, 1, ""; 1725 substr $text, $self->{cursor}, 1, "";
1385 } elsif ($sym == CFClient::SDLK_LEFT) { 1726 } elsif ($sym == CFClient::SDLK_LEFT) {
1386 --$self->{cursor} if $self->{cursor}; 1727 --$self->{cursor} if $self->{cursor};
1387 } elsif ($sym == CFClient::SDLK_RIGHT) { 1728 } elsif ($sym == CFClient::SDLK_RIGHT) {
1388 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1729 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1389 } elsif ($sym == CFClient::SDLK_HOME) { 1730 } elsif ($sym == CFClient::SDLK_HOME) {
1390 $self->{cursor} = 0; 1731 $self->{cursor} = 0;
1391 } elsif ($sym == CFClient::SDLK_END) { 1732 } elsif ($sym == CFClient::SDLK_END) {
1392 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1393 } elsif ($sym == 27) { 1734 } elsif ($uni == 27) {
1394 $self->emit ('escape'); 1735 $self->_emit ('escape');
1395 } elsif ($uni) { 1736 } elsif ($uni) {
1396 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1397 } 1740 }
1398 1741
1399 $self->_set_text ($text); 1742 $self->_set_text ($text);
1400 $self->update; 1743
1744 $self->realloc;
1745
1746 1
1401} 1747}
1402 1748
1403sub focus_in { 1749sub focus_in {
1404 my ($self) = @_; 1750 my ($self) = @_;
1405 1751
… …
1420 utf8::encode $text; 1766 utf8::encode $text;
1421 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1422 1768
1423 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1424 $self->update; 1770 $self->update;
1771
1772 1
1425} 1773}
1426 1774
1427sub mouse_motion { 1775sub mouse_motion {
1428 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1429# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1430} 1780}
1431 1781
1432sub _draw { 1782sub _draw {
1433 my ($self) = @_; 1783 my ($self) = @_;
1434 1784
… …
1485 if ($sym == 13) { 1835 if ($sym == 13) {
1486 unshift @{$self->{history}}, 1836 unshift @{$self->{history}},
1487 my $txt = $self->get_text; 1837 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1; 1838 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = ''; 1839 $self->{history_saveback} = '';
1490 $self->emit (activate => $txt); 1840 $self->_emit (activate => $txt);
1491 $self->update; 1841 $self->update;
1492 1842
1493 } elsif ($sym == CFClient::SDLK_UP) { 1843 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) { 1844 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text; 1845 $self->{history_saveback} = $self->get_text;
… …
1511 } else { 1861 } else {
1512 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1513 } 1863 }
1514 1864
1515 } else { 1865 } else {
1516 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1517 } 1869 1
1518
1519} 1870}
1520 1871
1521############################################################################# 1872#############################################################################
1522 1873
1523package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1532 1883
1533sub new { 1884sub new {
1534 my $class = shift; 1885 my $class = shift;
1535 1886
1536 $class->SUPER::new ( 1887 $class->SUPER::new (
1537 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1538 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1539 bg => [1, 1, 1, 0.2],
1540 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1541 can_hover => 1, 1892 can_hover => 1,
1542 align => 0, 1893 align => 0,
1543 valign => 0, 1894 valign => 0,
1544 can_events => 1, 1895 can_events => 1,
1545 @_ 1896 @_
1546 ) 1897 )
1547} 1898}
1548 1899
1900sub activate { }
1901
1549sub button_up { 1902sub button_up {
1550 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1551 1904
1905 $self->emit ("activate")
1552 if ($x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1553 && $y >= 0 && $y < $self->{h}) { 1907 && $y >= 0 && $y < $self->{h};
1554 $self->emit ("activate"); 1908
1555 } 1909 1
1556} 1910}
1557 1911
1558sub _draw { 1912sub _draw {
1559 my ($self) = @_; 1913 my ($self) = @_;
1560 1914
… …
1562 1916
1563 if ($GRAB == $self) { 1917 if ($GRAB == $self) {
1564 $self->{fg} = $self->{active_fg}; 1918 $self->{fg} = $self->{active_fg};
1565 } 1919 }
1566 1920
1567 glEnable GL_BLEND;
1568 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569 glEnable GL_TEXTURE_2D; 1921 glEnable GL_TEXTURE_2D;
1570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1922 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571 glColor 0, 0, 0, 1; 1923 glColor 0, 0, 0, 1;
1572 1924
1573 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1925 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574 1926
1575 glDisable GL_TEXTURE_2D; 1927 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577 1928
1578 $self->SUPER::_draw; 1929 $self->SUPER::_draw;
1579} 1930}
1580 1931
1581############################################################################# 1932#############################################################################
… …
1592 1943
1593sub new { 1944sub new {
1594 my $class = shift; 1945 my $class = shift;
1595 1946
1596 $class->SUPER::new ( 1947 $class->SUPER::new (
1597 padding => 2, 1948 padding_x => 2,
1949 padding_y => 2,
1598 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1599 active_fg => [1, 1, 0], 1951 active_fg => [1, 1, 0],
1952 bg => [0, 0, 0, 0.2],
1953 active_bg => [1, 1, 1, 0.5],
1600 state => 0, 1954 state => 0,
1601 can_hover => 1, 1955 can_hover => 1,
1602 @_ 1956 @_
1603 ) 1957 )
1604} 1958}
1605 1959
1606sub size_request { 1960sub size_request {
1607 my ($self) = @_; 1961 my ($self) = @_;
1608 1962
1609 ($self->{padding} * 2 + 6) x 2 1963 (6) x 2
1610} 1964}
1611 1965
1612sub button_down { 1966sub button_down {
1613 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1614 1968
1615 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1969 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1616 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1970 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1617 $self->{state} = !$self->{state}; 1971 $self->{state} = !$self->{state};
1618 $self->emit (changed => $self->{state}); 1972 $self->_emit (changed => $self->{state});
1973 } else {
1974 return 0
1975 }
1976
1619 } 1977 1
1620} 1978}
1621 1979
1622sub _draw { 1980sub _draw {
1623 my ($self) = @_; 1981 my ($self) = @_;
1624 1982
1625 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1626 1984
1627 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1985 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1628 1986
1629 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1987 my ($w, $h) = @$self{qw(w h)};
1988
1989 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1630 1990
1631 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1991 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632 1992
1633 glEnable GL_BLEND; 1993 my $tex = $self->{state} ? $tex[1] : $tex[0];
1994
1634 glEnable GL_TEXTURE_2D; 1995 glEnable GL_TEXTURE_2D;
1635 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1636
1637 my $tex = $self->{state} ? $tex[1] : $tex[0];
1638
1639 $tex->draw_quad (0, 0, $s, $s); 1996 $tex->draw_quad_alpha (0, 0, $s, $s);
1640
1641 glDisable GL_TEXTURE_2D; 1997 glDisable GL_TEXTURE_2D;
1642 glDisable GL_BLEND;
1643} 1998}
1644 1999
1645############################################################################# 2000#############################################################################
1646 2001
1647package CFClient::UI::Image; 2002package CFClient::UI::Image;
… …
1690 glTranslate 0, -$self->{w}, 0; 2045 glTranslate 0, -$self->{w}, 0;
1691 2046
1692 ($w, $h) = ($h, $w); 2047 ($w, $h) = ($h, $w);
1693 } 2048 }
1694 2049
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D; 2050 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2051 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699 2052
1700 $tex->draw_quad (0, 0, $w, $h); 2053 $tex->draw_quad_alpha (0, 0, $w, $h);
1701 2054
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D; 2055 glDisable GL_TEXTURE_2D;
1704} 2056}
1705 2057
1706############################################################################# 2058#############################################################################
1707 2059
… …
1755} 2107}
1756 2108
1757sub set_max { 2109sub set_max {
1758 my ($self, $max) = @_; 2110 my ($self, $max) = @_;
1759 2111
2112 return if $self->{max_val} == $max;
2113
1760 $self->{max_val} = $max; 2114 $self->{max_val} = $max;
2115 $self->update;
1761} 2116}
1762 2117
1763sub set_value { 2118sub set_value {
1764 my ($self, $val, $max) = @_; 2119 my ($self, $val, $max) = @_;
1765 2120
1766 $self->set_max ($max) 2121 $self->set_max ($max)
1767 if defined $max; 2122 if defined $max;
1768 2123
1769 $max = $self->{max_val}; 2124 return if $self->{val} == $val;
2125
1770 $self->{val} = $val; 2126 $self->{val} = $val;
1771
1772 $self->update; 2127 $self->update;
1773} 2128}
1774 2129
1775sub _draw { 2130sub _draw {
1776 my ($self) = @_; 2131 my ($self) = @_;
… …
1859 2214
1860 $self->{value}->set_fontsize ($fsize); 2215 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 2216 $self->{max} ->set_fontsize ($fsize);
1862} 2217}
1863 2218
2219sub set_max {
2220 my ($self, $max) = @_;
2221
2222 $self->{gauge}->set_max ($max);
2223 $self->{max}->set_text ($max);
2224}
2225
1864sub set_value { 2226sub set_value {
1865 my ($self, $val, $max) = @_; 2227 my ($self, $val, $max) = @_;
1866 2228
1867 $self->set_max ($max) 2229 $self->set_max ($max)
1868 if defined $max; 2230 if defined $max;
1869 2231
1870 $self->{gauge}->set_value ($val, $max); 2232 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 2233 $self->{value}->set_text ($val);
1872}
1873
1874sub set_max {
1875 my ($self, $max) = @_;
1876
1877 $self->{gauge}->set_max ($max);
1878 $self->{max}->set_text ($max);
1879} 2234}
1880 2235
1881############################################################################# 2236#############################################################################
1882 2237
1883package CFClient::UI::Slider; 2238package CFClient::UI::Slider;
… …
1893 qw(s1_slider.png s1_slider_bg.png); 2248 qw(s1_slider.png s1_slider_bg.png);
1894 2249
1895sub new { 2250sub new {
1896 my $class = shift; 2251 my $class = shift;
1897 2252
1898 # range [value, low, high, page] 2253 # range [value, low, high, page, unit]
1899 2254
1900 # TODO: 0-width page 2255 # TODO: 0-width page
1901 # TODO: req_w/h are wrong with vertical 2256 # TODO: req_w/h are wrong with vertical
1902 # TODO: calculations are off 2257 # TODO: calculations are off
1903 my $self = $class->SUPER::new ( 2258 my $self = $class->SUPER::new (
1904 fg => [1, 1, 1], 2259 fg => [1, 1, 1],
1905 active_fg => [0, 0, 0], 2260 active_fg => [0, 0, 0],
2261 bg => [0, 0, 0, 0.2],
2262 active_bg => [1, 1, 1, 0.5],
1906 range => [0, 0, 100, 10], 2263 range => [0, 0, 100, 10, 0],
1907 req_w => 20, 2264 min_w => $::WIDTH / 80,
1908 req_h => 20, 2265 min_h => $::WIDTH / 80,
1909 vertical => 0, 2266 vertical => 0,
1910 can_hover => 1, 2267 can_hover => 1,
1911 inner_pad => 5, 2268 inner_pad => 0.02,
1912 @_ 2269 @_
1913 ); 2270 );
1914 2271
2272 $self->set_value ($self->{range}[0]);
2273 $self->update;
2274
1915 $self 2275 $self
1916} 2276}
1917 2277
2278sub changed { }
2279
2280sub set_range {
2281 my ($self, $range) = @_;
2282
2283 ($range, $self->{range}) = ($self->{range}, $range);
2284
2285 $self->update
2286 if "@$range" ne "@{$self->{range}}";
2287}
2288
2289sub set_value {
2290 my ($self, $value) = @_;
2291
2292 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2293
2294 $hi = $lo + 1 if $hi <= $lo;
2295
2296 $page = $hi - $lo if $page > $hi - $lo;
2297
2298 $value = $lo if $value < $lo;
2299 $value = $hi - $page if $value > $hi - $page;
2300
2301 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2302 if $unit;
2303
2304 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2305
2306 if ($value != $old_value) {
2307 $self->_emit (changed => $value);
2308 $self->update;
2309 }
2310}
2311
1918sub size_request { 2312sub size_request {
1919 my ($self) = @_; 2313 my ($self) = @_;
1920 2314
1921 my $w = $self->{req_w}; 2315 ($self->{req_w}, $self->{req_h})
1922 my $h = $self->{req_h};
1923
1924 $self->{vertical} ? ($h, $w) : ($w, $h)
1925} 2316}
1926 2317
1927sub button_down { 2318sub button_down {
1928 my ($self, $ev, $x, $y) = @_; 2319 my ($self, $ev, $x, $y) = @_;
1929 2320
1930 $self->SUPER::button_down ($ev, $x, $y); 2321 $self->SUPER::button_down ($ev, $x, $y);
2322
2323 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2324
1931 $self->mouse_motion ($ev, $x, $y); 2325 $self->mouse_motion ($ev, $x, $y)
1932} 2326}
1933 2327
1934sub mouse_motion { 2328sub mouse_motion {
1935 my ($self, $ev, $x, $y) = @_; 2329 my ($self, $ev, $x, $y) = @_;
1936 2330
1937 if ($GRAB == $self) { 2331 if ($GRAB == $self) {
2332 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2333
2334 my (undef, $lo, $hi, $page) = @{$self->{range}};
2335
2336 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2337
2338 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2339 } else {
2340 return 0;
2341 }
2342
2343 1
2344}
2345
2346sub update {
2347 my ($self) = @_;
2348
2349 delete $self->{knob_w};
2350 $self->SUPER::update;
2351}
2352
2353sub _draw {
2354 my ($self) = @_;
2355
2356 unless ($self->{knob_w}) {
2357 $self->set_value ($self->{range}[0]);
2358
1938 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2359 my ($value, $lo, $hi, $page) = @{$self->{range}};
2360 my $range = ($hi - $page - $lo) || 1e-100;
1939 2361
1940 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2362 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1941 2363
1942 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2364 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1943 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2365 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1944 2366
1945 $x -= $inner_pad_px; # substract the padding 2367 $value = ($value - $lo) / $range;
1946 $x = $x * ($hi - $lo) / $inner_w + $lo; 2368 $value = $value * $self->{scale} + $self->{offset};
1947 $x = $lo if $x < $lo;
1948 $x = $hi - $page if $x > $hi - $page;
1949 $self->{range}[0] = $x;
1950 2369
1951 $self->emit (changed => $x); 2370 $self->{knob_x} = $value - $knob_w * 0.5;
1952 $self->update; 2371 $self->{knob_w} = $knob_w;
1953 } 2372 }
1954}
1955
1956# the inner_* stuff is for generating a padding for the slider handle,
1957# so that the handle doesn't leave the texture. This calculation isn't 100%
1958# correct propably, but it does the job for now
1959sub _calc_inner_pad_px {
1960 my ($self, $w) = @_;
1961 ($w / 100) * $self->{inner_pad} # % to pixels
1962}
1963
1964sub _draw {
1965 my ($self) = @_;
1966 2373
1967 $self->SUPER::_draw (); 2374 $self->SUPER::_draw ();
1968 2375
1969 my ($w, $h) = @$self{qw(w h)}; 2376 glScale $self->{w}, $self->{h};
1970 2377
1971 if ($self->{vertical}) { 2378 if ($self->{vertical}) {
1972 # draw a vertical slider like a rotated horizontal slider 2379 # draw a vertical slider like a rotated horizontal slider
1973 2380
2381 glTranslate 1, 0, 0;
1974 glRotate 90, 0, 0, 1; 2382 glRotate 90, 0, 0, 1;
1975 glTranslate 0, -$self->{w}, 0;
1976
1977 ($w, $h) = ($h, $w);
1978 } 2383 }
1979 2384
1980 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2385 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1981 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2386 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1982 2387
1983 my ($value, $lo, $hi, $page) = @{$self->{range}};
1984
1985 $hi = $value + 1 if $lo == $hi;
1986
1987 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1988 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1989
1990 $page = int $page * $inner_w / ($hi - $lo);
1991 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1992
1993 $w -= $page;
1994 $page &= ~1;
1995 glTranslate $page * 0.5, 0, 0;
1996 $page ||= 2;
1997
1998 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1999 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2000
2001 glEnable GL_BLEND;
2002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2003 glEnable GL_TEXTURE_2D; 2388 glEnable GL_TEXTURE_2D;
2004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005 2390
2006 # draw background 2391 # draw background
2007 $tex[1]->draw_quad (0, 0, $w, $h); 2392 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2008 2393
2009 # draw handle 2394 # draw handle
2010 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2395 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2011 2396
2012 glDisable GL_BLEND;
2013 glDisable GL_TEXTURE_2D; 2397 glDisable GL_TEXTURE_2D;
2014} 2398}
2399
2400#############################################################################
2401
2402package CFClient::UI::ValSlider;
2403
2404our @ISA = CFClient::UI::HBox::;
2405
2406sub new {
2407 my ($class, %arg) = @_;
2408
2409 my $range = delete $arg{range};
2410
2411 my $self = $class->SUPER::new (
2412 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2413 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2414 to_value => sub { shift },
2415 from_value => sub { shift },
2416 %arg,
2417 );
2418
2419 $self->{slider}->connect (changed => sub {
2420 my ($self, $value) = @_;
2421 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2422 $self->{parent}->emit (changed => $value);
2423 });
2424
2425# $self->{entry}->connect (changed => sub {
2426# my ($self, $value) = @_;
2427# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2428# $self->{parent}->emit (changed => $value);
2429# });
2430
2431 $self->add ($self->{slider}, $self->{entry});
2432
2433 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2434
2435 $self
2436}
2437
2438sub set_range { shift->{slider}->set_range (@_) }
2439sub set_value { shift->{slider}->set_value (@_) }
2015 2440
2016############################################################################# 2441#############################################################################
2017 2442
2018package CFClient::UI::TextView; 2443package CFClient::UI::TextView;
2019 2444
… …
2028 fontsize => 1, 2453 fontsize => 1,
2029 can_events => 0, 2454 can_events => 0,
2030 #font => default_font 2455 #font => default_font
2031 @_, 2456 @_,
2032 2457
2033 layout => (new CFClient::Layout), 2458 layout => (new CFClient::Layout 1),
2034 par => [], 2459 par => [],
2035 height => 0, 2460 height => 0,
2036 children => [ 2461 children => [
2037 (new CFClient::UI::Empty expand => 1), 2462 (new CFClient::UI::Empty expand => 1),
2038 (new CFClient::UI::Slider vertical => 1), 2463 (new CFClient::UI::Slider vertical => 1),
2039 ], 2464 ],
2040 ); 2465 );
2041 2466
2042 $self->{children}[1]->connect (changed => sub { 2467 $self->{children}[1]->connect (changed => sub { $self->update });
2043 $self->update;
2044 });
2045 2468
2046 $self 2469 $self
2047} 2470}
2048 2471
2049sub set_fontsize { 2472sub set_fontsize {
2050 my ($self, $fontsize) = @_; 2473 my ($self, $fontsize) = @_;
2051 2474
2052 $self->{fontsize} = $fontsize; 2475 $self->{fontsize} = $fontsize;
2053 $self->reflow; 2476 $self->reflow;
2054}
2055
2056sub text_height {
2057 my ($self, $text) = @_;
2058
2059 my $layout = $self->{layout};
2060
2061 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062 $layout->set_width ($self->{w});
2063 $layout->set_text ($text);
2064
2065 ($layout->size)[1]
2066}
2067
2068sub reflow {
2069 my ($self) = @_;
2070
2071 $self->{need_reflow}++;
2072 $self->update;
2073} 2477}
2074 2478
2075sub size_allocate { 2479sub size_allocate {
2076 my ($self, $w, $h) = @_; 2480 my ($self, $w, $h) = @_;
2077 2481
… …
2082 $self->{layout}->set_width ($self->{children}[0]{w}); 2486 $self->{layout}->set_width ($self->{children}[0]{w});
2083 2487
2084 $self->reflow; 2488 $self->reflow;
2085} 2489}
2086 2490
2491sub text_size {
2492 my ($self, $text, $indent) = @_;
2493
2494 my $layout = $self->{layout};
2495
2496 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $layout->set_width ($self->{children}[0]{w} - $indent);
2498 $layout->set_markup ($text);
2499
2500 $layout->size
2501}
2502
2503sub reflow {
2504 my ($self) = @_;
2505
2506 $self->{need_reflow}++;
2507 $self->update;
2508}
2509
2510sub set_offset {
2511 my ($self, $offset) = @_;
2512
2513 # todo: base offset on lines or so, not on pixels
2514 $self->{children}[1]->set_value ($offset);
2515}
2516
2517sub clear {
2518 my ($self) = @_;
2519
2520 $self->{par} = [];
2521 $self->{height} = 0;
2522 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2523}
2524
2087sub add_paragraph { 2525sub add_paragraph {
2088 my ($self, $color, $text) = @_; 2526 my ($self, $color, $text, $indent) = @_;
2089 2527
2090 #TODO: intelligently "reformat" paragraph 2528 for my $line (split /\n/, $text) {
2091 2529 my ($w, $h) = $self->text_size ($line);
2092 my $height = $self->text_height ($text);
2093
2094 $self->{height} += $height; 2530 $self->{height} += $h;
2531 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2532 }
2095 2533
2096 push @{$self->{par}}, [$height, $color, $text];
2097
2098 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2534 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2099 $self->{children}[1]->update;
2100} 2535}
2101 2536
2102sub update { 2537sub update {
2103 my ($self) = @_; 2538 my ($self) = @_;
2104 2539
… …
2106 2541
2107 return unless $self->{h} > 0; 2542 return unless $self->{h} > 0;
2108 2543
2109 delete $self->{texture}; 2544 delete $self->{texture};
2110 2545
2111 $ROOT->on_refresh ($self, sub { 2546 $ROOT->on_post_alloc ($self, sub {
2547 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2548
2112 if (delete $self->{need_reflow}) { 2549 if (delete $self->{need_reflow}) {
2113 my $height = 0; 2550 my $height = 0;
2114 2551
2115 $height += $_->[0] = $self->text_height ($_->[2]) 2552 my $layout = $self->{layout};
2553
2554 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2555
2116 for @{$self->{par}}; 2556 for (@{$self->{par}}) {
2557 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2558 $layout->set_width ($W - $_->[3]);
2559 $layout->set_markup ($_->[4]);
2560 my ($w, $h) = $layout->size;
2561 $_->[0] = $w + $_->[3];
2562 $_->[1] = $h;
2563 }
2564
2565 $height += $_->[1];
2566 }
2117 2567
2118 $self->{height} = $height; 2568 $self->{height} = $height;
2119 2569
2120 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2570 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2121 2571
2122 delete $self->{texture}; 2572 delete $self->{texture};
2123 } 2573 }
2124 2574
2125 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2575 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2126 glClearColor 0, 0, 0, 1; 2576 glClearColor 0.5, 0.5, 0.5, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2577 glClear GL_COLOR_BUFFER_BIT;
2128 2578
2579 my $top = int $self->{children}[1]{range}[0];
2580
2581 my $y0 = $top;
2582 my $y1 = $top + $H;
2583
2584 my $y = 0;
2585
2586 my $layout = $self->{layout};
2587
2588 $layout->set_font ($self->{font}) if $self->{font};
2589
2129 glEnable GL_BLEND; 2590 glEnable GL_BLEND;
2591 #TODO# not correct in windows where rgba is forced off
2130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2592 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2131 glEnable GL_TEXTURE_2D;
2132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133
2134 my $top = int $self->{children}[1]{range}[0];
2135
2136 my $y0 = $top;
2137 my $y1 = $top + $self->{h};
2138
2139 my $y = 0;
2140
2141 my $layout = $self->{layout};
2142
2143 $layout->set_font ($self->{font}) if $self->{font};
2144 2593
2145 for my $par (@{$self->{par}}) { 2594 for my $par (@{$self->{par}}) {
2146 my $h = $par->[0]; 2595 my $h = $par->[1];
2147 2596
2148 if ($y0 < $y + $h && $y < $y1) { 2597 if ($y0 < $y + $h && $y < $y1) {
2598 $layout->set_foreground (@{ $par->[2] });
2599 $layout->set_width ($W - $par->[3]);
2149 $layout->set_text ($par->[2]); 2600 $layout->set_markup ($par->[4]);
2150 2601
2151 glColor @{ $par->[1] }; 2602 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2152 my ($W, $H) = $layout->size; 2603
2153 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2604 glRasterPos $par->[3], $y - $y0;
2605 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2154 } 2606 }
2155 2607
2156 $y += $h; 2608 $y += $h;
2157 } 2609 }
2158 2610
2159 glDisable GL_TEXTURE_2D;
2160 glDisable GL_BLEND; 2611 glDisable GL_BLEND;
2161 }; 2612 };
2162 }); 2613 });
2163} 2614}
2164 2615
2165sub _draw { 2616sub _draw {
2166 my ($self) = @_; 2617 my ($self) = @_;
2167 2618
2168 if ($self->{texture}) {
2169 glEnable GL_TEXTURE_2D; 2619 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2621 glColor 1, 1, 1, 1;
2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2622 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2173 glDisable GL_TEXTURE_2D; 2623 glDisable GL_TEXTURE_2D;
2174 }
2175 2624
2176 $self->{children}[1]->draw; 2625 $self->{children}[1]->draw;
2177 2626
2178} 2627}
2179 2628
… …
2227 2676
2228sub new { 2677sub new {
2229 my $class = shift; 2678 my $class = shift;
2230 2679
2231 my $self = $class->SUPER::new ( 2680 my $self = $class->SUPER::new (
2232 state => 0, 2681 state => 0,
2233 connect_activate => \&toggle_flopper, 2682 on_activate => \&toggle_flopper,
2234 @_ 2683 @_
2235 ); 2684 );
2236 2685
2237 if ($self->{state}) {
2238 $self->{state} = 0;
2239 $self->toggle_flopper;
2240 }
2241
2242 $self 2686 $self
2243} 2687}
2244 2688
2245sub toggle_flopper { 2689sub toggle_flopper {
2246 my ($self) = @_; 2690 my ($self) = @_;
2247 2691
2248 # TODO: use animation 2692 $self->{other}->toggle_visibility;
2249 if ($self->{state} = !$self->{state}) {
2250 $CFClient::UI::ROOT->add ($self->{other});
2251 $self->{other}->move ($self->coord2global (0, $self->{h}));
2252 $self->emit ("open");
2253 } else {
2254 $CFClient::UI::ROOT->remove ($self->{other});
2255 $self->emit ("close");
2256 }
2257
2258 $self->emit (changed => $self->{state});
2259} 2693}
2260 2694
2261############################################################################# 2695#############################################################################
2262 2696
2263package CFClient::UI::Tooltip; 2697package CFClient::UI::Tooltip;
… …
2273 @_, 2707 @_,
2274 can_events => 0, 2708 can_events => 0,
2275 ) 2709 )
2276} 2710}
2277 2711
2278sub set_markup { 2712sub set_tooltip_from {
2279 my ($self, $text) = @_; 2713 my ($self, $widget) = @_;
2280 2714
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2715 my $tooltip = $widget->{tooltip};
2282 $self->{label}->set_markup ($text); 2716
2283 $self->add ($self->{label}); 2717 if ($ENV{CFPLUS_DEBUG} & 2) {
2718 $tooltip .= "\n\n" . (ref $widget) . "\n"
2719 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2720 . "req $widget->{req_w} $widget->{req_h}\n"
2721 . "visible $widget->{visible}";
2722 }
2723
2724 $self->add (new CFClient::UI::Label
2725 markup => $tooltip,
2726 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2727 fontsize => 0.8,
2728 fg => [0, 0, 0, 1],
2729 ellipsise => 0,
2730 font => ($widget->{tooltip_font} || $::FONT_PROP),
2731 );
2284} 2732}
2285 2733
2286sub size_request { 2734sub size_request {
2287 my ($self) = @_; 2735 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290 2736
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2737 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292 2738
2293 ($w + 4, $h + 4) 2739 ($w + 4, $h + 4)
2294} 2740}
… …
2297 my ($self, $w, $h) = @_; 2743 my ($self, $w, $h) = @_;
2298 2744
2299 $self->SUPER::size_allocate ($w - 4, $h - 4); 2745 $self->SUPER::size_allocate ($w - 4, $h - 4);
2300} 2746}
2301 2747
2748sub visibility_change {
2749 my ($self, $visible) = @_;
2750
2751 return unless $visible;
2752
2753 $self->{root}->on_post_alloc ("move_$self" => sub {
2754 my $widget = $self->{owner}
2755 or return;
2756
2757 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2758
2759 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2760 if $x + $self->{w} > $::WIDTH;
2761
2762 $self->move_abs ($x, $y);
2763 });
2764}
2765
2302sub _draw { 2766sub _draw {
2303 my ($self) = @_; 2767 my ($self) = @_;
2304 2768
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375; 2769 glTranslate 0.375, 0.375;
2307 2770
2308 my ($w, $h) = @$self{qw(w h)}; 2771 my ($w, $h) = @$self{qw(w h)};
2309 2772
2310 glColor 1, 0.8, 0.4; 2773 glColor 1, 0.8, 0.4;
… …
2321 glVertex 0 , $h; 2784 glVertex 0 , $h;
2322 glVertex $w, $h; 2785 glVertex $w, $h;
2323 glVertex $w, 0; 2786 glVertex $w, 0;
2324 glEnd; 2787 glEnd;
2325 2788
2326 glPopMatrix; 2789 glTranslate 2 - 0.375, 2 - 0.375;
2327 2790
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw; 2791 $self->SUPER::_draw;
2330} 2792}
2331 2793
2332############################################################################# 2794#############################################################################
2333 2795
… …
2338use CFClient::OpenGL; 2800use CFClient::OpenGL;
2339 2801
2340sub new { 2802sub new {
2341 my $class = shift; 2803 my $class = shift;
2342 2804
2343 $class->SUPER::new ( 2805 my $self = $class->SUPER::new (
2344 aspect => 1, 2806 aspect => 1,
2807 can_events => 0,
2345 @_, 2808 @_,
2346 ) 2809 );
2810
2811 if ($self->{anim} && $self->{animspeed}) {
2812 Scalar::Util::weaken (my $widget = $self);
2813
2814 $self->{timer} = Event->timer (
2815 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2816 hard => 1,
2817 interval => $self->{animspeed},
2818 cb => sub {
2819 ++$widget->{frame};
2820 $widget->update;
2821 },
2822 );
2823 }
2824
2825 $self
2347} 2826}
2348 2827
2349sub size_request { 2828sub size_request {
2350 (32, 8) 2829 (32, 8)
2351} 2830}
2352 2831
2832sub update {
2833 my ($self) = @_;
2834
2835 return unless $self->{visible};
2836
2837 $self->SUPER::update;
2838}
2839
2353sub draw { 2840sub _draw {
2354 my ($self) = @_; 2841 my ($self) = @_;
2355 2842
2843 return unless $::CONN;
2844
2845 my $face;
2846
2847 if ($self->{frame}) {
2848 my $anim = $::CONN->{anim}[$self->{anim}];
2849
2850 $face = $anim->[ $self->{frame} % @$anim ]
2851 if $anim && @$anim;
2852 }
2853
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2854 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2357 2855
2358 if ($tex) { 2856 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D; 2857 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1; 2859 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2860 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D; 2861 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 } 2862 }
2863}
2864
2865sub DESTROY {
2866 my ($self) = @_;
2867
2868 $self->{timer}->cancel
2869 if $self->{timer};
2870
2871 $self->SUPER::DESTROY;
2368} 2872}
2369 2873
2370############################################################################# 2874#############################################################################
2371 2875
2876package CFClient::UI::Buttonbar;
2877
2878our @ISA = CFClient::UI::HBox::;
2879
2880# TODO: should actualyl wrap buttons and other goodies.
2881
2882#############################################################################
2883
2884package CFClient::UI::Menu;
2885
2886our @ISA = CFClient::UI::FancyFrame::;
2887
2888use CFClient::OpenGL;
2889
2890sub new {
2891 my $class = shift;
2892
2893 my $self = $class->SUPER::new (
2894 items => [],
2895 z => 100,
2896 @_,
2897 );
2898
2899 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2900
2901 for my $item (@{ $self->{items} }) {
2902 my ($widget, $cb) = @$item;
2903
2904 # handle various types of items, only text for now
2905 if (!ref $widget) {
2906 $widget = new CFClient::UI::Label
2907 can_hover => 1,
2908 can_events => 1,
2909 text => $widget;
2910 }
2911
2912 $self->{item}{$widget} = $item;
2913
2914 $self->{vbox}->add ($widget);
2915 }
2916
2917 $self
2918}
2919
2920# popup given the event (must be a mouse button down event currently)
2921sub popup {
2922 my ($self, $ev) = @_;
2923
2924 $self->_emit ("popdown");
2925
2926 # maybe save $GRAB? must be careful about events...
2927 $GRAB = $self;
2928 $self->{button} = $ev->{button};
2929
2930 $self->show;
2931 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2932}
2933
2934sub mouse_motion {
2935 my ($self, $ev, $x, $y) = @_;
2936
2937 # TODO: should use vbox->find_widget or so
2938 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2939 $self->{hover} = $self->{item}{$HOVER};
2940
2941 0
2942}
2943
2944sub button_up {
2945 my ($self, $ev, $x, $y) = @_;
2946
2947 if ($ev->{button} == $self->{button}) {
2948 undef $GRAB;
2949 $self->hide;
2950
2951 $self->_emit ("popdown");
2952 $self->{hover}[1]->() if $self->{hover};
2953 } else {
2954 return 0
2955 }
2956
2957 1
2958}
2959
2960#############################################################################
2961
2962package CFClient::UI::Multiplexer;
2963
2964our @ISA = CFClient::UI::Container::;
2965
2966sub new {
2967 my $class = shift;
2968
2969 my $self = $class->SUPER::new (
2970 @_,
2971 );
2972
2973 $self->{current} = $self->{children}[0]
2974 if @{ $self->{children} };
2975
2976 $self
2977}
2978
2979sub add {
2980 my ($self, @widgets) = @_;
2981
2982 $self->SUPER::add (@widgets);
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986}
2987
2988sub set_current_page {
2989 my ($self, $page_or_widget) = @_;
2990
2991 my $widget = ref $page_or_widget
2992 ? $page_or_widget
2993 : $self->{children}[$page_or_widget];
2994
2995 $self->{current} = $widget;
2996 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2997
2998 $self->_emit (page_changed => $self->{current});
2999
3000 $self->realloc;
3001}
3002
3003sub visible_children {
3004 $_[0]{current}
3005}
3006
3007sub size_request {
3008 my ($self) = @_;
3009
3010 $self->{current}->size_request
3011}
3012
3013sub size_allocate {
3014 my ($self, $w, $h) = @_;
3015
3016 $self->{current}->configure (0, 0, $w, $h);
3017}
3018
3019sub _draw {
3020 my ($self) = @_;
3021
3022 $self->{current}->draw;
3023}
3024
3025#############################################################################
3026
3027package CFClient::UI::Notebook;
3028
3029our @ISA = CFClient::UI::VBox::;
3030
3031sub new {
3032 my $class = shift;
3033
3034 my $self = $class->SUPER::new (
3035 buttonbar => (new CFClient::UI::Buttonbar),
3036 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3037 # filter => # will be put between multiplexer and $self
3038 @_,
3039 );
3040
3041 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3042 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3043
3044 $self
3045}
3046
3047sub add {
3048 my ($self, $title, $widget, $tooltip) = @_;
3049
3050 Scalar::Util::weaken $self;
3051
3052 $self->{buttonbar}->add (new CFClient::UI::Button
3053 markup => $title,
3054 tooltip => $tooltip,
3055 on_activate => sub { $self->set_current_page ($widget) },
3056 );
3057
3058 $self->{multiplexer}->add ($widget);
3059}
3060
3061sub set_current_page {
3062 my ($self, $page) = @_;
3063
3064 $self->{multiplexer}->set_current_page ($page);
3065 $self->_emit (page_changed => $self->{multiplexer}{current});
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Statusbox;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 $class->SUPER::new (
3078 fontsize => 0.8,
3079 @_,
3080 )
3081}
3082
3083sub reorder {
3084 my ($self) = @_;
3085 my $NOW = time;
3086
3087 while (my ($k, $v) = each %{ $self->{item} }) {
3088 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3089 }
3090
3091 my @widgets;
3092
3093 my @items = sort {
3094 $a->{pri} <=> $b->{pri}
3095 or $b->{id} <=> $a->{id}
3096 } values %{ $self->{item} };
3097
3098 my $count = 10 + 1;
3099 for my $item (@items) {
3100 last unless --$count;
3101
3102 push @widgets, $item->{label} ||= do {
3103 # TODO: doesn't handle markup well (read as: at all)
3104 my $short = $item->{count} > 1
3105 ? "<b>$item->{count} ×</b> $item->{text}"
3106 : $item->{text};
3107
3108 for ($short) {
3109 s/^\s+//;
3110 s/\s+/ /g;
3111 }
3112
3113 new CFClient::UI::Label
3114 markup => $short,
3115 tooltip => $item->{tooltip},
3116 tooltip_font => $::FONT_PROP,
3117 tooltip_width => 0.67,
3118 fontsize => $item->{fontsize} || $self->{fontsize},
3119 max_w => $::WIDTH * 0.44,
3120 fg => $item->{fg},
3121 can_events => 1,
3122 can_hover => 1
3123 };
3124 }
3125
3126 $self->clear;
3127 $self->SUPER::add (reverse @widgets);
3128}
3129
3130sub add {
3131 my ($self, $text, %arg) = @_;
3132
3133 $text =~ s/^\s+//;
3134 $text =~ s/\s+$//;
3135
3136 return unless $text;
3137
3138 my $timeout = time + ((delete $arg{timeout}) || 60);
3139
3140 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3141
3142 if (my $item = $self->{item}{$group}) {
3143 if ($item->{text} eq $text) {
3144 $item->{count}++;
3145 } else {
3146 $item->{count} = 1;
3147 $item->{text} = $item->{tooltip} = $text;
3148 }
3149 $item->{id} = ++$self->{id};
3150 $item->{timeout} = $timeout;
3151 delete $item->{label};
3152 } else {
3153 $self->{item}{$group} = {
3154 id => ++$self->{id},
3155 text => $text,
3156 timeout => $timeout,
3157 tooltip => $text,
3158 fg => [0.8, 0.8, 0.8, 0.8],
3159 pri => 0,
3160 count => 1,
3161 %arg,
3162 };
3163 }
3164
3165 $self->reorder;
3166}
3167
3168sub reconfigure {
3169 my ($self) = @_;
3170
3171 delete $_->{label}
3172 for values %{ $self->{item} || {} };
3173
3174 $self->reorder;
3175 $self->SUPER::reconfigure;
3176}
3177
3178#############################################################################
3179
3180package CFClient::UI::Inventory;
3181
3182our @ISA = CFClient::UI::ScrolledWindow::;
3183
3184sub new {
3185 my $class = shift;
3186
3187 my $self = $class->SUPER::new (
3188 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3189 @_,
3190 );
3191
3192 $self
3193}
3194
3195sub set_items {
3196 my ($self, $items) = @_;
3197
3198 $self->{child}->clear;
3199 return unless $items;
3200
3201 my @items = sort {
3202 ($a->{type} <=> $b->{type})
3203 or ($a->{name} cmp $b->{name})
3204 } @$items;
3205
3206 $self->{real_items} = \@items;
3207
3208 my $row = 0;
3209 for my $item (@items) {
3210 CFClient::Item::update_widgets $item;
3211
3212 $self->{child}->add (0, $row, $item->{face_widget});
3213 $self->{child}->add (1, $row, $item->{desc_widget});
3214 $self->{child}->add (2, $row, $item->{weight_widget});
3215
3216 $row++;
3217 }
3218}
3219
3220#############################################################################
3221
3222package CFClient::UI::BindEditor;
3223
3224our @ISA = CFClient::UI::FancyFrame::;
3225
3226sub new {
3227 my $class = shift;
3228
3229 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3230
3231 $self->add (my $vb = new CFClient::UI::VBox);
3232
3233
3234 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3235 text => "start recording",
3236 tooltip => "Start/Stops recording of actions."
3237 ."All subsequent actions after the recording started will be captured."
3238 ."The actions are displayed after the record was stopped."
3239 ."To bind the action you have to click on the 'Bind' button",
3240 on_activate => sub {
3241 unless ($self->{recording}) {
3242 $self->start;
3243 } else {
3244 $self->stop;
3245 }
3246 });
3247
3248 $vb->add (new CFClient::UI::Label text => "Actions:");
3249 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3250
3251 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3252 $vb->add (my $hb = new CFClient::UI::HBox);
3253 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3254 $hb->add (new CFClient::UI::Button
3255 text => "bind",
3256 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3257 on_activate => sub {
3258 $self->ask_for_bind;
3259 });
3260
3261 $vb->add (my $hb = new CFClient::UI::HBox);
3262 $hb->add (new CFClient::UI::Button
3263 text => "ok",
3264 expand => 1,
3265 tooltip => "This closes the binding editor and saves the binding",
3266 on_activate => sub {
3267 $self->hide;
3268 $self->commit;
3269 });
3270
3271 $hb->add (new CFClient::UI::Button
3272 text => "cancel",
3273 expand => 1,
3274 tooltip => "This closes the binding editor without saving",
3275 on_activate => sub {
3276 $self->hide;
3277 $self->{binding_cancel}->()
3278 if $self->{binding_cancel};
3279 });
3280
3281 $self->update_binding_widgets;
3282
3283 $self
3284}
3285
3286sub commit {
3287 my ($self) = @_;
3288 my ($mod, $sym, $cmds) = $self->get_binding;
3289 if ($sym != 0 && @$cmds > 0) {
3290 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3291 ."'. Don't forget 'Save Config'!");
3292 $self->{binding_change}->($mod, $sym, $cmds)
3293 if $self->{binding_change};
3294 } else {
3295 $::STATUSBOX->add ("No action bound, no key or action specified!");
3296 $self->{binding_cancel}->()
3297 if $self->{binding_cancel};
3298 }
3299}
3300
3301sub start {
3302 my ($self) = @_;
3303
3304 $self->{rec_btn}->set_text ("stop recording");
3305 $self->{recording} = 1;
3306 $self->clear_command_list;
3307 $::CONN->start_record if $::CONN;
3308}
3309
3310sub stop {
3311 my ($self) = @_;
3312
3313 $self->{rec_btn}->set_text ("start recording");
3314 $self->{recording} = 0;
3315
3316 my $rec;
3317 $rec = $::CONN->stop_record if $::CONN;
3318 return unless ref $rec eq 'ARRAY';
3319 $self->set_command_list ($rec);
3320}
3321
3322
3323sub ask_for_bind_and_commit {
3324 my ($self) = @_;
3325 $self->ask_for_bind (1);
3326}
3327
3328sub ask_for_bind {
3329 my ($self, $commit) = @_;
3330
3331 CFClient::Binder::open_binding_dialog (sub {
3332 my ($mod, $sym) = @_;
3333 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3334 $self->update_binding_widgets;
3335 $self->commit if $commit;
3336 });
3337}
3338
3339# $mod and $sym are the modifiers and key symbol
3340# $cmds is a array ref of strings (the commands)
3341# $cb is the callback that is executed on OK
3342# $ccb is the callback that is executed on CANCEL and
3343# when the binding was unsuccessful on OK
3344sub set_binding {
3345 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3346
3347 $self->clear_command_list;
3348 $self->{recording} = 0;
3349 $self->{rec_btn}->set_text ("start recording");
3350
3351 $self->{binding} = [$mod, $sym];
3352 $self->{commands} = $cmds;
3353
3354 $self->{binding_change} = $cb;
3355 $self->{binding_cancel} = $ccb;
3356
3357 $self->update_binding_widgets;
3358}
3359
3360# this is a shortcut method that asks for a binding
3361# and then just binds it.
3362sub do_quick_binding {
3363 my ($self, $cmds) = @_;
3364 $self->set_binding (undef, undef, $cmds, sub {
3365 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3366 });
3367 $self->ask_for_bind (1);
3368}
3369
3370sub update_binding_widgets {
3371 my ($self) = @_;
3372 my ($mod, $sym, $cmds) = $self->get_binding;
3373 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3374 $self->set_command_list ($cmds);
3375}
3376
3377sub get_binding {
3378 my ($self) = @_;
3379 return (
3380 $self->{binding}->[0],
3381 $self->{binding}->[1],
3382 [ grep { defined $_ } @{$self->{commands}} ]
3383 );
3384}
3385
3386sub clear_command_list {
3387 my ($self) = @_;
3388 $self->{cmdbox}->clear ();
3389}
3390
3391sub set_command_list {
3392 my ($self, $cmds) = @_;
3393
3394 $self->{cmdbox}->clear ();
3395 $self->{commands} = $cmds;
3396
3397 my $idx = 0;
3398
3399 for (@$cmds) {
3400 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3401
3402 my $i = $idx;
3403 $hb->add (new CFClient::UI::Label text => $_);
3404 $hb->add (new CFClient::UI::Button
3405 text => "delete",
3406 tooltip => "Deletes the action from the record",
3407 on_activate => sub {
3408 $self->{cmdbox}->remove ($hb);
3409 $cmds->[$i] = undef;
3410 });
3411
3412
3413 $idx++
3414 }
3415}
3416
3417#############################################################################
3418
3419package CFClient::UI::SpellList;
3420
3421our @ISA = CFClient::UI::Table::;
3422
3423sub new {
3424 my $class = shift;
3425
3426 my $self = $class->SUPER::new (
3427 binding => [],
3428 commands => [],
3429 @_,
3430 )
3431}
3432
3433# XXX: Do sorting? Argl...
3434sub add_spell {
3435 my ($self, $spell) = @_;
3436 $self->{spells}->{$spell->{name}} = $spell;
3437
3438 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3439 face => $spell->{face},
3440 can_hover => 1,
3441 can_events => 1,
3442 tooltip => $spell->{message});
3443
3444 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3445 text => $spell->{name},
3446 can_hover => 1,
3447 can_events => 1,
3448 tooltip => $spell->{message},
3449 expand => 1);
3450
3451 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3452 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3453 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3454 expand => 1);
3455
3456 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3457 text => "bind to key",
3458 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3459}
3460
3461sub rebuild_spell_list {
3462 my ($self) = @_;
3463 $self->{tbl_idx} = 0;
3464 $self->add_spell ($_) for values %{$self->{spells}};
3465}
3466
3467sub remove_spell {
3468 my ($self, $spell) = @_;
3469 delete $self->{spells}->{$spell->{name}};
3470 $self->rebuild_spell_list;
3471}
3472
3473#############################################################################
3474
2372package CFClient::UI::Root; 3475package CFClient::UI::Root;
2373 3476
2374our @ISA = CFClient::UI::Container::; 3477our @ISA = CFClient::UI::Container::;
2375 3478
2376use CFClient::OpenGL; 3479use CFClient::OpenGL;
2377 3480
2378sub check_size { 3481sub new {
2379 my ($self) = @_; 3482 my $class = shift;
2380 3483
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3484 my $self = $class->SUPER::new (
3485 visible => 1,
3486 @_,
3487 );
3488
3489 Scalar::Util::weaken ($self->{root} = $self);
3490
3491 $self
2382} 3492}
2383 3493
2384sub size_request { 3494sub size_request {
2385 ($::WIDTH, $::HEIGHT) 3495 my ($self) = @_;
2386}
2387 3496
2388sub configure { 3497 ($self->{w}, $self->{h})
3498}
3499
3500sub _to_pixel {
3501 my ($coord, $size, $max) = @_;
3502
3503 $coord =
3504 $coord eq "center" ? ($max - $size) * 0.5
3505 : $coord eq "max" ? $max
3506 : $coord;
3507
3508 $coord = 0 if $coord < 0;
3509 $coord = $max - $size if $coord > $max - $size;
3510
3511 int $coord + 0.5
3512}
3513
3514sub size_allocate {
2389 my ($self, $x, $y, $w, $h) = @_; 3515 my ($self, $w, $h) = @_;
2390 3516
2391 $self->SUPER::configure ($x, $y, $w, $h);
2392
2393 for my $child (@{$self->{children}}) { 3517 for my $child ($self->children) {
2394 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3518 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395 3519
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3520 $X = $child->{force_x} if exists $child->{force_x};
2397 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3521 $Y = $child->{force_y} if exists $child->{force_y};
3522
3523 $X = _to_pixel $X, $W, $self->{w};
3524 $Y = _to_pixel $Y, $H, $self->{h};
3525
2398 $child->configure ($X, $Y, $W,$H); 3526 $child->configure ($X, $Y, $W, $H);
2399 } 3527 }
2400} 3528}
2401 3529
2402sub _topleft { 3530sub coord2local {
2403 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
2404 3532
2405 ($x, $y) 3533 ($x, $y)
2406} 3534}
2407 3535
3536sub coord2global {
3537 my ($self, $x, $y) = @_;
3538
3539 ($x, $y)
3540}
3541
2408sub update { 3542sub update {
2409 my ($self) = @_; 3543 my ($self) = @_;
2410 3544
2411 $self->check_size; 3545 $::WANT_REFRESH++;
2412 ::refresh ();
2413} 3546}
2414 3547
2415sub add { 3548sub add {
2416 my ($self, $child) = @_; 3549 my ($self, @children) = @_;
2417 3550
2418 # integerize window positions 3551 $_->{is_toplevel} = 1
2419 $child->{x} = int $child->{x}; 3552 for @children;
2420 $child->{y} = int $child->{y};
2421 3553
2422 $self->SUPER::add ($child); 3554 $self->SUPER::add (@children);
3555}
3556
3557sub remove {
3558 my ($self, @children) = @_;
3559
3560 $self->SUPER::remove (@children);
3561
3562 delete $self->{is_toplevel}
3563 for @children;
3564
3565 while (@children) {
3566 my $w = pop @children;
3567 push @children, $w->children;
3568 $w->set_invisible;
3569 }
2423} 3570}
2424 3571
2425sub on_refresh { 3572sub on_refresh {
2426 my ($self, $id, $cb) = @_; 3573 my ($self, $id, $cb) = @_;
2427 3574
2428 $self->{refresh_hook}{$id} = $cb; 3575 $self->{refresh_hook}{$id} = $cb;
2429} 3576}
2430 3577
3578sub on_post_alloc {
3579 my ($self, $id, $cb) = @_;
3580
3581 $self->{post_alloc_hook}{$id} = $cb;
3582}
3583
2431sub draw { 3584sub draw {
2432 my ($self) = @_; 3585 my ($self) = @_;
2433 3586
2434 while (my $rcb = delete $self->{refresh_hook}) { 3587 while ($self->{refresh_hook}) {
2435 $_->() for values %$rcb; 3588 $_->()
3589 for values %{delete $self->{refresh_hook}};
2436 } 3590 }
3591
3592 if ($self->{realloc}) {
3593 my %queue;
3594 my @queue;
3595 my $widget;
3596
3597 outer:
3598 while () {
3599 if (my $realloc = delete $self->{realloc}) {
3600 for $widget (values %$realloc) {
3601 $widget->{visible} or next; # do not resize invisible widgets
3602
3603 $queue{$widget+0}++ and next; # duplicates are common
3604
3605 push @{ $queue[$widget->{visible}] }, $widget;
3606 }
3607 }
3608
3609 while () {
3610 @queue or last outer;
3611
3612 $widget = pop @{ $queue[-1] || [] }
3613 and last;
3614
3615 pop @queue;
3616 }
3617
3618 delete $queue{$widget+0};
3619
3620 my ($w, $h) = $widget->size_request;
3621
3622 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3623 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3624
3625 $w = $widget->{force_w} if exists $widget->{force_w};
3626 $h = $widget->{force_h} if exists $widget->{force_h};
3627
3628 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3629 || delete $widget->{force_realloc}) {
3630 $widget->{req_w} = $w;
3631 $widget->{req_h} = $h;
3632
3633 $self->{size_alloc}{$widget+0} = $widget;
3634
3635 if (my $parent = $widget->{parent}) {
3636 $self->{realloc}{$parent+0} = $parent
3637 unless $queue{$parent+0};
3638
3639 $parent->{force_size_alloc} = 1;
3640 $self->{size_alloc}{$parent+0} = $parent;
3641 }
3642 }
3643
3644 delete $self->{realloc}{$widget+0};
3645 }
3646 }
3647
3648 while (my $size_alloc = delete $self->{size_alloc}) {
3649 my @queue = sort { $b->{visible} <=> $a->{visible} }
3650 values %$size_alloc;
3651
3652 while () {
3653 my $widget = pop @queue || last;
3654
3655 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3656
3657 $w = 0 if $w < 0;
3658 $h = 0 if $h < 0;
3659
3660 $w = int $w + 0.5;
3661 $h = int $h + 0.5;
3662
3663 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3664 $widget->{old_w} = $widget->{w};
3665 $widget->{old_h} = $widget->{h};
3666
3667 $widget->{w} = $w;
3668 $widget->{h} = $h;
3669
3670 $widget->emit (size_allocate => $w, $h);
3671 }
3672 }
3673 }
3674
3675 while ($self->{post_alloc_hook}) {
3676 $_->()
3677 for values %{delete $self->{post_alloc_hook}};
3678 }
3679
2437 3680
2438 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3681 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3682 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440 glClear GL_COLOR_BUFFER_BIT; 3683 glClear GL_COLOR_BUFFER_BIT;
2441 3684
2442 glMatrixMode GL_PROJECTION; 3685 glMatrixMode GL_PROJECTION;
2443 glLoadIdentity; 3686 glLoadIdentity;
2444 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3687 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2445 glMatrixMode GL_MODELVIEW; 3688 glMatrixMode GL_MODELVIEW;
2446 glLoadIdentity; 3689 glLoadIdentity;
2447 3690
3691 {
3692 package CFClient::UI::Base;
3693
3694 ($draw_x, $draw_y, $draw_w, $draw_h) =
3695 (0, 0, $self->{w}, $self->{h});
3696 }
3697
2448 $self->_draw; 3698 $self->_draw;
2449} 3699}
2450 3700
2451############################################################################# 3701#############################################################################
2452 3702
2453package CFClient::UI; 3703package CFClient::UI;
2454 3704
2455$ROOT = new CFClient::UI::Root; 3705$ROOT = new CFClient::UI::Root;
2456$TOOLTIP = new CFClient::UI::Tooltip; 3706$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2457 3707
24581 37081
2459 3709

Diff Legend

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