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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC

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

Diff Legend

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