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.167 by elmex, Mon Apr 24 08:44:23 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 (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
22 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
23 54
24 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
25 56
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 58
28 $TOOLTIP->set_markup ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31 } 61 }
32 62
33 return; 63 return;
34 } 64 }
… …
39 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
40} 70}
41 71
42# class methods for events 72# class methods for events
43sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 75 if $FOCUS;
46} 76}
47 77
48sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 80 if $FOCUS;
51} 81}
52 82
53sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
54 my ($ev) = @_; 84 my ($ev) = @_;
… …
63 check_tooltip; 93 check_tooltip;
64 } 94 }
65 95
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 97
68 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 100}
73 101
74sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
75 my ($ev) = @_; 103 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
77 105
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 107
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 109
82 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 112
87 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 115 $grab->update if $grab;
90 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 133
108 check_tooltip; 134 check_tooltip;
109 } 135 }
110 136
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 138 if $HOVER;
115} 139}
116 140
117# convert position array to integers 141# convert position array to integers
118sub harmonize { 142sub harmonize {
119 my ($vals) = @_; 143 my ($vals) = @_;
… …
125 $rem += $_ - $i; 149 $rem += $_ - $i;
126 $_ = $i; 150 $_ = $i;
127 } 151 }
128} 152}
129 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
130############################################################################# 195#############################################################################
131 196
132package CFClient::UI::Base; 197package CFClient::UI::Base;
133 198
134use strict; 199use strict;
… …
137 202
138sub new { 203sub new {
139 my $class = shift; 204 my $class = shift;
140 205
141 my $self = bless { 206 my $self = bless {
142 x => 0, 207 x => "center",
143 y => 0, 208 y => "center",
144 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
145 can_events => 1, 212 can_events => 1,
146 @_ 213 @_
147 }, $class; 214 }, $class;
148 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
149 for (keys %$self) { 218 for (keys %$self) {
150 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
152 } 221 }
153 } 222 }
154 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
155 $self 236 $self
156} 237}
157 238
158sub destroy { 239sub destroy {
159 my ($self) = @_; 240 my ($self) = @_;
… …
168 return if $self->{parent}; 249 return if $self->{parent};
169 250
170 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
171} 252}
172 253
173sub hide { 254sub set_visible {
174 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
175 278
176 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
178 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
179 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
180 if $self->{parent}; 313 if $self->{parent};
181} 314}
182 315
183sub move { 316sub move_abs {
184 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
185 318
186 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
189 322
190 $self->update; 323 $self->update;
191} 324}
192 325
193sub set_size { 326sub set_size {
194 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
195 328
196 $self->{user_w} = $w; 329 $self->{force_w} = $w;
197 $self->{user_h} = $h; 330 $self->{force_h} = $h;
198 331
199 $self->check_size; 332 $self->realloc;
200} 333}
201 334
202sub size_request { 335sub size_request {
203 require Carp; 336 require Carp;
204 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
206 339
207sub configure { 340sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
209 342
210 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
213 348
214 # use alignment to adjust x, y 349 # use alignment to adjust x, y
215 350
216 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 353 }
221 354
222 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 356 $self->{x} = $x;
224 $self->{y} = $y; 357 $self->{y} = $y;
225 $self->update; 358 $self->update;
226 } 359 }
227 360
228 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
229 $self->{w} = $w; 364 $self->{alloc_w} = $w;
230 $self->{h} = $h; 365 $self->{alloc_h} = $h;
231 366
232 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
233 $self->update;
234 } 368 }
235} 369}
236 370
237sub size_allocate { 371sub size_allocate {
238 # nothing to be done 372 # nothing to be done
239} 373}
240 374
375sub children {
376}
377
241sub set_max_size { 378sub set_max_size {
242 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
243 380
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 383}
247 384
248# return top left coordinates 385sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 386 my ($self, $tooltip) = @_;
251 387
252 $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 }
253} 399}
254 400
255# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
256sub coord2local { 402sub coord2local {
257 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
258 404
259 my ($X, $Y) = $self->_topleft; 405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 406}
262 407
263# translate local coordinates to global coordinate system 408# translate local coordinates to global coordinate system
264sub coord2global { 409sub coord2global {
265 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
266 411
267 my ($X, $Y) = $self->_topleft; 412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 413}
270 414
271sub focus_in { 415sub focus_in {
272 my ($self) = @_; 416 my ($self) = @_;
273 417
274 return if $FOCUS == $self; 418 return if $FOCUS == $self;
275 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
276 420
277 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
278 422
279 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
280 424
281 $focus->update if $focus; 425 $focus->update if $focus;
282 $FOCUS->update; 426 $FOCUS->update;
283} 427}
284 428
… …
287 431
288 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
289 433
290 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
291 435
292 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
293 437
294 $focus->update if $focus; #? 438 $focus->update if $focus; #?
295}
296 439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
442}
443
297sub mouse_motion { } 444sub mouse_motion { 0 }
298sub button_up { } 445sub button_up { 0 }
299sub key_down { } 446sub key_down { 0 }
300sub key_up { } 447sub key_up { 0 }
301 448
302sub button_down { 449sub button_down {
303 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
304 451
305 $self->focus_in; 452 $self->focus_in;
306}
307 453
308sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
309sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
310sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
311sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
312sub 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
313 530
314sub draw { 531sub draw {
315 my ($self) = @_; 532 my ($self) = @_;
316 533
317 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);
318 545
319 glPushMatrix; 546 glPushMatrix;
320 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
321 $self->_draw; 548 $self->_draw;
322 glPopMatrix; 549 glPopMatrix;
… …
334 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
335 glEnd; 562 glEnd;
336 glDisable GL_BLEND; 563 glDisable GL_BLEND;
337 } 564 }
338 565
339 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
340 glPushMatrix; 567 glPushMatrix;
341 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0; 571 glVertex 0 , 0;
345 glVertex $self->{w}, 0; 572 glVertex $self->{w} - 1, 0;
346 glVertex $self->{w}, $self->{h}; 573 glVertex $self->{w} - 1, $self->{h} - 1;
347 glVertex 0 , $self->{h}; 574 glVertex 0 , $self->{h} - 1;
348 glEnd; 575 glEnd;
349 glPopMatrix; 576 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 577 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 } 578 }
352} 579}
353 580
354sub _draw { 581sub _draw {
355 my ($self) = @_; 582 my ($self) = @_;
356 583
357 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
358} 585}
359 586
360sub find_widget {
361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
364
365 return $self
366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
368
369 ()
370}
371
372sub set_parent {
373 my ($self, $parent) = @_;
374
375 Scalar::Util::weaken ($self->{parent} = $parent);
376}
377
378sub check_size {
379 my ($self) = @_;
380
381 $self->{parent}
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402}
403
404sub update {
405 my ($self) = @_;
406
407 $self->{parent}->update
408 if $self->{parent};
409}
410
411sub connect {
412 my ($self, $signal, $cb) = @_;
413
414 push @{ $self->{signal_cb}{$signal} }, $cb;
415}
416
417sub emit {
418 my ($self, $signal, @args) = @_;
419
420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
421}
422
423sub DESTROY { 587sub DESTROY {
424 my ($self) = @_; 588 my ($self) = @_;
425 589
590 delete $WIDGET{$self+0};
426 #$self->deactivate; 591 #$self->deactivate;
427} 592}
428 593
429############################################################################# 594#############################################################################
430 595
… …
439 my $class = shift; 604 my $class = shift;
440 605
441 # range [value, low, high, page] 606 # range [value, low, high, page]
442 607
443 $class->SUPER::new ( 608 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 609 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 610 #active_bg => [1, 1, 1, 0.5],
446 @_ 611 @_
447 ) 612 )
448} 613}
449 614
450sub _draw { 615sub _draw {
451 my ($self) = @_; 616 my ($self) = @_;
452 617
618 my $color = $FOCUS == $self && $self->{active_bg}
619 ? $self->{active_bg}
620 : $self->{bg};
621
622 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 623 my ($w, $h) = @$self{qw(w h)};
454 624
455 glEnable GL_BLEND; 625 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 627 glColor @$color;
458 628
459 glBegin GL_QUADS; 629 glBegin GL_QUADS;
460 glVertex 0 , 0; 630 glVertex 0 , 0;
461 glVertex 0 , $h; 631 glVertex 0 , $h;
462 glVertex $w, $h; 632 glVertex $w, $h;
463 glVertex $w, 0; 633 glVertex $w, 0;
464 glEnd; 634 glEnd;
465 635
466 glDisable GL_BLEND; 636 glDisable GL_BLEND;
637 }
467} 638}
468 639
469############################################################################# 640#############################################################################
470 641
471package CFClient::UI::Empty; 642package CFClient::UI::Empty;
… …
476 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
478} 649}
479 650
480sub size_request { 651sub size_request {
481 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
482} 655}
483 656
484sub draw { } 657sub draw { }
485 658
486############################################################################# 659#############################################################################
… …
503 676
504 $self 677 $self
505} 678}
506 679
507sub add { 680sub add {
508 my ($self, $child) = @_; 681 my ($self, @widgets) = @_;
509 682
510 $child->set_parent ($self); 683 $_->set_parent ($self)
684 for @widgets;
511 685
512 use sort 'stable'; 686 use sort 'stable';
513 687
514 $self->{children} = [ 688 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 690 @{$self->{children}}, @widgets
517 ]; 691 ];
518 692
519 $child->check_size; 693 $self->realloc;
694}
695
696sub children {
697 @{ $_[0]{children} }
520} 698}
521 699
522sub remove { 700sub remove {
523 my ($self, $child) = @_; 701 my ($self, $child) = @_;
524 702
525 delete $child->{parent}; 703 delete $child->{parent};
526 $child->hide; 704 $child->hide;
527 705
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 707
530 $self->check_size; 708 $self->realloc;
531 $self->update;
532} 709}
533 710
534sub clear { 711sub clear {
535 my ($self) = @_; 712 my ($self) = @_;
536 713
… …
539 716
540 for (@$children) { 717 for (@$children) {
541 delete $_->{parent}; 718 delete $_->{parent};
542 $_->hide; 719 $_->hide;
543 } 720 }
721
722 $self->realloc;
544} 723}
545 724
546sub find_widget { 725sub find_widget {
547 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
548 727
… …
623} 802}
624 803
625sub update { 804sub update {
626 my ($self) = @_; 805 my ($self) = @_;
627 806
628 # we want to do this delayed... 807 $ROOT->on_post_alloc ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 808 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 809}
642 810
643sub size_allocate { 811sub size_allocate {
644 my ($self, $w, $h) = @_; 812 my ($self, $w, $h) = @_;
645 813
646 $self->child->configure (0, 0, $w, $h); 814 $self->SUPER::size_allocate ($w, $h);
815 $self->update;
816}
647 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
648 $self->render_chld; 838 $self->_render;
839 };
649} 840}
650 841
651sub _draw { 842sub _draw {
652 my ($self) = @_; 843 my ($self) = @_;
653 844
654 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
655 846
656 my $tex = $self->{texture} 847 my $tex = $self->{texture}
657 or return; 848 or return;
658 849
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
662 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;
663 853
664 $tex->draw_quad (0, 0, $w, $h); 854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 855
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 856 glDisable GL_TEXTURE_2D;
668} 857}
669 858
670############################################################################# 859#############################################################################
671 860
672package CFClient::UI::ViewPort; 861package CFClient::UI::ViewPort;
673 862
674our @ISA = CFClient::UI::Window::; 863our @ISA = CFClient::UI::Window::;
675
676sub new { die }
677
678sub size_request {
679 my ($self) = @_;
680
681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
683
684 @$self{qw(child_w child_h)}
685}
686
687sub _draw {
688 my ($self) = @_;
689
690 $self->{children}[1]->draw;
691}
692
693
694#############################################################################
695
696package CFClient::UI::Frame;
697
698our @ISA = CFClient::UI::Bin::;
699
700use CFClient::OpenGL;
701 864
702sub new { 865sub new {
703 my $class = shift; 866 my $class = shift;
704 867
705 my $self = $class->SUPER::new ( 868 $class->SUPER::new (
706 bg => [1, 1, 1, 1], 869 scroll_x => 0,
707 border_bg => [1, 1, 1, 1], 870 scroll_y => 1,
708 border => 0.8,
709 @_ 871 @_,
710 ); 872 )
711
712 $self
713} 873}
714 874
715sub _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 {
716 my ($self) = @_; 887 my ($self, $w, $h) = @_;
717 888
718 my ($w, $h) = ($self->{w}, $self->{h}); 889 my $child = $self->child;
719 890
720 glEnable GL_BLEND; 891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
722 glEnable GL_TEXTURE_2D;
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724 893
725# glBegin GL_QUADS; 894 $self->child->configure (0, 0, $w, $h);
726# glColor 0, 0, 0, 0; 895 $self->update;
727# glVertex 0 , 0; 896}
728# glVertex 0 , $h;
729# glVertex $w, $h;
730# glVertex $w, 0;
731# glEnd;
732 897
898sub set_offset {
899 my ($self, $x, $y) = @_;
733 900
734 $self->child->draw; 901 $self->{view_x} = int $x;
735 glDisable GL_BLEND; 902 $self->{view_y} = int $y;
736 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;
737} 944}
738 945
739############################################################################# 946#############################################################################
740 947
741package CFClient::UI::FancyFrame; 948package CFClient::UI::ScrolledWindow;
742 949
743our @ISA = CFClient::UI::Bin::; 950our @ISA = CFClient::UI::HBox::;
744
745use CFClient::OpenGL;
746
747my @tex =
748 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
749 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
750 951
751sub new { 952sub new {
752 my $class = shift; 953 my $class = shift;
753 954
754 # 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};
755 1060
756 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
759 border => 0.8, 1064 border => 0.6,
760 can_events => 1, 1065 can_events => 1,
761 @_ 1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
762 ); 1069 );
763 1070
764 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
765 align => 0, 1072 align => 0,
766 valign => 1, 1073 valign => 1,
767 text => $self->{title}, 1074 text => $title,
768 fontsize => 1; 1075 fontsize => $self->{border}
1076 if defined $title;
769 1077
770 $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};
771} 1086}
772 1087
773sub border { 1088sub border {
774 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
775} 1090}
776 1091
777sub size_request { 1092sub size_request {
778 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
779 1097
780 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
781 1099
782 ( 1100 (
783 $w + $self->border * 2, 1101 $w + $self->border * 2,
… …
786} 1104}
787 1105
788sub size_allocate { 1106sub size_allocate {
789 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
790 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
791 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
792 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
793 1119
794 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
795 if $self->{title};
796
797 $self->child->configure ($self->border, $self->border, $w, $h); 1120 $self->child->configure ($border, $border, $w, $h);
798} 1121}
799 1122
800sub button_down { 1123sub button_down {
801 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
802 1125
1126 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 1127 my $border = $self->border;
804 1128
805 if ($x < $self->{w} && $x >= $self->{w} - $border 1129 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 1130 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 1131
1132 if ($lr & $td) {
1133 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1134 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 1135 my ($bw, $bh) = ($self->{w}, $self->{h});
810 1136
1137 my $mx = $x < $border;
1138 my $my = $y < $border;
1139
811 $self->{motion} = sub { 1140 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
813 1142
814 ($x, $y) = ($ev->{x}, $ev->{y}); 1143 my $dx = $ev->{x} - $ox;
1144 my $dy = $ev->{y} - $oy;
815 1145
816 $self->{user_w} = $bw + $x - $ox; 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
818 $self->check_size; 1148
1149 $self->realloc;
1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
819 }; 1151 };
820 1152
821 } elsif ($x >= 0 && $x < $self->{w} 1153 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
826 1156
827 $self->{motion} = sub { 1157 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
829 1159
830 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
831 1161
832 $self->move ($bx + $x - $ox, $by + $y - $oy); 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
833 $self->update;
834 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
835 } 1168 1
836} 1169}
837 1170
838sub button_up { 1171sub button_up {
839 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
840 1173
841 delete $self->{motion}; 1174 !!delete $self->{motion}
842} 1175}
843 1176
844sub mouse_motion { 1177sub mouse_motion {
845 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
846 1179
847 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
848} 1183}
849 1184
850sub _draw { 1185sub _draw {
851 my ($self) = @_; 1186 my ($self) = @_;
852 1187
1188 my $child = $self->{children}[0];
1189
853 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
855 1192
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860 1195
861 my $border = $self->border; 1196 my $border = $self->border;
862 1197
863 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
864 $tex[1]->draw_quad (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
868 1203
869 my $bg = $tex[0]; 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1205 glColor @{ $self->{bg} };
870 1206
871 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 1208 # solve this better(?)
873 my $rep_y = $ch / $bg->{h}; 1209 $bg->{s} = $cw / $bg->{w};
874 1210 $bg->{t} = $ch / $bg->{h};
875 glColor @{ $self->{bg} };
876
877 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1212 }
881 1213
882 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND;
884 1215
885 $self->{title}->draw if $self->{title};
886 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
887} 1222}
888 1223
889############################################################################# 1224#############################################################################
890 1225
891package CFClient::UI::Table; 1226package CFClient::UI::Table;
… …
899sub new { 1234sub new {
900 my $class = shift; 1235 my $class = shift;
901 1236
902 $class->SUPER::new ( 1237 $class->SUPER::new (
903 col_expand => [], 1238 col_expand => [],
904 @_ 1239 @_,
905 ) 1240 )
1241}
1242
1243sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} }
906} 1245}
907 1246
908sub add { 1247sub add {
909 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
910 1249
911 $child->set_parent ($self); 1250 $child->set_parent ($self);
912 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
913 1252
914 $child->check_size; 1253 $self->realloc;
915} 1254}
916 1255
917# 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?
918sub clear { 1257sub clear {
919 my ($self) = @_; 1258 my ($self) = @_;
920 1259
921 my $children = delete $self->{children}; 1260 my @children = $self->children;
1261 delete $self->{children};
922 1262
923 for (grep $_, map @$_, grep $_, @$children) { 1263 for (@children) {
924 delete $_->{parent}; 1264 delete $_->{parent};
925 $_->hide; 1265 $_->hide;
926 } 1266 }
927 1267
928 $self->update; 1268 $self->realloc;
929} 1269}
930 1270
931sub get_wh { 1271sub get_wh {
932 my ($self) = @_; 1272 my ($self) = @_;
933 1273
… …
964sub size_allocate { 1304sub size_allocate {
965 my ($self, $w, $h) = @_; 1305 my ($self, $w, $h) = @_;
966 1306
967 my ($ws, $hs) = $self->get_wh; 1307 my ($ws, $hs) = $self->get_wh;
968 1308
969 my $req_w = sum @$ws; 1309 my $req_w = (sum @$ws) || 1;
970 my $req_h = sum @$hs; 1310 my $req_h = (sum @$hs) || 1;
971 1311
972 # TODO: nicer code && do row_expand 1312 # TODO: nicer code && do row_expand
973 my @col_expand = @{$self->{col_expand}}; 1313 my @col_expand = @{$self->{col_expand}};
974 @col_expand = (1) x @$ws unless @col_expand; 1314 @col_expand = (1) x @$ws unless @col_expand;
975 my $col_expand = (sum @col_expand) || 1; 1315 my $col_expand = (sum @col_expand) || 1;
… …
1029 } 1369 }
1030} 1370}
1031 1371
1032############################################################################# 1372#############################################################################
1033 1373
1034package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1035
1036# TODO: wrap into common Box base class
1037 1375
1038our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1039 1377
1040sub size_request { 1378sub size_request {
1041 my ($self) = @_; 1379 my ($self) = @_;
1042 1380
1043 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1044 1382 ? (
1045 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1046 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1047 (List::Util::max map $_->[1], @alloc), 1385 )
1048 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1049} 1390}
1050 1391
1051sub size_allocate { 1392sub size_allocate {
1052 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1053 1394
1054 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1055
1056 my $children = $self->{children}; 1396 my $children = $self->{children};
1057 1397
1058 my @h = map $_->{req_w}, @$children; 1398 my @req;
1059 1399
1060 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1061 1401 @req = ($space / (@$children || 1)) x @$children;
1062 if ($req_h > $h) {
1063 # ah well, not enough space
1064 $_ *= $h / $req_h for @h;
1065 } 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 {
1066 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1067 $exp ||= 1;
1068 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1069 for (0 .. $#$children) { 1415 for 0 .. $#$children;
1070 my $child = $children->[$_];
1071
1072 my $alloc_h = $h[$_];
1073 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1074 $h[$_] = $alloc_h;
1075 } 1416 }
1076 } 1417 }
1077 1418
1078 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1079 1420
1080 my $y = 0; 1421 my $pos = 0;
1081 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1082 my $child = $children->[$_];
1083 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1084 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1085 1425
1086 $y += $h; 1426 $pos += $alloc;
1087 } 1427 }
1088 1428
1089 1 1429 1
1090} 1430}
1091 1431
1092############################################################################# 1432#############################################################################
1093 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
1094package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1095 1450
1096# TODO: wrap into common Box base class
1097
1098our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1099 1452
1100sub size_request { 1453sub new {
1101 my ($self) = @_; 1454 my $class = shift;
1102 1455
1103 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1104 1457 vertical => 1,
1105 ( 1458 @_,
1106 (List::Util::max map $_->[0], @alloc),
1107 (List::Util::sum map $_->[1], @alloc),
1108 ) 1459 )
1109} 1460}
1110 1461
1111sub size_allocate {
1112 my ($self, $w, $h) = @_;
1113
1114 my $children = $self->{children};
1115
1116 my @h = map $_->{req_h}, @$children;
1117
1118 my $req_h = List::Util::sum @h;
1119
1120 if ($req_h > $h) {
1121 # ah well, not enough space
1122 $_ *= $h / $req_h for @h;
1123 } else {
1124 my $exp = List::Util::sum map $_->{expand}, @$children;
1125 $exp ||= 1;
1126
1127 for (0 .. $#$children) {
1128 my $child = $children->[$_];
1129
1130 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1131 }
1132 }
1133
1134 CFClient::UI::harmonize \@h;
1135
1136 my $y = 0;
1137 for (0 .. $#$children) {
1138 my $child = $children->[$_];
1139 my $h = $h[$_];
1140 $child->configure (0, $y, $w, $h);
1141
1142 $y += $h;
1143 }
1144
1145 1
1146}
1147
1148############################################################################# 1462#############################################################################
1149 1463
1150package CFClient::UI::Label; 1464package CFClient::UI::Label;
1151 1465
1152our @ISA = CFClient::UI::Base::; 1466our @ISA = CFClient::UI::DrawBG::;
1153 1467
1154use CFClient::OpenGL; 1468use CFClient::OpenGL;
1155 1469
1156sub new { 1470sub new {
1157 my ($class, %arg) = @_; 1471 my ($class, %arg) = @_;
1158 1472
1159 my $self = $class->SUPER::new ( 1473 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1474 fg => [1, 1, 1],
1475 #bg => none
1476 #active_bg => none
1161 #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),
1162 fontsize => 1, 1483 fontsize => 1,
1163 text => "",
1164 align => -1, 1484 align => -1,
1165 valign => -1, 1485 valign => -1,
1166 padding => 2, 1486 padding_x => 2,
1167 layout => new CFClient::Layout, 1487 padding_y => 2,
1168 can_events => 0, 1488 can_events => 0,
1169 %arg 1489 %arg
1170 ); 1490 );
1171 1491
1172 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1493 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1494 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1495 $self->{template} = $layout;
1176 } 1496 }
1177 1497
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1498 if (exists $self->{markup}) {
1179 $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 }
1180 1503
1181 $self 1504 $self
1182} 1505}
1183 1506
1184sub escape { 1507sub escape($) {
1185 local $_ = $_[1]; 1508 local $_ = $_[0];
1186 1509
1187 s/&/&amp;/g; 1510 s/&/&amp;/g;
1188 s/>/&gt;/g; 1511 s/>/&gt;/g;
1189 s/</&lt;/g; 1512 s/</&lt;/g;
1190 1513
1191 $_[1] 1514 $_
1515}
1516
1517sub update {
1518 my ($self) = @_;
1519
1520 delete $self->{texture};
1521 $self->SUPER::update;
1192} 1522}
1193 1523
1194sub set_text { 1524sub set_text {
1195 my ($self, $text) = @_; 1525 my ($self, $text) = @_;
1196 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;
1197 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1198 1532
1199 delete $self->{texture}; 1533 $self->realloc;
1200 $self->check_size;
1201 $self->update; 1534 $self->update;
1202} 1535}
1203 1536
1204sub set_markup { 1537sub set_markup {
1205 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1206 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;
1207 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1208 1547
1209 delete $self->{texture}; 1548 $self->realloc;
1210 $self->check_size;
1211 $self->update; 1549 $self->update;
1212} 1550}
1213 1551
1214sub size_request { 1552sub size_request {
1215 my ($self) = @_; 1553 my ($self) = @_;
1216 1554
1217 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1555 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $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});
1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220 1560
1221 my ($w, $h) = $self->{layout}->size; 1561 my ($w, $h) = $self->{layout}->size;
1222 1562
1223 if (exists $self->{template}) { 1563 if (exists $self->{template}) {
… …
1228 1568
1229 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1230 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1231 } 1571 }
1232 1572
1233 ( 1573 ($w, $h)
1234 $w + $self->{padding} * 2,
1235 $h + $self->{padding} * 2,
1236 )
1237} 1574}
1238 1575
1239sub size_allocate { 1576sub size_allocate {
1240 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1241 1578
1579 delete $self->{ox};
1580
1242 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1243} 1583}
1244 1584
1245sub set_fontsize { 1585sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1247 1587
1248 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1589 delete $self->{texture};
1250 $self->check_size; 1590
1251 $self->update; 1591 $self->realloc;
1252} 1592}
1253 1593
1254sub _draw { 1594sub _draw {
1255 my ($self) = @_; 1595 my ($self) = @_;
1256 1596
1597 $self->SUPER::_draw; # draw background, if applicable
1598
1257 my $tex = $self->{texture} ||= do { 1599 my $tex = $self->{texture} ||= do {
1600 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1601 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $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});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1606
1261 new_from_layout CFClient::Texture $self->{layout} 1607 new_from_layout CFClient::Texture $self->{layout}
1262 }; 1608 };
1263 1609
1264 glEnable GL_BLEND; 1610 unless (exists $self->{ox}) {
1265 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
1266 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1622
1623 if ($tex->{format} == GL_ALPHA) {
1269 glColor @{$self->{fg}}; 1624 glColor @{$self->{fg}};
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $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 }
1284 1629
1285 glDisable GL_TEXTURE_2D; 1630 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1631}
1288 1632
1289############################################################################# 1633#############################################################################
1290 1634
1291package CFClient::UI::EntryBase; 1635package CFClient::UI::EntryBase;
… …
1304 active_fg => [0, 0, 0], 1648 active_fg => [0, 0, 0],
1305 can_hover => 1, 1649 can_hover => 1,
1306 can_focus => 1, 1650 can_focus => 1,
1307 valign => 0, 1651 valign => 0,
1308 can_events => 1, 1652 can_events => 1,
1653 #text => ...
1309 @_ 1654 @_
1310 ) 1655 )
1311} 1656}
1312 1657
1313sub _set_text { 1658sub _set_text {
… …
1323 $self->{text} = $text; 1668 $self->{text} = $text;
1324 1669
1325 $text =~ s/./*/g if $self->{hidden}; 1670 $text =~ s/./*/g if $self->{hidden};
1326 $self->{layout}->set_text ("$text "); 1671 $self->{layout}->set_text ("$text ");
1327 1672
1328 $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;
1329} 1683}
1330 1684
1331sub get_text { 1685sub get_text {
1332 $_[0]{text} 1686 $_[0]{text}
1333} 1687}
… …
1336 my ($self) = @_; 1690 my ($self) = @_;
1337 1691
1338 my ($w, $h) = $self->SUPER::size_request; 1692 my ($w, $h) = $self->SUPER::size_request;
1339 1693
1340 ($w + 1, $h) # add 1 for cursor 1694 ($w + 1, $h) # add 1 for cursor
1341}
1342
1343sub size_allocate {
1344 my ($self, $w, $h) = @_;
1345
1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347}
1348
1349sub set_text {
1350 my ($self, $text) = @_;
1351
1352 $self->{cursor} = length $text;
1353 $self->_set_text ($text);
1354 $self->update;
1355} 1695}
1356 1696
1357sub key_down { 1697sub key_down {
1358 my ($self, $ev) = @_; 1698 my ($self, $ev) = @_;
1359 1699
… …
1361 my $sym = $ev->{sym}; 1701 my $sym = $ev->{sym};
1362 my $uni = $ev->{unicode}; 1702 my $uni = $ev->{unicode};
1363 1703
1364 my $text = $self->get_text; 1704 my $text = $self->get_text;
1365 1705
1366 if ($sym == 8) { 1706 if ($uni == 8) {
1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1707 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368 } elsif ($sym == 127) { 1708 } elsif ($uni == 127) {
1369 substr $text, $self->{cursor}, 1, ""; 1709 substr $text, $self->{cursor}, 1, "";
1370 } elsif ($sym == CFClient::SDLK_LEFT) { 1710 } elsif ($sym == CFClient::SDLK_LEFT) {
1371 --$self->{cursor} if $self->{cursor}; 1711 --$self->{cursor} if $self->{cursor};
1372 } elsif ($sym == CFClient::SDLK_RIGHT) { 1712 } elsif ($sym == CFClient::SDLK_RIGHT) {
1373 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1713 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1374 } elsif ($sym == CFClient::SDLK_HOME) { 1714 } elsif ($sym == CFClient::SDLK_HOME) {
1375 $self->{cursor} = 0; 1715 $self->{cursor} = 0;
1376 } elsif ($sym == CFClient::SDLK_END) { 1716 } elsif ($sym == CFClient::SDLK_END) {
1377 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) { 1718 } elsif ($uni == 27) {
1379 $self->emit ('escape'); 1719 $self->_emit ('escape');
1380 } elsif ($uni) { 1720 } elsif ($uni) {
1381 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1382 } 1724 }
1383 1725
1384 $self->_set_text ($text); 1726 $self->_set_text ($text);
1385 $self->update; 1727
1728 $self->realloc;
1729
1730 1
1386} 1731}
1387 1732
1388sub focus_in { 1733sub focus_in {
1389 my ($self) = @_; 1734 my ($self) = @_;
1390 1735
… …
1405 utf8::encode $text; 1750 utf8::encode $text;
1406 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1407 1752
1408 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1409 $self->update; 1754 $self->update;
1755
1756 1
1410} 1757}
1411 1758
1412sub mouse_motion { 1759sub mouse_motion {
1413 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1414# 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
1415} 1764}
1416 1765
1417sub _draw { 1766sub _draw {
1418 my ($self) = @_; 1767 my ($self) = @_;
1419 1768
… …
1469 1818
1470 if ($sym == 13) { 1819 if ($sym == 13) {
1471 unshift @{$self->{history}}, 1820 unshift @{$self->{history}},
1472 my $txt = $self->get_text; 1821 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1; 1822 $self->{history_pointer} = -1;
1823 $self->{history_saveback} = '';
1474 $self->emit (activate => $txt); 1824 $self->_emit (activate => $txt);
1475 $self->update; 1825 $self->update;
1476 1826
1477 } elsif ($sym == CFClient::SDLK_UP) { 1827 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) { 1828 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text; 1829 $self->{history_saveback} = $self->get_text;
1480 } 1830 }
1831 if (@{$self->{history} || []} > 0) {
1481 $self->{history_pointer}++; 1832 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) { 1833 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1; 1834 $self->{history_pointer} = @{$self->{history} || []} - 1;
1835 }
1836 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1484 } 1837 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486 1838
1487 } elsif ($sym == CFClient::SDLK_DOWN) { 1839 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--; 1840 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1841 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490 1842
… …
1493 } else { 1845 } else {
1494 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1495 } 1847 }
1496 1848
1497 } else { 1849 } else {
1498 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1499 } 1853 1
1500
1501} 1854}
1502 1855
1503############################################################################# 1856#############################################################################
1504 1857
1505package CFClient::UI::Button; 1858package CFClient::UI::Button;
… …
1514 1867
1515sub new { 1868sub new {
1516 my $class = shift; 1869 my $class = shift;
1517 1870
1518 $class->SUPER::new ( 1871 $class->SUPER::new (
1519 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1520 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1521 bg => [1, 1, 1, 0.2],
1522 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1523 can_hover => 1, 1876 can_hover => 1,
1524 align => 0, 1877 align => 0,
1525 valign => 0, 1878 valign => 0,
1526 can_events => 1, 1879 can_events => 1,
1527 @_ 1880 @_
1528 ) 1881 )
1529} 1882}
1530 1883
1884sub activate { }
1885
1531sub button_up { 1886sub button_up {
1532 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1533 1888
1889 $self->emit ("activate")
1534 if ($x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1535 && $y >= 0 && $y < $self->{h}) { 1891 && $y >= 0 && $y < $self->{h};
1536 $self->emit ("activate"); 1892
1537 } 1893 1
1538} 1894}
1539 1895
1540sub _draw { 1896sub _draw {
1541 my ($self) = @_; 1897 my ($self) = @_;
1542 1898
… …
1544 1900
1545 if ($GRAB == $self) { 1901 if ($GRAB == $self) {
1546 $self->{fg} = $self->{active_fg}; 1902 $self->{fg} = $self->{active_fg};
1547 } 1903 }
1548 1904
1549 glEnable GL_BLEND;
1550 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551 glEnable GL_TEXTURE_2D; 1905 glEnable GL_TEXTURE_2D;
1552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553 glColor 0, 0, 0, 1; 1907 glColor 0, 0, 0, 1;
1554 1908
1555 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1909 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1556 1910
1557 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1558 glDisable GL_BLEND;
1559 1912
1560 $self->SUPER::_draw; 1913 $self->SUPER::_draw;
1561} 1914}
1562 1915
1563############################################################################# 1916#############################################################################
… …
1574 1927
1575sub new { 1928sub new {
1576 my $class = shift; 1929 my $class = shift;
1577 1930
1578 $class->SUPER::new ( 1931 $class->SUPER::new (
1579 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1580 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1581 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],
1582 state => 0, 1938 state => 0,
1583 can_hover => 1, 1939 can_hover => 1,
1584 @_ 1940 @_
1585 ) 1941 )
1586} 1942}
1587 1943
1588sub size_request { 1944sub size_request {
1589 my ($self) = @_; 1945 my ($self) = @_;
1590 1946
1591 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1592} 1948}
1593 1949
1594sub button_down { 1950sub button_down {
1595 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1596 1952
1597 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1598 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1599 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1600 $self->emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1601 } 1961 1
1602} 1962}
1603 1963
1604sub _draw { 1964sub _draw {
1605 my ($self) = @_; 1965 my ($self) = @_;
1606 1966
1607 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1608 1968
1609 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1610 1970
1611 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;
1612 1974
1613 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1614 1976
1615 glEnable GL_BLEND; 1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1978
1616 glEnable GL_TEXTURE_2D; 1979 glEnable GL_TEXTURE_2D;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618
1619 my $tex = $self->{state} ? $tex[1] : $tex[0];
1620
1621 $tex->draw_quad (0, 0, $s, $s); 1980 $tex->draw_quad_alpha (0, 0, $s, $s);
1622
1623 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1624 glDisable GL_BLEND;
1625} 1982}
1626 1983
1627############################################################################# 1984#############################################################################
1628 1985
1629package CFClient::UI::Image; 1986package CFClient::UI::Image;
… …
1672 glTranslate 0, -$self->{w}, 0; 2029 glTranslate 0, -$self->{w}, 0;
1673 2030
1674 ($w, $h) = ($h, $w); 2031 ($w, $h) = ($h, $w);
1675 } 2032 }
1676 2033
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 2034 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2035 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 2036
1682 $tex->draw_quad (0, 0, $w, $h); 2037 $tex->draw_quad_alpha (0, 0, $w, $h);
1683 2038
1684 glDisable GL_BLEND;
1685 glDisable GL_TEXTURE_2D; 2039 glDisable GL_TEXTURE_2D;
1686} 2040}
1687 2041
1688############################################################################# 2042#############################################################################
1689 2043
… …
1737} 2091}
1738 2092
1739sub set_max { 2093sub set_max {
1740 my ($self, $max) = @_; 2094 my ($self, $max) = @_;
1741 2095
2096 return if $self->{max_val} == $max;
2097
1742 $self->{max_val} = $max; 2098 $self->{max_val} = $max;
2099 $self->update;
1743} 2100}
1744 2101
1745sub set_value { 2102sub set_value {
1746 my ($self, $val, $max) = @_; 2103 my ($self, $val, $max) = @_;
1747 2104
1748 $self->set_max ($max) 2105 $self->set_max ($max)
1749 if defined $max; 2106 if defined $max;
1750 2107
1751 $max = $self->{max_val}; 2108 return if $self->{val} == $val;
2109
1752 $self->{val} = $val; 2110 $self->{val} = $val;
1753
1754 $self->update; 2111 $self->update;
1755} 2112}
1756 2113
1757sub _draw { 2114sub _draw {
1758 my ($self) = @_; 2115 my ($self) = @_;
… …
1821 2178
1822sub new { 2179sub new {
1823 my ($class, %arg) = @_; 2180 my ($class, %arg) = @_;
1824 2181
1825 my $self = $class->SUPER::new ( 2182 my $self = $class->SUPER::new (
1826 tooltip => $arg{type}, 2183 tooltip => $arg{type},
1827 can_hover => 1, 2184 can_hover => 1,
2185 can_events => 1,
1828 %arg, 2186 %arg,
1829 ); 2187 );
1830 2188
1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2189 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2190 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1840 2198
1841 $self->{value}->set_fontsize ($fsize); 2199 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize); 2200 $self->{max} ->set_fontsize ($fsize);
1843} 2201}
1844 2202
2203sub set_max {
2204 my ($self, $max) = @_;
2205
2206 $self->{gauge}->set_max ($max);
2207 $self->{max}->set_text ($max);
2208}
2209
1845sub set_value { 2210sub set_value {
1846 my ($self, $val, $max) = @_; 2211 my ($self, $val, $max) = @_;
1847 2212
1848 $self->set_max ($max) 2213 $self->set_max ($max)
1849 if defined $max; 2214 if defined $max;
1850 2215
1851 $self->{gauge}->set_value ($val, $max); 2216 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val); 2217 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860} 2218}
1861 2219
1862############################################################################# 2220#############################################################################
1863 2221
1864package CFClient::UI::Slider; 2222package CFClient::UI::Slider;
… …
1874 qw(s1_slider.png s1_slider_bg.png); 2232 qw(s1_slider.png s1_slider_bg.png);
1875 2233
1876sub new { 2234sub new {
1877 my $class = shift; 2235 my $class = shift;
1878 2236
1879 # range [value, low, high, page] 2237 # range [value, low, high, page, unit]
1880 2238
1881 # TODO: 0-width page 2239 # TODO: 0-width page
1882 # TODO: req_w/h are wrong with vertical 2240 # TODO: req_w/h are wrong with vertical
1883 # TODO: calculations are off 2241 # TODO: calculations are off
1884 my $self = $class->SUPER::new ( 2242 my $self = $class->SUPER::new (
1885 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
1886 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],
1887 range => [0, 0, 100, 10], 2247 range => [0, 0, 100, 10, 0],
1888 req_w => 20, 2248 min_w => $::WIDTH / 80,
1889 req_h => 20, 2249 min_h => $::WIDTH / 80,
1890 vertical => 0, 2250 vertical => 0,
1891 can_hover => 1, 2251 can_hover => 1,
1892 inner_pad => 5, 2252 inner_pad => 0.02,
1893 @_ 2253 @_
1894 ); 2254 );
1895 2255
2256 $self->set_value ($self->{range}[0]);
2257 $self->update;
2258
1896 $self 2259 $self
1897} 2260}
1898 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
1899sub size_request { 2296sub size_request {
1900 my ($self) = @_; 2297 my ($self) = @_;
1901 2298
1902 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
1903 my $h = $self->{req_h};
1904
1905 $self->{vertical} ? ($h, $w) : ($w, $h)
1906} 2300}
1907 2301
1908sub button_down { 2302sub button_down {
1909 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
1910 2304
1911 $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
1912 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
1913} 2310}
1914 2311
1915sub mouse_motion { 2312sub mouse_motion {
1916 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
1917 2314
1918 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
1919 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2336 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100;
1920 2338
1921 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2339 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1922 2340
1923 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2341 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1924 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2342 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1925 2343
1926 $x -= $inner_pad_px; # substract the padding 2344 $value = ($value - $lo) / $range;
1927 $x = $x * ($hi - $lo) / $inner_w + $lo; 2345 $value = $value * $self->{scale} + $self->{offset};
1928 $x = $lo if $x < $lo;
1929 $x = $hi - $page if $x > $hi - $page;
1930 $self->{range}[0] = $x;
1931 2346
1932 $self->emit (changed => $x); 2347 $self->{knob_x} = $value - $knob_w * 0.5;
1933 $self->update; 2348 $self->{knob_w} = $knob_w;
1934 } 2349 });
1935}
1936 2350
1937# the inner_* stuff is for generating a padding for the slider handle, 2351 $self->SUPER::update;
1938# so that the handle doesn't leave the texture. This calculation isn't 100%
1939# correct propably, but it does the job for now
1940sub _calc_inner_pad_px {
1941 my ($self, $w) = @_;
1942 ($w / 100) * $self->{inner_pad} # % to pixels
1943} 2352}
1944 2353
1945sub _draw { 2354sub _draw {
1946 my ($self) = @_; 2355 my ($self) = @_;
1947 2356
1948 $self->SUPER::_draw (); 2357 $self->SUPER::_draw ();
1949 2358
1950 my ($w, $h) = @$self{qw(w h)}; 2359 glScale $self->{w}, $self->{h};
1951 2360
1952 if ($self->{vertical}) { 2361 if ($self->{vertical}) {
1953 # draw a vertical slider like a rotated horizontal slider 2362 # draw a vertical slider like a rotated horizontal slider
1954 2363
2364 glTranslate 1, 0, 0;
1955 glRotate 90, 0, 0, 1; 2365 glRotate 90, 0, 0, 1;
1956 glTranslate 0, -$self->{w}, 0;
1957
1958 ($w, $h) = ($h, $w);
1959 } 2366 }
1960 2367
1961 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2368 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1962 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2369 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1963 2370
1964 my ($value, $lo, $hi, $page) = @{$self->{range}};
1965
1966 $hi = $value + 1 if $lo == $hi;
1967
1968 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1969 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1970
1971 $page = int $page * $inner_w / ($hi - $lo);
1972 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1973
1974 $w -= $page;
1975 $page &= ~1;
1976 glTranslate $page * 0.5, 0, 0;
1977 $page ||= 2;
1978
1979 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1980 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1981
1982 glEnable GL_BLEND;
1983 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1984 glEnable GL_TEXTURE_2D; 2371 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2372 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 2373
1987 # draw background 2374 # draw background
1988 $tex[1]->draw_quad (0, 0, $w, $h); 2375 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1989 2376
1990 # draw handle 2377 # draw handle
1991 $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);
1992 2379
1993 glDisable GL_BLEND;
1994 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
1995} 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 (@_) }
1996 2423
1997############################################################################# 2424#############################################################################
1998 2425
1999package CFClient::UI::TextView; 2426package CFClient::UI::TextView;
2000 2427
… …
2009 fontsize => 1, 2436 fontsize => 1,
2010 can_events => 0, 2437 can_events => 0,
2011 #font => default_font 2438 #font => default_font
2012 @_, 2439 @_,
2013 2440
2014 layout => (new CFClient::Layout), 2441 layout => (new CFClient::Layout 1),
2015 par => [], 2442 par => [],
2016 height => 0, 2443 height => 0,
2017 children => [ 2444 children => [
2018 (new CFClient::UI::Empty expand => 1), 2445 (new CFClient::UI::Empty expand => 1),
2019 (new CFClient::UI::Slider vertical => 1), 2446 (new CFClient::UI::Slider vertical => 1),
2020 ], 2447 ],
2021 ); 2448 );
2022 2449
2023 $self->{children}[1]->connect (changed => sub { 2450 $self->{children}[1]->connect (changed => sub { $self->update });
2024 $self->update;
2025 });
2026 2451
2027 $self 2452 $self
2028} 2453}
2029 2454
2030sub set_fontsize { 2455sub set_fontsize {
2031 my ($self, $fontsize) = @_; 2456 my ($self, $fontsize) = @_;
2032 2457
2033 $self->{fontsize} = $fontsize; 2458 $self->{fontsize} = $fontsize;
2034 $self->reflow; 2459 $self->reflow;
2035}
2036
2037sub text_height {
2038 my ($self, $text) = @_;
2039
2040 my $layout = $self->{layout};
2041
2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043 $layout->set_width ($self->{w});
2044 $layout->set_text ($text);
2045
2046 ($layout->size)[1]
2047}
2048
2049sub reflow {
2050 my ($self) = @_;
2051
2052 $self->{need_reflow}++;
2053 $self->update;
2054} 2460}
2055 2461
2056sub size_allocate { 2462sub size_allocate {
2057 my ($self, $w, $h) = @_; 2463 my ($self, $w, $h) = @_;
2058 2464
… …
2063 $self->{layout}->set_width ($self->{children}[0]{w}); 2469 $self->{layout}->set_width ($self->{children}[0]{w});
2064 2470
2065 $self->reflow; 2471 $self->reflow;
2066} 2472}
2067 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
2068sub add_paragraph { 2508sub add_paragraph {
2069 my ($self, $color, $text) = @_; 2509 my ($self, $color, $text, $indent) = @_;
2070 2510
2071 #TODO: intelligently "reformat" paragraph 2511 for my $line (split /\n/, $text) {
2072 2512 my ($w, $h) = $self->text_size ($line);
2073 my $height = $self->text_height ($text);
2074
2075 $self->{height} += $height; 2513 $self->{height} += $h;
2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2515 }
2076 2516
2077 push @{$self->{par}}, [$height, $color, $text];
2078
2079 $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]);
2080 $self->{children}[1]->update;
2081} 2518}
2082 2519
2083sub update { 2520sub update {
2084 my ($self) = @_; 2521 my ($self) = @_;
2085 2522
… …
2087 2524
2088 return unless $self->{h} > 0; 2525 return unless $self->{h} > 0;
2089 2526
2090 delete $self->{texture}; 2527 delete $self->{texture};
2091 2528
2092 $ROOT->on_refresh ($self, sub { 2529 $ROOT->on_post_alloc ($self, sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531
2093 if (delete $self->{need_reflow}) { 2532 if (delete $self->{need_reflow}) {
2094 my $height = 0; 2533 my $height = 0;
2095 2534
2096 $height += $_->[0] = $self->text_height ($_->[2]) 2535 my $layout = $self->{layout};
2536
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538
2097 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 }
2098 2550
2099 $self->{height} = $height; 2551 $self->{height} = $height;
2100 2552
2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2102 2554
2103 delete $self->{texture}; 2555 delete $self->{texture};
2104 } 2556 }
2105 2557
2106 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2107 glClearColor 0, 0, 0, 1; 2559 glClearColor 0.5, 0.5, 0.5, 0;
2108 glClear GL_COLOR_BUFFER_BIT; 2560 glClear GL_COLOR_BUFFER_BIT;
2109 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
2110 glEnable GL_BLEND; 2573 glEnable GL_BLEND;
2574 #TODO# not correct in windows where rgba is forced off
2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2575 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2112 glEnable GL_TEXTURE_2D;
2113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2114
2115 my $top = int $self->{children}[1]{range}[0];
2116
2117 my $y0 = $top;
2118 my $y1 = $top + $self->{h};
2119
2120 my $y = 0;
2121
2122 my $layout = $self->{layout};
2123
2124 $layout->set_font ($self->{font}) if $self->{font};
2125 2576
2126 for my $par (@{$self->{par}}) { 2577 for my $par (@{$self->{par}}) {
2127 my $h = $par->[0]; 2578 my $h = $par->[1];
2128 2579
2129 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]);
2130 $layout->set_text ($par->[2]); 2583 $layout->set_markup ($par->[4]);
2131 2584
2132 glColor @{ $par->[1] }; 2585 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2133 my ($W, $H) = $layout->size; 2586
2134 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;
2135 } 2589 }
2136 2590
2137 $y += $h; 2591 $y += $h;
2138 } 2592 }
2139 2593
2140 glDisable GL_TEXTURE_2D;
2141 glDisable GL_BLEND; 2594 glDisable GL_BLEND;
2142 }; 2595 };
2143 }); 2596 });
2144} 2597}
2145 2598
2146sub _draw { 2599sub _draw {
2147 my ($self) = @_; 2600 my ($self) = @_;
2148 2601
2149 if ($self->{texture}) {
2150 glEnable GL_TEXTURE_2D; 2602 glEnable GL_TEXTURE_2D;
2151 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;
2152 $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});
2153 glDisable GL_TEXTURE_2D; 2606 glDisable GL_TEXTURE_2D;
2154 }
2155 2607
2156 $self->{children}[1]->draw; 2608 $self->{children}[1]->draw;
2157 2609
2158} 2610}
2159 2611
… …
2207 2659
2208sub new { 2660sub new {
2209 my $class = shift; 2661 my $class = shift;
2210 2662
2211 my $self = $class->SUPER::new ( 2663 my $self = $class->SUPER::new (
2212 state => 0, 2664 state => 0,
2213 connect_activate => \&toggle_flopper, 2665 on_activate => \&toggle_flopper,
2214 @_ 2666 @_
2215 ); 2667 );
2216 2668
2217 if ($self->{state}) {
2218 $self->{state} = 0;
2219 $self->toggle_flopper;
2220 }
2221
2222 $self 2669 $self
2223} 2670}
2224 2671
2225sub toggle_flopper { 2672sub toggle_flopper {
2226 my ($self) = @_; 2673 my ($self) = @_;
2227 2674
2228 # TODO: use animation 2675 $self->{other}->toggle_visibility;
2229 if ($self->{state} = !$self->{state}) {
2230 $CFClient::UI::ROOT->add ($self->{other});
2231 $self->{other}->move ($self->coord2global (0, $self->{h}));
2232 $self->emit ("open");
2233 } else {
2234 $CFClient::UI::ROOT->remove ($self->{other});
2235 $self->emit ("close");
2236 }
2237
2238 $self->emit (changed => $self->{state});
2239} 2676}
2240 2677
2241############################################################################# 2678#############################################################################
2242 2679
2243package CFClient::UI::Tooltip; 2680package CFClient::UI::Tooltip;
… …
2253 @_, 2690 @_,
2254 can_events => 0, 2691 can_events => 0,
2255 ) 2692 )
2256} 2693}
2257 2694
2258sub set_markup { 2695sub set_tooltip_from {
2259 my ($self, $text) = @_; 2696 my ($self, $widget) = @_;
2260 2697
2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2698 my $tooltip = $widget->{tooltip};
2262 $self->{label}->set_markup ($text); 2699
2263 $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 );
2264} 2715}
2265 2716
2266sub size_request { 2717sub size_request {
2267 my ($self) = @_; 2718 my ($self) = @_;
2268
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270 2719
2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2720 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272 2721
2273 ($w + 4, $h + 4) 2722 ($w + 4, $h + 4)
2274} 2723}
… …
2277 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2278 2727
2279 $self->SUPER::size_allocate ($w - 4, $h - 4); 2728 $self->SUPER::size_allocate ($w - 4, $h - 4);
2280} 2729}
2281 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
2282sub _draw { 2749sub _draw {
2283 my ($self) = @_; 2750 my ($self) = @_;
2284 2751
2285 glPushMatrix;
2286 glTranslate 0.375, 0.375; 2752 glTranslate 0.375, 0.375;
2287 2753
2288 my ($w, $h) = @$self{qw(w h)}; 2754 my ($w, $h) = @$self{qw(w h)};
2289 2755
2290 glColor 1, 0.8, 0.4; 2756 glColor 1, 0.8, 0.4;
… …
2301 glVertex 0 , $h; 2767 glVertex 0 , $h;
2302 glVertex $w, $h; 2768 glVertex $w, $h;
2303 glVertex $w, 0; 2769 glVertex $w, 0;
2304 glEnd; 2770 glEnd;
2305 2771
2306 glPopMatrix; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2307 2773
2308 glTranslate 2, 2;
2309 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2310} 2775}
2311 2776
2312############################################################################# 2777#############################################################################
2313 2778
… …
2318use CFClient::OpenGL; 2783use CFClient::OpenGL;
2319 2784
2320sub new { 2785sub new {
2321 my $class = shift; 2786 my $class = shift;
2322 2787
2323 $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2324 aspect => 1, 2789 aspect => 1,
2790 can_events => 0,
2325 @_, 2791 @_,
2326 ) 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
2327} 2809}
2328 2810
2329sub size_request { 2811sub size_request {
2330 (32, 8) 2812 (32, 8)
2331} 2813}
2332 2814
2815sub update {
2816 my ($self) = @_;
2817
2818 return unless $self->{visible};
2819
2820 $self->SUPER::update;
2821}
2822
2333sub draw { 2823sub _draw {
2334 my ($self) = @_; 2824 my ($self) = @_;
2335 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
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2337 2838
2338 if ($tex) { 2839 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D; 2840 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1; 2842 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D; 2844 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 } 2845 }
2846}
2847
2848sub DESTROY {
2849 my ($self) = @_;
2850
2851 $self->{timer}->cancel
2852 if $self->{timer};
2853
2854 $self->SUPER::DESTROY;
2348} 2855}
2349 2856
2350############################################################################# 2857#############################################################################
2351 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
2352package CFClient::UI::Root; 3343package CFClient::UI::Root;
2353 3344
2354our @ISA = CFClient::UI::Container::; 3345our @ISA = CFClient::UI::Container::;
2355 3346
2356use CFClient::OpenGL; 3347use CFClient::OpenGL;
2357 3348
2358sub check_size { 3349sub new {
2359 my ($self) = @_; 3350 my $class = shift;
2360 3351
2361 $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
2362} 3360}
2363 3361
2364sub size_request { 3362sub size_request {
2365 ($::WIDTH, $::HEIGHT) 3363 my ($self) = @_;
2366}
2367 3364
2368sub 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 {
2369 my ($self, $x, $y, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
2370 3384
2371 $self->SUPER::configure ($x, $y, $w, $h);
2372
2373 for my $child (@{$self->{children}}) { 3385 for my $child ($self->children) {
2374 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)};
2375 3387
2376 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3388 $X = $child->{force_x} if exists $child->{force_x};
2377 $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
2378 $child->configure ($X, $Y, $W,$H); 3394 $child->configure ($X, $Y, $W, $H);
2379 } 3395 }
2380} 3396}
2381 3397
2382sub _topleft { 3398sub coord2local {
2383 my ($self, $x, $y) = @_; 3399 my ($self, $x, $y) = @_;
2384 3400
2385 ($x, $y) 3401 ($x, $y)
2386} 3402}
2387 3403
3404sub coord2global {
3405 my ($self, $x, $y) = @_;
3406
3407 ($x, $y)
3408}
3409
2388sub update { 3410sub update {
2389 my ($self) = @_; 3411 my ($self) = @_;
2390 3412
2391 $self->check_size; 3413 $::WANT_REFRESH++;
2392 ::refresh ();
2393} 3414}
2394 3415
2395sub add { 3416sub add {
2396 my ($self, $child) = @_; 3417 my ($self, @children) = @_;
2397 3418
2398 # integerize window positions 3419 $_->{is_toplevel} = 1
2399 $child->{x} = int $child->{x}; 3420 for @children;
2400 $child->{y} = int $child->{y};
2401 3421
2402 $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 }
2403} 3438}
2404 3439
2405sub on_refresh { 3440sub on_refresh {
2406 my ($self, $id, $cb) = @_; 3441 my ($self, $id, $cb) = @_;
2407 3442
2408 $self->{refresh_hook}{$id} = $cb; 3443 $self->{refresh_hook}{$id} = $cb;
2409} 3444}
2410 3445
3446sub on_post_alloc {
3447 my ($self, $id, $cb) = @_;
3448
3449 $self->{post_alloc_hook}{$id} = $cb;
3450}
3451
2411sub draw { 3452sub draw {
2412 my ($self) = @_; 3453 my ($self) = @_;
2413 3454
2414 while (my $rcb = delete $self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
2415 $_->() for values %$rcb; 3456 $_->()
3457 for values %{delete $self->{refresh_hook}};
2416 } 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
2417 3548
2418 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
2421 3552
2422 glMatrixMode GL_PROJECTION; 3553 glMatrixMode GL_PROJECTION;
2423 glLoadIdentity; 3554 glLoadIdentity;
2424 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2425 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
2426 glLoadIdentity; 3557 glLoadIdentity;
2427 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
2428 $self->_draw; 3566 $self->_draw;
2429} 3567}
2430 3568
2431############################################################################# 3569#############################################################################
2432 3570
2433package CFClient::UI; 3571package CFClient::UI;
2434 3572
2435$ROOT = new CFClient::UI::Root; 3573$ROOT = new CFClient::UI::Root;
2436$TOOLTIP = new CFClient::UI::Tooltip; 3574$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2437 3575
24381 35761
2439 3577

Diff Legend

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