ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC

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

Diff Legend

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