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

Diff Legend

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