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.275 by root, Sat Jun 3 22:50:48 2006 UTC

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

Diff Legend

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