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.165 by root, Mon Apr 24 08:22:22 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_markup ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31 } 61 }
32 62
33 return; 63 return;
34 } 64 }
… …
39 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
40} 70}
41 71
42# class methods for events 72# class methods for events
43sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 75 if $FOCUS;
46} 76}
47 77
48sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 80 if $FOCUS;
51} 81}
52 82
53sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
54 my ($ev) = @_; 84 my ($ev) = @_;
… …
63 check_tooltip; 93 check_tooltip;
64 } 94 }
65 95
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 97
68 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 100}
73 101
74sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
75 my ($ev) = @_; 103 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
77 105
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 107
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 109
82 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 112
87 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 115 $grab->update if $grab;
90 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 133
108 check_tooltip; 134 check_tooltip;
109 } 135 }
110 136
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 138 if $HOVER;
115} 139}
116 140
117# convert position array to integers 141# convert position array to integers
118sub harmonize { 142sub harmonize {
119 my ($vals) = @_; 143 my ($vals) = @_;
… …
125 $rem += $_ - $i; 149 $rem += $_ - $i;
126 $_ = $i; 150 $_ = $i;
127 } 151 }
128} 152}
129 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
130############################################################################# 195#############################################################################
131 196
132package CFClient::UI::Base; 197package CFClient::UI::Base;
133 198
134use strict; 199use strict;
… …
137 202
138sub new { 203sub new {
139 my $class = shift; 204 my $class = shift;
140 205
141 my $self = bless { 206 my $self = bless {
142 x => 0, 207 x => "center",
143 y => 0, 208 y => "center",
144 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
145 can_events => 1, 212 can_events => 1,
146 @_ 213 @_
147 }, $class; 214 }, $class;
148 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
149 for (keys %$self) { 218 for (keys %$self) {
150 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
152 } 221 }
153 } 222 }
154 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
155 $self 236 $self
156} 237}
157 238
158sub destroy { 239sub destroy {
159 my ($self) = @_; 240 my ($self) = @_;
… …
168 return if $self->{parent}; 249 return if $self->{parent};
169 250
170 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
171} 252}
172 253
173sub hide { 254sub set_visible {
174 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
175 278
176 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
178 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
179 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
180 if $self->{parent}; 313 if $self->{parent};
181} 314}
182 315
183sub move { 316sub move_abs {
184 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
185 318
186 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
189 322
190 $self->update; 323 $self->update;
191} 324}
192 325
193sub set_size { 326sub set_size {
194 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
195 328
196 $self->{user_w} = $w; 329 $self->{force_w} = $w;
197 $self->{user_h} = $h; 330 $self->{force_h} = $h;
198 331
199 $self->check_size; 332 $self->realloc;
200} 333}
201 334
202sub size_request { 335sub size_request {
203 require Carp; 336 require Carp;
204 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
206 339
207sub configure { 340sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
209 342
210 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
213 348
214 # use alignment to adjust x, y 349 # use alignment to adjust x, y
215 350
216 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 353 }
221 354
222 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 356 $self->{x} = $x;
224 $self->{y} = $y; 357 $self->{y} = $y;
225 $self->update; 358 $self->update;
226 } 359 }
227 360
228 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
229 $self->{w} = $w; 364 $self->{alloc_w} = $w;
230 $self->{h} = $h; 365 $self->{alloc_h} = $h;
231 366
232 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 368 }
235} 369}
236 370
237sub size_allocate { 371sub size_allocate {
238 # nothing to be done 372 # nothing to be done
239} 373}
240 374
375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
381}
382
241sub set_max_size { 383sub set_max_size {
242 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
243 385
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 388}
247 389
248# return top left coordinates 390sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 391 my ($self, $tooltip) = @_;
251 392
252 $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 }
253} 404}
254 405
255# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
256sub coord2local { 407sub coord2local {
257 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
258 409
259 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 411}
262 412
263# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
264sub coord2global { 414sub coord2global {
265 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
266 416
267 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 418}
270 419
271sub focus_in { 420sub focus_in {
272 my ($self) = @_; 421 my ($self) = @_;
273 422
274 return if $FOCUS == $self; 423 return if $FOCUS == $self;
275 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
276 425
277 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
278 427
279 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
280 429
281 $focus->update if $focus; 430 $focus->update if $focus;
282 $FOCUS->update; 431 $FOCUS->update;
283} 432}
284 433
… …
287 436
288 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
289 438
290 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
291 440
292 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
293 442
294 $focus->update if $focus; #? 443 $focus->update if $focus; #?
295}
296 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
297sub mouse_motion { } 449sub mouse_motion { 0 }
298sub button_up { } 450sub button_up { 0 }
299sub key_down { } 451sub key_down { 0 }
300sub key_up { } 452sub key_up { 0 }
301 453
302sub button_down { 454sub button_down {
303 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
304 456
305 $self->focus_in; 457 $self->focus_in;
306}
307 458
308sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
309sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
310sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
311sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
312sub 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
313 535
314sub draw { 536sub draw {
315 my ($self) = @_; 537 my ($self) = @_;
316 538
317 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);
318 550
319 glPushMatrix; 551 glPushMatrix;
320 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
321 $self->_draw; 553 $self->_draw;
322 glPopMatrix; 554 glPopMatrix;
… …
334 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
335 glEnd; 567 glEnd;
336 glDisable GL_BLEND; 568 glDisable GL_BLEND;
337 } 569 }
338 570
339 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
340 glPushMatrix; 572 glPushMatrix;
341 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0; 576 glVertex 0 , 0;
345 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
346 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
347 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
348 glEnd; 580 glEnd;
349 glPopMatrix; 581 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 } 583 }
352} 584}
353 585
354sub _draw { 586sub _draw {
355 my ($self) = @_; 587 my ($self) = @_;
356 588
357 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
358} 590}
359 591
360sub find_widget {
361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
364
365 return $self
366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
368
369 ()
370}
371
372sub set_parent {
373 my ($self, $parent) = @_;
374
375 Scalar::Util::weaken ($self->{parent} = $parent);
376}
377
378sub check_size {
379 my ($self) = @_;
380
381 $self->{parent}
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402}
403
404sub update {
405 my ($self) = @_;
406
407 $self->{parent}->update
408 if $self->{parent};
409}
410
411sub connect {
412 my ($self, $signal, $cb) = @_;
413
414 push @{ $self->{signal_cb}{$signal} }, $cb;
415}
416
417sub emit {
418 my ($self, $signal, @args) = @_;
419
420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
421}
422
423sub DESTROY { 592sub DESTROY {
424 my ($self) = @_; 593 my ($self) = @_;
425 594
595 delete $WIDGET{$self+0};
426 #$self->deactivate; 596 #$self->deactivate;
427} 597}
428 598
429############################################################################# 599#############################################################################
430 600
… …
439 my $class = shift; 609 my $class = shift;
440 610
441 # range [value, low, high, page] 611 # range [value, low, high, page]
442 612
443 $class->SUPER::new ( 613 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 614 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 615 #active_bg => [1, 1, 1, 0.5],
446 @_ 616 @_
447 ) 617 )
448} 618}
449 619
450sub _draw { 620sub _draw {
451 my ($self) = @_; 621 my ($self) = @_;
452 622
623 my $color = $FOCUS == $self && $self->{active_bg}
624 ? $self->{active_bg}
625 : $self->{bg};
626
627 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 628 my ($w, $h) = @$self{qw(w h)};
454 629
455 glEnable GL_BLEND; 630 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 632 glColor @$color;
458 633
459 glBegin GL_QUADS; 634 glBegin GL_QUADS;
460 glVertex 0 , 0; 635 glVertex 0 , 0;
461 glVertex 0 , $h; 636 glVertex 0 , $h;
462 glVertex $w, $h; 637 glVertex $w, $h;
463 glVertex $w, 0; 638 glVertex $w, 0;
464 glEnd; 639 glEnd;
465 640
466 glDisable GL_BLEND; 641 glDisable GL_BLEND;
642 }
467} 643}
468 644
469############################################################################# 645#############################################################################
470 646
471package CFClient::UI::Empty; 647package CFClient::UI::Empty;
… …
476 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
478} 654}
479 655
480sub size_request { 656sub size_request {
481 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
482} 660}
483 661
484sub draw { } 662sub draw { }
485 663
486############################################################################# 664#############################################################################
… …
490our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
491 669
492sub new { 670sub new {
493 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
494 672
495 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
496 674
497 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
498 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
499 683
500 $self 684 $self
501} 685}
502 686
503sub add { 687sub add {
504 my ($self, $child) = @_; 688 my ($self, @widgets) = @_;
505 689
506 $child->set_parent ($self); 690 $_->set_parent ($self)
691 for @widgets;
507 692
508 use sort 'stable'; 693 use sort 'stable';
509 694
510 $self->{children} = [ 695 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 697 @{$self->{children}}, @widgets
513 ]; 698 ];
514 699
515 $child->check_size; 700 $self->realloc;
701}
702
703sub children {
704 @{ $_[0]{children} }
516} 705}
517 706
518sub remove { 707sub remove {
519 my ($self, $child) = @_; 708 my ($self, $child) = @_;
520 709
521 delete $child->{parent}; 710 delete $child->{parent};
522 $child->hide; 711 $child->hide;
523 712
524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
525 714
526 $self->check_size; 715 $self->realloc;
527 $self->update;
528} 716}
529 717
530sub clear { 718sub clear {
531 my ($self) = @_; 719 my ($self) = @_;
532 720
… …
535 723
536 for (@$children) { 724 for (@$children) {
537 delete $_->{parent}; 725 delete $_->{parent};
538 $_->hide; 726 $_->hide;
539 } 727 }
728
729 $self->realloc;
540} 730}
541 731
542sub find_widget { 732sub find_widget {
543 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
544 734
545 $x -= $self->{x}; 735 $x -= $self->{x};
546 $y -= $self->{y}; 736 $y -= $self->{y};
547 737
548 my $res; 738 my $res;
549 739
550 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
551 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
552 and return $res; 742 and return $res;
553 } 743 }
554 744
555 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
619} 809}
620 810
621sub update { 811sub update {
622 my ($self) = @_; 812 my ($self) = @_;
623 813
624 # we want to do this delayed... 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 815 $self->SUPER::update;
627}
628
629sub render_chld {
630 my ($self) = @_;
631
632 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633 glClearColor 0, 0, 0, 1;
634 glClear GL_COLOR_BUFFER_BIT;
635 $self->child->draw;
636 };
637} 816}
638 817
639sub size_allocate { 818sub size_allocate {
640 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
641 820
642 $self->child->configure (0, 0, $w, $h); 821 $self->SUPER::size_allocate ($w, $h);
822 $self->update;
823}
643 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
644 $self->render_chld; 845 $self->_render;
846 };
645} 847}
646 848
647sub _draw { 849sub _draw {
648 my ($self) = @_; 850 my ($self) = @_;
649 851
650 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
651 853
652 my $tex = $self->{texture} 854 my $tex = $self->{texture}
653 or return; 855 or return;
654 856
655 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
658 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;
659 860
660 $tex->draw_quad (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
661 862
662 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
664} 864}
665 865
666############################################################################# 866#############################################################################
667 867
668package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
669 869
670our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
671
672sub new { die }
673
674sub size_request {
675 my ($self) = @_;
676
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
679
680 @$self{qw(child_w child_h)}
681}
682
683sub _draw {
684 my ($self) = @_;
685
686 $self->{children}[1]->draw;
687}
688
689
690#############################################################################
691
692package CFClient::UI::Frame;
693
694our @ISA = CFClient::UI::Bin::;
695
696use CFClient::OpenGL;
697 871
698sub new { 872sub new {
699 my $class = shift; 873 my $class = shift;
700 874
701 my $self = $class->SUPER::new ( 875 $class->SUPER::new (
702 bg => [1, 1, 1, 1], 876 scroll_x => 0,
703 border_bg => [1, 1, 1, 1], 877 scroll_y => 1,
704 border => 0.8,
705 @_ 878 @_,
706 ); 879 )
707
708 $self
709} 880}
710 881
711sub _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 {
712 my ($self) = @_; 894 my ($self, $w, $h) = @_;
713 895
714 my ($w, $h) = ($self->{w}, $self->{h}); 896 my $child = $self->child;
715 897
716 glEnable GL_BLEND; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
718 glEnable GL_TEXTURE_2D;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720 900
721# glBegin GL_QUADS; 901 $self->child->configure (0, 0, $w, $h);
722# glColor 0, 0, 0, 0; 902 $self->update;
723# glVertex 0 , 0;
724# glVertex 0 , $h;
725# glVertex $w, $h;
726# glVertex $w, 0;
727# glEnd;
728
729
730 $self->child->draw;
731 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D;
733} 903}
734 904
735############################################################################# 905sub set_offset {
906 my ($self, $x, $y) = @_;
736 907
737package CFClient::UI::FancyFrame; 908 $self->{view_x} = int $x;
909 $self->{view_y} = int $y;
738 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
739our @ISA = CFClient::UI::Bin::; 957our @ISA = CFClient::UI::HBox::;
740
741use CFClient::OpenGL;
742
743my @tex =
744 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
745 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
746 958
747sub new { 959sub new {
748 my $class = shift; 960 my $class = shift;
749 961
750 # 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};
751 1067
752 my $self = $class->SUPER::new ( 1068 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 1069 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 1070 border_bg => [1, 1, 1, 1],
755 border => 0.8, 1071 border => 0.6,
756 @_ 1072 can_events => 1,
1073 min_w => 16,
1074 min_h => 16,
1075 %arg,
757 ); 1076 );
758 1077
759 $self->{title} &&= new CFClient::UI::Label 1078 $self->{title} = new CFClient::UI::Label
760 align => 0, 1079 align => 0,
761 valign => 1, 1080 valign => 1,
762 text => $self->{title}, 1081 text => $title,
763 fontsize => 1; 1082 fontsize => $self->{border}
1083 if defined $title;
764 1084
765 $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};
766} 1093}
767 1094
768sub border { 1095sub border {
769 int $_[0]{border} * $::FONTSIZE 1096 int $_[0]{border} * $::FONTSIZE
770} 1097}
771 1098
772sub size_request { 1099sub size_request {
773 my ($self) = @_; 1100 my ($self) = @_;
1101
1102 $self->{title}->size_request
1103 if $self->{title};
774 1104
775 my ($w, $h) = $self->SUPER::size_request; 1105 my ($w, $h) = $self->SUPER::size_request;
776 1106
777 ( 1107 (
778 $w + $self->border * 2, 1108 $w + $self->border * 2,
… …
781} 1111}
782 1112
783sub size_allocate { 1113sub size_allocate {
784 my ($self, $w, $h) = @_; 1114 my ($self, $w, $h) = @_;
785 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
786 $h -= List::Util::max 0, $self->border * 2; 1124 $h -= List::Util::max 0, $border * 2;
787 $w -= List::Util::max 0, $self->border * 2; 1125 $w -= List::Util::max 0, $border * 2;
788 1126
789 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
790 if $self->{title};
791
792 $self->child->configure ($self->border, $self->border, $w, $h); 1127 $self->child->configure ($border, $border, $w, $h);
793} 1128}
794 1129
795sub button_down { 1130sub button_down {
796 my ($self, $ev, $x, $y) = @_; 1131 my ($self, $ev, $x, $y) = @_;
797 1132
1133 my ($w, $h) = @$self{qw(w h)};
798 my $border = $self->border; 1134 my $border = $self->border;
799 1135
800 if ($x < $self->{w} && $x >= $self->{w} - $border 1136 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
801 && $y < $self->{h} && $y >= $self->{h} - $border) { 1137 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
802 1138
1139 if ($lr & $td) {
1140 my ($wx, $wy) = ($self->{x}, $self->{y});
803 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1141 my ($ox, $oy) = ($ev->{x}, $ev->{y});
804 my ($bw, $bh) = ($self->{w}, $self->{h}); 1142 my ($bw, $bh) = ($self->{w}, $self->{h});
805 1143
1144 my $mx = $x < $border;
1145 my $my = $y < $border;
1146
806 $self->{motion} = sub { 1147 $self->{motion} = sub {
807 my ($ev, $x, $y) = @_; 1148 my ($ev, $x, $y) = @_;
808 1149
809 ($x, $y) = ($ev->{x}, $ev->{y}); 1150 my $dx = $ev->{x} - $ox;
1151 my $dy = $ev->{y} - $oy;
810 1152
811 $self->{user_w} = $bw + $x - $ox; 1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
812 $self->{user_h} = $bh + $y - $oy; 1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
813 $self->check_size; 1155
1156 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
814 }; 1158 };
815 1159
816 } elsif ($x >= 0 && $x < $self->{w} 1160 } elsif ($lr ^ $td) {
817 && $y >= 0 && $y < $border) {
818
819 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1161 my ($ox, $oy) = ($ev->{x}, $ev->{y});
820 my ($bx, $by) = ($self->{x}, $self->{y}); 1162 my ($bx, $by) = ($self->{x}, $self->{y});
821 1163
822 $self->{motion} = sub { 1164 $self->{motion} = sub {
823 my ($ev, $x, $y) = @_; 1165 my ($ev, $x, $y) = @_;
824 1166
825 ($x, $y) = ($ev->{x}, $ev->{y}); 1167 ($x, $y) = ($ev->{x}, $ev->{y});
826 1168
827 $self->move ($bx + $x - $ox, $by + $y - $oy); 1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
828 $self->update;
829 }; 1170 };
1171 } else {
1172 return 0;
1173 }
1174
830 } 1175 1
831} 1176}
832 1177
833sub button_up { 1178sub button_up {
834 my ($self, $ev, $x, $y) = @_; 1179 my ($self, $ev, $x, $y) = @_;
835 1180
836 delete $self->{motion}; 1181 !!delete $self->{motion}
837} 1182}
838 1183
839sub mouse_motion { 1184sub mouse_motion {
840 my ($self, $ev, $x, $y) = @_; 1185 my ($self, $ev, $x, $y) = @_;
841 1186
842 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1187 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188
1189 !!$self->{motion}
843} 1190}
844 1191
845sub _draw { 1192sub _draw {
846 my ($self) = @_; 1193 my ($self) = @_;
847 1194
1195 my $child = $self->{children}[0];
1196
848 my ($w, $h ) = ($self->{w}, $self->{h}); 1197 my ($w, $h ) = ($self->{w}, $self->{h});
849 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1198 my ($cw, $ch) = ($child->{w}, $child->{h});
850 1199
851 glEnable GL_BLEND;
852 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
853 glEnable GL_TEXTURE_2D; 1200 glEnable GL_TEXTURE_2D;
854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
855 1202
856 my $border = $self->border; 1203 my $border = $self->border;
857 1204
858 glColor @{ $self->{border_bg} }; 1205 glColor @{ $self->{border_bg} };
859 $tex[1]->draw_quad (0, 0, $w, $border); 1206 $border[0]->draw_quad_alpha (0, 0, $w, $border);
860 $tex[3]->draw_quad (0, $border, $border, $ch); 1207 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
861 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1208 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
862 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1209 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
863 1210
864 my $bg = $tex[0]; 1211 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1212 glColor @{ $self->{bg} };
865 1213
866 # TODO: repeat texture not scale 1214 # TODO: repeat texture not scale
867 my $rep_x = $cw / $bg->{w}; 1215 # solve this better(?)
868 my $rep_y = $ch / $bg->{h}; 1216 $bg->{s} = $cw / $bg->{w};
869 1217 $bg->{t} = $ch / $bg->{h};
870 glColor @{ $self->{bg} };
871
872 $bg->{s} = $rep_x;
873 $bg->{t} = $rep_y;
874 $bg->{wrap_mode} = 1;
875 $bg->draw_quad ($border, $border, $cw, $ch); 1218 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1219 }
876 1220
877 glDisable GL_TEXTURE_2D; 1221 glDisable GL_TEXTURE_2D;
878 glDisable GL_BLEND;
879 1222
880 $self->{title}->draw if $self->{title};
881 $self->child->draw; 1223 $child->draw;
1224
1225 if ($self->{title}) {
1226 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw;
1228 }
882} 1229}
883 1230
884############################################################################# 1231#############################################################################
885 1232
886package CFClient::UI::Table; 1233package CFClient::UI::Table;
… …
894sub new { 1241sub new {
895 my $class = shift; 1242 my $class = shift;
896 1243
897 $class->SUPER::new ( 1244 $class->SUPER::new (
898 col_expand => [], 1245 col_expand => [],
899 @_ 1246 @_,
900 ) 1247 )
1248}
1249
1250sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} }
901} 1252}
902 1253
903sub add { 1254sub add {
904 my ($self, $x, $y, $child) = @_; 1255 my ($self, $x, $y, $child) = @_;
905 1256
906 $child->set_parent ($self); 1257 $child->set_parent ($self);
907 $self->{children}[$y][$x] = $child; 1258 $self->{children}[$y][$x] = $child;
908 1259
909 $child->check_size; 1260 $self->realloc;
910} 1261}
911 1262
912# 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?
913sub clear { 1264sub clear {
914 my ($self) = @_; 1265 my ($self) = @_;
915 1266
916 my $children = delete $self->{children}; 1267 my @children = $self->children;
1268 delete $self->{children};
917 1269
918 for (grep $_, map @$_, grep $_, @$children) { 1270 for (@children) {
919 delete $_->{parent}; 1271 delete $_->{parent};
920 $_->hide; 1272 $_->hide;
921 } 1273 }
922 1274
923 $self->update; 1275 $self->realloc;
924} 1276}
925 1277
926sub get_wh { 1278sub get_wh {
927 my ($self) = @_; 1279 my ($self) = @_;
928 1280
… …
959sub size_allocate { 1311sub size_allocate {
960 my ($self, $w, $h) = @_; 1312 my ($self, $w, $h) = @_;
961 1313
962 my ($ws, $hs) = $self->get_wh; 1314 my ($ws, $hs) = $self->get_wh;
963 1315
964 my $req_w = sum @$ws; 1316 my $req_w = (sum @$ws) || 1;
965 my $req_h = sum @$hs; 1317 my $req_h = (sum @$hs) || 1;
966 1318
967 # TODO: nicer code && do row_expand 1319 # TODO: nicer code && do row_expand
968 my @col_expand = @{$self->{col_expand}}; 1320 my @col_expand = @{$self->{col_expand}};
969 @col_expand = (1) x @$ws unless @col_expand; 1321 @col_expand = (1) x @$ws unless @col_expand;
970 my $col_expand = (sum @col_expand) || 1; 1322 my $col_expand = (sum @col_expand) || 1;
… …
1024 } 1376 }
1025} 1377}
1026 1378
1027############################################################################# 1379#############################################################################
1028 1380
1029package CFClient::UI::HBox; 1381package CFClient::UI::Box;
1030
1031# TODO: wrap into common Box base class
1032 1382
1033our @ISA = CFClient::UI::Container::; 1383our @ISA = CFClient::UI::Container::;
1034 1384
1035sub size_request { 1385sub size_request {
1036 my ($self) = @_; 1386 my ($self) = @_;
1037 1387
1038 my @alloc = map [$_->size_request], @{$self->{children}}; 1388 $self->{vertical}
1039 1389 ? (
1040 ( 1390 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1041 (List::Util::sum map $_->[0], @alloc), 1391 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1042 (List::Util::max map $_->[1], @alloc), 1392 )
1043 ) 1393 : (
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 )
1044} 1397}
1045 1398
1046sub size_allocate { 1399sub size_allocate {
1047 my ($self, $w, $h) = @_; 1400 my ($self, $w, $h) = @_;
1048 1401
1049 ($h, $w) = ($w, $h); 1402 my $space = $self->{vertical} ? $h : $w;
1050
1051 my $children = $self->{children}; 1403 my $children = $self->{children};
1052 1404
1053 my @h = map $_->{req_w}, @$children; 1405 my @req;
1054 1406
1055 my $req_h = List::Util::sum @h; 1407 if ($self->{homogeneous}) {
1056 1408 @req = ($space / (@$children || 1)) x @$children;
1057 if ($req_h > $h) {
1058 # ah well, not enough space
1059 $_ *= $h / $req_h for @h;
1060 } 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 {
1061 my $exp = List::Util::sum map $_->{expand}, @$children; 1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1062 $exp ||= 1;
1063 1418
1419 $space = ($space - $req) / $expand; # remaining space to give away
1420
1421 $req[$_] += $space * $children->[$_]{expand}
1064 for (0 .. $#$children) { 1422 for 0 .. $#$children;
1065 my $child = $children->[$_];
1066
1067 my $alloc_h = $h[$_];
1068 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1069 $h[$_] = $alloc_h;
1070 } 1423 }
1071 } 1424 }
1072 1425
1073 CFClient::UI::harmonize \@h; 1426 CFClient::UI::harmonize \@req;
1074 1427
1075 my $y = 0; 1428 my $pos = 0;
1076 for (0 .. $#$children) { 1429 for (0 .. $#$children) {
1077 my $child = $children->[$_];
1078 my $h = $h[$_]; 1430 my $alloc = $req[$_];
1079 $child->configure ($y, 0, $h, $w); 1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1080 1432
1081 $y += $h; 1433 $pos += $alloc;
1082 } 1434 }
1083 1435
1084 1 1436 1
1085} 1437}
1086 1438
1087############################################################################# 1439#############################################################################
1088 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
1089package CFClient::UI::VBox; 1456package CFClient::UI::VBox;
1090 1457
1091# TODO: wrap into common Box base class
1092
1093our @ISA = CFClient::UI::Container::; 1458our @ISA = CFClient::UI::Box::;
1094 1459
1095sub size_request { 1460sub new {
1096 my ($self) = @_; 1461 my $class = shift;
1097 1462
1098 my @alloc = map [$_->size_request], @{$self->{children}}; 1463 $class->SUPER::new (
1099 1464 vertical => 1,
1100 ( 1465 @_,
1101 (List::Util::max map $_->[0], @alloc),
1102 (List::Util::sum map $_->[1], @alloc),
1103 ) 1466 )
1104} 1467}
1105 1468
1106sub size_allocate {
1107 my ($self, $w, $h) = @_;
1108
1109 my $children = $self->{children};
1110
1111 my @h = map $_->{req_h}, @$children;
1112
1113 my $req_h = List::Util::sum @h;
1114
1115 if ($req_h > $h) {
1116 # ah well, not enough space
1117 $_ *= $h / $req_h for @h;
1118 } else {
1119 my $exp = List::Util::sum map $_->{expand}, @$children;
1120 $exp ||= 1;
1121
1122 for (0 .. $#$children) {
1123 my $child = $children->[$_];
1124
1125 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1126 }
1127 }
1128
1129 CFClient::UI::harmonize \@h;
1130
1131 my $y = 0;
1132 for (0 .. $#$children) {
1133 my $child = $children->[$_];
1134 my $h = $h[$_];
1135 $child->configure (0, $y, $w, $h);
1136
1137 $y += $h;
1138 }
1139
1140 1
1141}
1142
1143############################################################################# 1469#############################################################################
1144 1470
1145package CFClient::UI::Label; 1471package CFClient::UI::Label;
1146 1472
1147our @ISA = CFClient::UI::Base::; 1473our @ISA = CFClient::UI::DrawBG::;
1148 1474
1149use CFClient::OpenGL; 1475use CFClient::OpenGL;
1150 1476
1151sub new { 1477sub new {
1152 my ($class, %arg) = @_; 1478 my ($class, %arg) = @_;
1153 1479
1154 my $self = $class->SUPER::new ( 1480 my $self = $class->SUPER::new (
1155 fg => [1, 1, 1], 1481 fg => [1, 1, 1],
1482 #bg => none
1483 #active_bg => none
1156 #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),
1157 fontsize => 1, 1490 fontsize => 1,
1158 text => "",
1159 align => -1, 1491 align => -1,
1160 valign => -1, 1492 valign => -1,
1161 padding => 2, 1493 padding_x => 2,
1162 layout => new CFClient::Layout, 1494 padding_y => 2,
1163 can_events => 0, 1495 can_events => 0,
1164 %arg 1496 %arg
1165 ); 1497 );
1166 1498
1167 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
1168 my $layout = new CFClient::Layout; 1500 my $layout = new CFClient::Layout;
1169 $layout->set_text (delete $self->{template}); 1501 $layout->set_text (delete $self->{template});
1170 $self->{template} = $layout; 1502 $self->{template} = $layout;
1171 } 1503 }
1172 1504
1173 $self->set_text (delete $self->{text}) if exists $self->{text}; 1505 if (exists $self->{markup}) {
1174 $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 }
1175 1510
1176 $self 1511 $self
1177} 1512}
1178 1513
1179sub escape { 1514sub escape($) {
1180 local $_ = $_[1]; 1515 local $_ = $_[0];
1181 1516
1182 s/&/&amp;/g; 1517 s/&/&amp;/g;
1183 s/>/&gt;/g; 1518 s/>/&gt;/g;
1184 s/</&lt;/g; 1519 s/</&lt;/g;
1185 1520
1186 $_[1] 1521 $_
1522}
1523
1524sub update {
1525 my ($self) = @_;
1526
1527 delete $self->{texture};
1528 $self->SUPER::update;
1187} 1529}
1188 1530
1189sub set_text { 1531sub set_text {
1190 my ($self, $text) = @_; 1532 my ($self, $text) = @_;
1191 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;
1192 $self->{layout}->set_text ($text); 1538 $self->{layout}->set_text ($text);
1193 1539
1194 delete $self->{texture}; 1540 $self->realloc;
1195 $self->check_size;
1196 $self->update; 1541 $self->update;
1197} 1542}
1198 1543
1199sub set_markup { 1544sub set_markup {
1200 my ($self, $markup) = @_; 1545 my ($self, $markup) = @_;
1201 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;
1202 $self->{layout}->set_markup ($markup); 1553 $self->{layout}->set_markup ($markup);
1203 1554
1204 delete $self->{texture}; 1555 $self->realloc;
1205 $self->check_size;
1206 $self->update; 1556 $self->update;
1207} 1557}
1208 1558
1209sub size_request { 1559sub size_request {
1210 my ($self) = @_; 1560 my ($self) = @_;
1211 1561
1212 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1562 $self->{layout}->set_font ($self->{font}) if $self->{font};
1213 $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});
1214 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1215 1567
1216 my ($w, $h) = $self->{layout}->size; 1568 my ($w, $h) = $self->{layout}->size;
1217 1569
1218 if (exists $self->{template}) { 1570 if (exists $self->{template}) {
… …
1223 1575
1224 $w = List::Util::max $w, $w2; 1576 $w = List::Util::max $w, $w2;
1225 $h = List::Util::max $h, $h2; 1577 $h = List::Util::max $h, $h2;
1226 } 1578 }
1227 1579
1228 ( 1580 ($w, $h)
1229 $w + $self->{padding} * 2,
1230 $h + $self->{padding} * 2,
1231 )
1232} 1581}
1233 1582
1234sub size_allocate { 1583sub size_allocate {
1235 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1236 1585
1586 delete $self->{ox};
1587
1237 delete $self->{texture}; 1588 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1238} 1590}
1239 1591
1240sub set_fontsize { 1592sub set_fontsize {
1241 my ($self, $fontsize) = @_; 1593 my ($self, $fontsize) = @_;
1242 1594
1243 $self->{fontsize} = $fontsize; 1595 $self->{fontsize} = $fontsize;
1244 delete $self->{texture}; 1596 delete $self->{texture};
1245 $self->check_size; 1597
1246 $self->update; 1598 $self->realloc;
1247} 1599}
1248 1600
1249sub _draw { 1601sub _draw {
1250 my ($self) = @_; 1602 my ($self) = @_;
1251 1603
1604 $self->SUPER::_draw; # draw background, if applicable
1605
1252 my $tex = $self->{texture} ||= do { 1606 my $tex = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}});
1253 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1608 $self->{layout}->set_font ($self->{font}) if $self->{font};
1254 $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});
1255 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613
1256 new_from_layout CFClient::Texture $self->{layout} 1614 new_from_layout CFClient::Texture $self->{layout}
1257 }; 1615 };
1258 1616
1259 glEnable GL_BLEND; 1617 unless (exists $self->{ox}) {
1260 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
1261 glEnable GL_TEXTURE_2D; 1627 glEnable GL_TEXTURE_2D;
1262 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1263 1629
1630 if ($tex->{format} == GL_ALPHA) {
1264 glColor @{$self->{fg}}; 1631 glColor @{$self->{fg}};
1265
1266 $self->{ox} = int (
1267 $self->{align} < 0 ? $self->{padding}
1268 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1269 : ($self->{w} - $tex->{w}) * 0.5
1270 );
1271
1272 $self->{oy} = int (
1273 $self->{valign} < 0 ? $self->{padding}
1274 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1275 : ($self->{h} - $tex->{h}) * 0.5
1276 );
1277
1278 $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 }
1279 1636
1280 glDisable GL_TEXTURE_2D; 1637 glDisable GL_TEXTURE_2D;
1281 glDisable GL_BLEND;
1282} 1638}
1283 1639
1284############################################################################# 1640#############################################################################
1285 1641
1286package CFClient::UI::EntryBase; 1642package CFClient::UI::EntryBase;
… …
1299 active_fg => [0, 0, 0], 1655 active_fg => [0, 0, 0],
1300 can_hover => 1, 1656 can_hover => 1,
1301 can_focus => 1, 1657 can_focus => 1,
1302 valign => 0, 1658 valign => 0,
1303 can_events => 1, 1659 can_events => 1,
1660 #text => ...
1304 @_ 1661 @_
1305 ) 1662 )
1306} 1663}
1307 1664
1308sub _set_text { 1665sub _set_text {
… …
1318 $self->{text} = $text; 1675 $self->{text} = $text;
1319 1676
1320 $text =~ s/./*/g if $self->{hidden}; 1677 $text =~ s/./*/g if $self->{hidden};
1321 $self->{layout}->set_text ("$text "); 1678 $self->{layout}->set_text ("$text ");
1322 1679
1323 $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;
1324} 1690}
1325 1691
1326sub get_text { 1692sub get_text {
1327 $_[0]{text} 1693 $_[0]{text}
1328} 1694}
… …
1331 my ($self) = @_; 1697 my ($self) = @_;
1332 1698
1333 my ($w, $h) = $self->SUPER::size_request; 1699 my ($w, $h) = $self->SUPER::size_request;
1334 1700
1335 ($w + 1, $h) # add 1 for cursor 1701 ($w + 1, $h) # add 1 for cursor
1336}
1337
1338sub size_allocate {
1339 my ($self, $w, $h) = @_;
1340
1341 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1342}
1343
1344sub set_text {
1345 my ($self, $text) = @_;
1346
1347 $self->{cursor} = length $text;
1348 $self->_set_text ($text);
1349 $self->update;
1350} 1702}
1351 1703
1352sub key_down { 1704sub key_down {
1353 my ($self, $ev) = @_; 1705 my ($self, $ev) = @_;
1354 1706
… …
1356 my $sym = $ev->{sym}; 1708 my $sym = $ev->{sym};
1357 my $uni = $ev->{unicode}; 1709 my $uni = $ev->{unicode};
1358 1710
1359 my $text = $self->get_text; 1711 my $text = $self->get_text;
1360 1712
1361 if ($sym == 8) { 1713 if ($uni == 8) {
1362 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1714 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1363 } elsif ($sym == 127) { 1715 } elsif ($uni == 127) {
1364 substr $text, $self->{cursor}, 1, ""; 1716 substr $text, $self->{cursor}, 1, "";
1365 } elsif ($sym == CFClient::SDLK_LEFT) { 1717 } elsif ($sym == CFClient::SDLK_LEFT) {
1366 --$self->{cursor} if $self->{cursor}; 1718 --$self->{cursor} if $self->{cursor};
1367 } elsif ($sym == CFClient::SDLK_RIGHT) { 1719 } elsif ($sym == CFClient::SDLK_RIGHT) {
1368 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1720 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1369 } elsif ($sym == CFClient::SDLK_HOME) { 1721 } elsif ($sym == CFClient::SDLK_HOME) {
1370 $self->{cursor} = 0; 1722 $self->{cursor} = 0;
1371 } elsif ($sym == CFClient::SDLK_END) { 1723 } elsif ($sym == CFClient::SDLK_END) {
1372 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1373 } elsif ($sym == 27) { 1725 } elsif ($uni == 27) {
1374 $self->emit ('escape'); 1726 $self->_emit ('escape');
1375 } elsif ($uni) { 1727 } elsif ($uni) {
1376 substr $text, $self->{cursor}++, 0, chr $uni; 1728 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else {
1730 return 0;
1377 } 1731 }
1378 1732
1379 $self->_set_text ($text); 1733 $self->_set_text ($text);
1380 $self->update; 1734
1735 $self->realloc;
1736
1737 1
1381} 1738}
1382 1739
1383sub focus_in { 1740sub focus_in {
1384 my ($self) = @_; 1741 my ($self) = @_;
1385 1742
… …
1400 utf8::encode $text; 1757 utf8::encode $text;
1401 $self->{cursor} = length substr $text, 0, $idx; 1758 $self->{cursor} = length substr $text, 0, $idx;
1402 1759
1403 $self->_set_text ($self->{text}); 1760 $self->_set_text ($self->{text});
1404 $self->update; 1761 $self->update;
1762
1763 1
1405} 1764}
1406 1765
1407sub mouse_motion { 1766sub mouse_motion {
1408 my ($self, $ev, $x, $y) = @_; 1767 my ($self, $ev, $x, $y) = @_;
1409# 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
1410} 1771}
1411 1772
1412sub _draw { 1773sub _draw {
1413 my ($self) = @_; 1774 my ($self) = @_;
1414 1775
… …
1461 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1462 1823
1463 my $sym = $ev->{sym}; 1824 my $sym = $ev->{sym};
1464 1825
1465 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} = '';
1466 $self->emit (activate => $self->get_text); 1831 $self->_emit (activate => $txt);
1467 $self->update; 1832 $self->update;
1468 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
1469 } else { 1856 } else {
1470 $self->SUPER::key_down ($ev); 1857 return $self->SUPER::key_down ($ev)
1858 }
1859
1471 } 1860 1
1472
1473} 1861}
1474 1862
1475############################################################################# 1863#############################################################################
1476 1864
1477package CFClient::UI::Button; 1865package CFClient::UI::Button;
… …
1486 1874
1487sub new { 1875sub new {
1488 my $class = shift; 1876 my $class = shift;
1489 1877
1490 $class->SUPER::new ( 1878 $class->SUPER::new (
1491 padding => 4, 1879 padding_x => 4,
1880 padding_y => 4,
1492 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1493 bg => [1, 1, 1, 0.2],
1494 active_fg => [0, 0, 1], 1882 active_fg => [0, 0, 1],
1495 can_hover => 1, 1883 can_hover => 1,
1496 align => 0, 1884 align => 0,
1497 valign => 0, 1885 valign => 0,
1498 can_events => 1, 1886 can_events => 1,
1499 @_ 1887 @_
1500 ) 1888 )
1501} 1889}
1502 1890
1891sub activate { }
1892
1503sub button_up { 1893sub button_up {
1504 my ($self, $ev, $x, $y) = @_; 1894 my ($self, $ev, $x, $y) = @_;
1505 1895
1896 $self->emit ("activate")
1506 if ($x >= 0 && $x < $self->{w} 1897 if $x >= 0 && $x < $self->{w}
1507 && $y >= 0 && $y < $self->{h}) { 1898 && $y >= 0 && $y < $self->{h};
1508 $self->emit ("activate"); 1899
1509 } 1900 1
1510} 1901}
1511 1902
1512sub _draw { 1903sub _draw {
1513 my ($self) = @_; 1904 my ($self) = @_;
1514 1905
… …
1516 1907
1517 if ($GRAB == $self) { 1908 if ($GRAB == $self) {
1518 $self->{fg} = $self->{active_fg}; 1909 $self->{fg} = $self->{active_fg};
1519 } 1910 }
1520 1911
1521 glEnable GL_BLEND;
1522 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1523 glEnable GL_TEXTURE_2D; 1912 glEnable GL_TEXTURE_2D;
1524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1525 glColor 0, 0, 0, 1; 1914 glColor 0, 0, 0, 1;
1526 1915
1527 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1916 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1528 1917
1529 glDisable GL_TEXTURE_2D; 1918 glDisable GL_TEXTURE_2D;
1530 glDisable GL_BLEND;
1531 1919
1532 $self->SUPER::_draw; 1920 $self->SUPER::_draw;
1533} 1921}
1534 1922
1535############################################################################# 1923#############################################################################
… …
1546 1934
1547sub new { 1935sub new {
1548 my $class = shift; 1936 my $class = shift;
1549 1937
1550 $class->SUPER::new ( 1938 $class->SUPER::new (
1551 padding => 2, 1939 padding_x => 2,
1940 padding_y => 2,
1552 fg => [1, 1, 1], 1941 fg => [1, 1, 1],
1553 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],
1554 state => 0, 1945 state => 0,
1555 can_hover => 1, 1946 can_hover => 1,
1556 @_ 1947 @_
1557 ) 1948 )
1558} 1949}
1559 1950
1560sub size_request { 1951sub size_request {
1561 my ($self) = @_; 1952 my ($self) = @_;
1562 1953
1563 ($self->{padding} * 2 + 6) x 2 1954 (6) x 2
1564} 1955}
1565 1956
1566sub button_down { 1957sub button_down {
1567 my ($self, $ev, $x, $y) = @_; 1958 my ($self, $ev, $x, $y) = @_;
1568 1959
1569 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1570 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1571 $self->{state} = !$self->{state}; 1962 $self->{state} = !$self->{state};
1572 $self->emit (changed => $self->{state}); 1963 $self->_emit (changed => $self->{state});
1964 } else {
1965 return 0
1966 }
1967
1573 } 1968 1
1574} 1969}
1575 1970
1576sub _draw { 1971sub _draw {
1577 my ($self) = @_; 1972 my ($self) = @_;
1578 1973
1579 $self->SUPER::_draw; 1974 $self->SUPER::_draw;
1580 1975
1581 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1976 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1582 1977
1583 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;
1584 1981
1585 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1982 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1586 1983
1587 glEnable GL_BLEND; 1984 my $tex = $self->{state} ? $tex[1] : $tex[0];
1985
1588 glEnable GL_TEXTURE_2D; 1986 glEnable GL_TEXTURE_2D;
1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590
1591 my $tex = $self->{state} ? $tex[1] : $tex[0];
1592
1593 $tex->draw_quad (0, 0, $s, $s); 1987 $tex->draw_quad_alpha (0, 0, $s, $s);
1594
1595 glDisable GL_TEXTURE_2D; 1988 glDisable GL_TEXTURE_2D;
1596 glDisable GL_BLEND;
1597} 1989}
1598 1990
1599############################################################################# 1991#############################################################################
1600 1992
1601package CFClient::UI::Image; 1993package CFClient::UI::Image;
… …
1644 glTranslate 0, -$self->{w}, 0; 2036 glTranslate 0, -$self->{w}, 0;
1645 2037
1646 ($w, $h) = ($h, $w); 2038 ($w, $h) = ($h, $w);
1647 } 2039 }
1648 2040
1649 glEnable GL_BLEND;
1650 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1651 glEnable GL_TEXTURE_2D; 2041 glEnable GL_TEXTURE_2D;
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1653 2043
1654 $tex->draw_quad (0, 0, $w, $h); 2044 $tex->draw_quad_alpha (0, 0, $w, $h);
1655 2045
1656 glDisable GL_BLEND;
1657 glDisable GL_TEXTURE_2D; 2046 glDisable GL_TEXTURE_2D;
1658} 2047}
1659 2048
1660############################################################################# 2049#############################################################################
1661 2050
… …
1709} 2098}
1710 2099
1711sub set_max { 2100sub set_max {
1712 my ($self, $max) = @_; 2101 my ($self, $max) = @_;
1713 2102
2103 return if $self->{max_val} == $max;
2104
1714 $self->{max_val} = $max; 2105 $self->{max_val} = $max;
2106 $self->update;
1715} 2107}
1716 2108
1717sub set_value { 2109sub set_value {
1718 my ($self, $val, $max) = @_; 2110 my ($self, $val, $max) = @_;
1719 2111
1720 $self->set_max ($max) 2112 $self->set_max ($max)
1721 if defined $max; 2113 if defined $max;
1722 2114
1723 $max = $self->{max_val}; 2115 return if $self->{val} == $val;
2116
1724 $self->{val} = $val; 2117 $self->{val} = $val;
1725
1726 $self->update; 2118 $self->update;
1727} 2119}
1728 2120
1729sub _draw { 2121sub _draw {
1730 my ($self) = @_; 2122 my ($self) = @_;
… …
1793 2185
1794sub new { 2186sub new {
1795 my ($class, %arg) = @_; 2187 my ($class, %arg) = @_;
1796 2188
1797 my $self = $class->SUPER::new ( 2189 my $self = $class->SUPER::new (
1798 tooltip => $arg{type}, 2190 tooltip => $arg{type},
1799 can_hover => 1, 2191 can_hover => 1,
2192 can_events => 1,
1800 %arg, 2193 %arg,
1801 ); 2194 );
1802 2195
1803 $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");
1804 $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);
… …
1812 2205
1813 $self->{value}->set_fontsize ($fsize); 2206 $self->{value}->set_fontsize ($fsize);
1814 $self->{max} ->set_fontsize ($fsize); 2207 $self->{max} ->set_fontsize ($fsize);
1815} 2208}
1816 2209
2210sub set_max {
2211 my ($self, $max) = @_;
2212
2213 $self->{gauge}->set_max ($max);
2214 $self->{max}->set_text ($max);
2215}
2216
1817sub set_value { 2217sub set_value {
1818 my ($self, $val, $max) = @_; 2218 my ($self, $val, $max) = @_;
1819 2219
1820 $self->set_max ($max) 2220 $self->set_max ($max)
1821 if defined $max; 2221 if defined $max;
1822 2222
1823 $self->{gauge}->set_value ($val, $max); 2223 $self->{gauge}->set_value ($val, $max);
1824 $self->{value}->set_text ($val); 2224 $self->{value}->set_text ($val);
1825}
1826
1827sub set_max {
1828 my ($self, $max) = @_;
1829
1830 $self->{gauge}->set_max ($max);
1831 $self->{max}->set_text ($max);
1832} 2225}
1833 2226
1834############################################################################# 2227#############################################################################
1835 2228
1836package CFClient::UI::Slider; 2229package CFClient::UI::Slider;
… …
1846 qw(s1_slider.png s1_slider_bg.png); 2239 qw(s1_slider.png s1_slider_bg.png);
1847 2240
1848sub new { 2241sub new {
1849 my $class = shift; 2242 my $class = shift;
1850 2243
1851 # range [value, low, high, page] 2244 # range [value, low, high, page, unit]
1852 2245
1853 # TODO: 0-width page 2246 # TODO: 0-width page
1854 # TODO: req_w/h are wrong with vertical 2247 # TODO: req_w/h are wrong with vertical
1855 # TODO: calculations are off 2248 # TODO: calculations are off
1856 my $self = $class->SUPER::new ( 2249 my $self = $class->SUPER::new (
1857 fg => [1, 1, 1], 2250 fg => [1, 1, 1],
1858 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],
1859 range => [0, 0, 100, 10], 2254 range => [0, 0, 100, 10, 0],
1860 req_w => 20, 2255 min_w => $::WIDTH / 80,
1861 req_h => 20, 2256 min_h => $::WIDTH / 80,
1862 vertical => 0, 2257 vertical => 0,
1863 can_hover => 1, 2258 can_hover => 1,
1864 inner_pad => 5, 2259 inner_pad => 0.02,
1865 @_ 2260 @_
1866 ); 2261 );
1867 2262
2263 $self->set_value ($self->{range}[0]);
2264 $self->update;
2265
1868 $self 2266 $self
1869} 2267}
1870 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
1871sub size_request { 2303sub size_request {
1872 my ($self) = @_; 2304 my ($self) = @_;
1873 2305
1874 my $w = $self->{req_w}; 2306 ($self->{req_w}, $self->{req_h})
1875 my $h = $self->{req_h};
1876
1877 $self->{vertical} ? ($h, $w) : ($w, $h)
1878} 2307}
1879 2308
1880sub button_down { 2309sub button_down {
1881 my ($self, $ev, $x, $y) = @_; 2310 my ($self, $ev, $x, $y) = @_;
1882 2311
1883 $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
1884 $self->mouse_motion ($ev, $x, $y); 2316 $self->mouse_motion ($ev, $x, $y)
1885} 2317}
1886 2318
1887sub mouse_motion { 2319sub mouse_motion {
1888 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
1889 2321
1890 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
1891 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2343 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100;
1892 2345
1893 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2346 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1894 2347
1895 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2348 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1896 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2349 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1897 2350
1898 $x -= $inner_pad_px; # substract the padding 2351 $value = ($value - $lo) / $range;
1899 $x = $x * ($hi - $lo) / $inner_w + $lo; 2352 $value = $value * $self->{scale} + $self->{offset};
1900 $x = $lo if $x < $lo;
1901 $x = $hi - $page if $x > $hi - $page;
1902 $self->{range}[0] = $x;
1903 2353
1904 $self->emit (changed => $x); 2354 $self->{knob_x} = $value - $knob_w * 0.5;
1905 $self->update; 2355 $self->{knob_w} = $knob_w;
1906 } 2356 });
1907}
1908 2357
1909# the inner_* stuff is for generating a padding for the slider handle, 2358 $self->SUPER::update;
1910# so that the handle doesn't leave the texture. This calculation isn't 100%
1911# correct propably, but it does the job for now
1912sub _calc_inner_pad_px {
1913 my ($self, $w) = @_;
1914 ($w / 100) * $self->{inner_pad} # % to pixels
1915} 2359}
1916 2360
1917sub _draw { 2361sub _draw {
1918 my ($self) = @_; 2362 my ($self) = @_;
1919 2363
1920 $self->SUPER::_draw (); 2364 $self->SUPER::_draw ();
1921 2365
1922 my ($w, $h) = @$self{qw(w h)}; 2366 glScale $self->{w}, $self->{h};
1923 2367
1924 if ($self->{vertical}) { 2368 if ($self->{vertical}) {
1925 # draw a vertical slider like a rotated horizontal slider 2369 # draw a vertical slider like a rotated horizontal slider
1926 2370
2371 glTranslate 1, 0, 0;
1927 glRotate 90, 0, 0, 1; 2372 glRotate 90, 0, 0, 1;
1928 glTranslate 0, -$self->{w}, 0;
1929
1930 ($w, $h) = ($h, $w);
1931 } 2373 }
1932 2374
1933 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2375 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1934 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2376 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1935 2377
1936 my ($value, $lo, $hi, $page) = @{$self->{range}};
1937
1938 $hi = $value + 1 if $lo == $hi;
1939
1940 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1941 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1942
1943 $page = int $page * $inner_w / ($hi - $lo);
1944 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1945
1946 $w -= $page;
1947 $page &= ~1;
1948 glTranslate $page * 0.5, 0, 0;
1949 $page ||= 2;
1950
1951 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1952 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1953
1954 glEnable GL_BLEND;
1955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1956 glEnable GL_TEXTURE_2D; 2378 glEnable GL_TEXTURE_2D;
1957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2379 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1958 2380
1959 # draw background 2381 # draw background
1960 $tex[1]->draw_quad (0, 0, $w, $h); 2382 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1961 2383
1962 # draw handle 2384 # draw handle
1963 $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);
1964 2386
1965 glDisable GL_BLEND;
1966 glDisable GL_TEXTURE_2D; 2387 glDisable GL_TEXTURE_2D;
1967} 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 (@_) }
1968 2430
1969############################################################################# 2431#############################################################################
1970 2432
1971package CFClient::UI::TextView; 2433package CFClient::UI::TextView;
1972 2434
… …
1981 fontsize => 1, 2443 fontsize => 1,
1982 can_events => 0, 2444 can_events => 0,
1983 #font => default_font 2445 #font => default_font
1984 @_, 2446 @_,
1985 2447
1986 layout => (new CFClient::Layout), 2448 layout => (new CFClient::Layout 1),
1987 par => [], 2449 par => [],
1988 height => 0, 2450 height => 0,
1989 children => [ 2451 children => [
1990 (new CFClient::UI::Empty expand => 1), 2452 (new CFClient::UI::Empty expand => 1),
1991 (new CFClient::UI::Slider vertical => 1), 2453 (new CFClient::UI::Slider vertical => 1),
1992 ], 2454 ],
1993 ); 2455 );
1994 2456
1995 $self->{children}[1]->connect (changed => sub { 2457 $self->{children}[1]->connect (changed => sub { $self->update });
1996 $self->update;
1997 });
1998 2458
1999 $self 2459 $self
2000} 2460}
2001 2461
2002sub set_fontsize { 2462sub set_fontsize {
2003 my ($self, $fontsize) = @_; 2463 my ($self, $fontsize) = @_;
2004 2464
2005 $self->{fontsize} = $fontsize; 2465 $self->{fontsize} = $fontsize;
2006 $self->reflow; 2466 $self->reflow;
2007}
2008
2009sub text_height {
2010 my ($self, $text) = @_;
2011
2012 my $layout = $self->{layout};
2013
2014 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2015 $layout->set_width ($self->{w});
2016 $layout->set_text ($text);
2017
2018 ($layout->size)[1]
2019}
2020
2021sub reflow {
2022 my ($self) = @_;
2023
2024 $self->{need_reflow}++;
2025 $self->update;
2026} 2467}
2027 2468
2028sub size_allocate { 2469sub size_allocate {
2029 my ($self, $w, $h) = @_; 2470 my ($self, $w, $h) = @_;
2030 2471
… …
2035 $self->{layout}->set_width ($self->{children}[0]{w}); 2476 $self->{layout}->set_width ($self->{children}[0]{w});
2036 2477
2037 $self->reflow; 2478 $self->reflow;
2038} 2479}
2039 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
2040sub add_paragraph { 2515sub add_paragraph {
2041 my ($self, $color, $text) = @_; 2516 my ($self, $color, $text, $indent) = @_;
2042 2517
2043 #TODO: intelligently "reformat" paragraph 2518 for my $line (split /\n/, $text) {
2044 2519 my ($w, $h) = $self->text_size ($line);
2045 my $height = $self->text_height ($text);
2046
2047 $self->{height} += $height; 2520 $self->{height} += $h;
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2522 }
2048 2523
2049 push @{$self->{par}}, [$height, $color, $text];
2050
2051 $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]);
2052 $self->{children}[1]->update;
2053} 2525}
2054 2526
2055sub update { 2527sub update {
2056 my ($self) = @_; 2528 my ($self) = @_;
2057 2529
… …
2059 2531
2060 return unless $self->{h} > 0; 2532 return unless $self->{h} > 0;
2061 2533
2062 delete $self->{texture}; 2534 delete $self->{texture};
2063 2535
2064 $ROOT->on_refresh ($self, sub { 2536 $ROOT->on_post_alloc ($self, sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538
2065 if (delete $self->{need_reflow}) { 2539 if (delete $self->{need_reflow}) {
2066 my $height = 0; 2540 my $height = 0;
2067 2541
2068 $height += $_->[0] = $self->text_height ($_->[2]) 2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2069 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 }
2070 2557
2071 $self->{height} = $height; 2558 $self->{height} = $height;
2072 2559
2073 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2074 2561
2075 delete $self->{texture}; 2562 delete $self->{texture};
2076 } 2563 }
2077 2564
2078 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2079 glClearColor 0, 0, 0, 1; 2566 glClearColor 0.5, 0.5, 0.5, 0;
2080 glClear GL_COLOR_BUFFER_BIT; 2567 glClear GL_COLOR_BUFFER_BIT;
2081 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
2082 glEnable GL_BLEND; 2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2083 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2084 glEnable GL_TEXTURE_2D;
2085 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2086
2087 my $top = int $self->{children}[1]{range}[0];
2088
2089 my $y0 = $top;
2090 my $y1 = $top + $self->{h};
2091
2092 my $y = 0;
2093
2094 my $layout = $self->{layout};
2095
2096 $layout->set_font ($self->{font}) if $self->{font};
2097 2583
2098 for my $par (@{$self->{par}}) { 2584 for my $par (@{$self->{par}}) {
2099 my $h = $par->[0]; 2585 my $h = $par->[1];
2100 2586
2101 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]);
2102 $layout->set_text ($par->[2]); 2590 $layout->set_markup ($par->[4]);
2103 2591
2104 glColor @{ $par->[1] }; 2592 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2105 my ($W, $H) = $layout->size; 2593
2106 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;
2107 } 2596 }
2108 2597
2109 $y += $h; 2598 $y += $h;
2110 } 2599 }
2111 2600
2112 glDisable GL_TEXTURE_2D;
2113 glDisable GL_BLEND; 2601 glDisable GL_BLEND;
2114 }; 2602 };
2115 }); 2603 });
2116} 2604}
2117 2605
2118sub _draw { 2606sub _draw {
2119 my ($self) = @_; 2607 my ($self) = @_;
2120 2608
2121 if ($self->{texture}) {
2122 glEnable GL_TEXTURE_2D; 2609 glEnable GL_TEXTURE_2D;
2123 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;
2124 $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});
2125 glDisable GL_TEXTURE_2D; 2613 glDisable GL_TEXTURE_2D;
2126 }
2127 2614
2128 $self->{children}[1]->draw; 2615 $self->{children}[1]->draw;
2129 2616
2130} 2617}
2131 2618
… …
2179 2666
2180sub new { 2667sub new {
2181 my $class = shift; 2668 my $class = shift;
2182 2669
2183 my $self = $class->SUPER::new ( 2670 my $self = $class->SUPER::new (
2184 state => 0, 2671 state => 0,
2185 connect_activate => \&toggle_flopper, 2672 on_activate => \&toggle_flopper,
2186 @_ 2673 @_
2187 ); 2674 );
2188 2675
2189 if ($self->{state}) {
2190 $self->{state} = 0;
2191 $self->toggle_flopper;
2192 }
2193
2194 $self 2676 $self
2195} 2677}
2196 2678
2197sub toggle_flopper { 2679sub toggle_flopper {
2198 my ($self) = @_; 2680 my ($self) = @_;
2199 2681
2200 # TODO: use animation 2682 $self->{other}->toggle_visibility;
2201 if ($self->{state} = !$self->{state}) {
2202 $CFClient::UI::ROOT->add ($self->{other});
2203 $self->{other}->move ($self->coord2global (0, $self->{h}));
2204 $self->emit ("open");
2205 } else {
2206 $CFClient::UI::ROOT->remove ($self->{other});
2207 $self->emit ("close");
2208 }
2209
2210 $self->emit (changed => $self->{state});
2211} 2683}
2212 2684
2213############################################################################# 2685#############################################################################
2214 2686
2215package CFClient::UI::Tooltip; 2687package CFClient::UI::Tooltip;
… …
2225 @_, 2697 @_,
2226 can_events => 0, 2698 can_events => 0,
2227 ) 2699 )
2228} 2700}
2229 2701
2230sub set_markup { 2702sub set_tooltip_from {
2231 my ($self, $text) = @_; 2703 my ($self, $widget) = @_;
2232 2704
2233 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2705 my $tooltip = $widget->{tooltip};
2234 $self->{label}->set_markup ($text); 2706
2235 $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 );
2236} 2722}
2237 2723
2238sub size_request { 2724sub size_request {
2239 my ($self) = @_; 2725 my ($self) = @_;
2240
2241 $self->child->set_max_size ($::WIDTH * 0.3);
2242 2726
2243 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2244 2728
2245 ($w + 4, $h + 4) 2729 ($w + 4, $h + 4)
2246} 2730}
… …
2249 my ($self, $w, $h) = @_; 2733 my ($self, $w, $h) = @_;
2250 2734
2251 $self->SUPER::size_allocate ($w - 4, $h - 4); 2735 $self->SUPER::size_allocate ($w - 4, $h - 4);
2252} 2736}
2253 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
2254sub _draw { 2756sub _draw {
2255 my ($self) = @_; 2757 my ($self) = @_;
2256 2758
2257 glPushMatrix;
2258 glTranslate 0.375, 0.375; 2759 glTranslate 0.375, 0.375;
2259 2760
2260 my ($w, $h) = @$self{qw(w h)}; 2761 my ($w, $h) = @$self{qw(w h)};
2261 2762
2262 glColor 1, 0.8, 0.4; 2763 glColor 1, 0.8, 0.4;
… …
2273 glVertex 0 , $h; 2774 glVertex 0 , $h;
2274 glVertex $w, $h; 2775 glVertex $w, $h;
2275 glVertex $w, 0; 2776 glVertex $w, 0;
2276 glEnd; 2777 glEnd;
2277 2778
2278 glPopMatrix; 2779 glTranslate 2 - 0.375, 2 - 0.375;
2279 2780
2280 glTranslate 2, 2;
2281 $self->SUPER::_draw; 2781 $self->SUPER::_draw;
2282} 2782}
2283 2783
2284############################################################################# 2784#############################################################################
2285 2785
… …
2290use CFClient::OpenGL; 2790use CFClient::OpenGL;
2291 2791
2292sub new { 2792sub new {
2293 my $class = shift; 2793 my $class = shift;
2294 2794
2295 $class->SUPER::new ( 2795 my $self = $class->SUPER::new (
2296 aspect => 1, 2796 aspect => 1,
2797 can_events => 0,
2297 @_, 2798 @_,
2298 ) 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
2299} 2816}
2300 2817
2301sub size_request { 2818sub size_request {
2302 (32, 8) 2819 (32, 8)
2303} 2820}
2304 2821
2822sub update {
2823 my ($self) = @_;
2824
2825 return unless $self->{visible};
2826
2827 $self->SUPER::update;
2828}
2829
2305sub draw { 2830sub _draw {
2306 my ($self) = @_; 2831 my ($self) = @_;
2307 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
2308 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2309 2845
2310 if ($tex) { 2846 if ($tex) {
2311 glEnable GL_BLEND;
2312 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2313 glEnable GL_TEXTURE_2D; 2847 glEnable GL_TEXTURE_2D;
2314 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2315 glColor 1, 1, 1, 1; 2849 glColor 1, 1, 1, 1;
2316 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2317 glDisable GL_TEXTURE_2D; 2851 glDisable GL_TEXTURE_2D;
2318 glDisable GL_BLEND; 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;
2319 } 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;
2320} 3460}
2321 3461
2322############################################################################# 3462#############################################################################
2323 3463
2324package CFClient::UI::Root; 3464package CFClient::UI::Root;
2325 3465
2326our @ISA = CFClient::UI::Container::; 3466our @ISA = CFClient::UI::Container::;
2327 3467
2328use CFClient::OpenGL; 3468use CFClient::OpenGL;
2329 3469
2330sub check_size { 3470sub new {
2331 my ($self) = @_; 3471 my $class = shift;
2332 3472
2333 $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
2334} 3481}
2335 3482
2336sub size_request { 3483sub size_request {
2337 ($::WIDTH, $::HEIGHT) 3484 my ($self) = @_;
2338}
2339 3485
2340sub 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 {
2341 my ($self, $x, $y, $w, $h) = @_; 3504 my ($self, $w, $h) = @_;
2342 3505
2343 $self->SUPER::configure ($x, $y, $w, $h);
2344
2345 for my $child (@{$self->{children}}) { 3506 for my $child ($self->children) {
2346 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)};
2347 3508
2348 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3509 $X = $child->{force_x} if exists $child->{force_x};
2349 $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
2350 $child->configure ($X, $Y, $W,$H); 3515 $child->configure ($X, $Y, $W, $H);
2351 } 3516 }
2352} 3517}
2353 3518
2354sub _topleft { 3519sub coord2local {
2355 my ($self, $x, $y) = @_; 3520 my ($self, $x, $y) = @_;
2356 3521
2357 ($x, $y) 3522 ($x, $y)
2358} 3523}
2359 3524
3525sub coord2global {
3526 my ($self, $x, $y) = @_;
3527
3528 ($x, $y)
3529}
3530
2360sub update { 3531sub update {
2361 my ($self) = @_; 3532 my ($self) = @_;
2362 3533
2363 $self->check_size; 3534 $::WANT_REFRESH++;
2364 ::refresh ();
2365} 3535}
2366 3536
2367sub add { 3537sub add {
2368 my ($self, $child) = @_; 3538 my ($self, @children) = @_;
2369 3539
2370 # integerize window positions 3540 $_->{is_toplevel} = 1
2371 $child->{x} = int $child->{x}; 3541 for @children;
2372 $child->{y} = int $child->{y};
2373 3542
2374 $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 }
2375} 3559}
2376 3560
2377sub on_refresh { 3561sub on_refresh {
2378 my ($self, $id, $cb) = @_; 3562 my ($self, $id, $cb) = @_;
2379 3563
2380 $self->{refresh_hook}{$id} = $cb; 3564 $self->{refresh_hook}{$id} = $cb;
2381} 3565}
2382 3566
3567sub on_post_alloc {
3568 my ($self, $id, $cb) = @_;
3569
3570 $self->{post_alloc_hook}{$id} = $cb;
3571}
3572
2383sub draw { 3573sub draw {
2384 my ($self) = @_; 3574 my ($self) = @_;
2385 3575
2386 while (my $rcb = delete $self->{refresh_hook}) { 3576 while ($self->{refresh_hook}) {
2387 $_->() for values %$rcb; 3577 $_->()
3578 for values %{delete $self->{refresh_hook}};
2388 } 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
2389 3669
2390 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3670 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2391 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3671 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2392 glClear GL_COLOR_BUFFER_BIT; 3672 glClear GL_COLOR_BUFFER_BIT;
2393 3673
2394 glMatrixMode GL_PROJECTION; 3674 glMatrixMode GL_PROJECTION;
2395 glLoadIdentity; 3675 glLoadIdentity;
2396 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2397 glMatrixMode GL_MODELVIEW; 3677 glMatrixMode GL_MODELVIEW;
2398 glLoadIdentity; 3678 glLoadIdentity;
2399 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
2400 $self->_draw; 3687 $self->_draw;
2401} 3688}
2402 3689
2403############################################################################# 3690#############################################################################
2404 3691
2405package CFClient::UI; 3692package CFClient::UI;
2406 3693
2407$ROOT = new CFClient::UI::Root; 3694$ROOT = new CFClient::UI::Root;
2408$TOOLTIP = new CFClient::UI::Tooltip; 3695$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2409 3696
24101 36971
2411 3698

Diff Legend

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