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

Diff Legend

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