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.170 by root, Mon Apr 24 11:45:17 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC

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

Diff Legend

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