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

Diff Legend

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