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

Diff Legend

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