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.179 by elmex, Fri Apr 28 05:17:21 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
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 61 }
40 62
41 return; 63 return;
42 } 64 }
43 } 65 }
… …
47 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
48} 70}
49 71
50# class methods for events 72# class methods for events
51sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 75 if $FOCUS;
54} 76}
55 77
56sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 80 if $FOCUS;
59} 81}
60 82
61sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
62 my ($ev) = @_; 84 my ($ev) = @_;
… …
71 check_tooltip; 93 check_tooltip;
72 } 94 }
73 95
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 97
76 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 100}
81 101
82sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
83 my ($ev) = @_; 103 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
85 105
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 107
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 109
90 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 112
95 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 115 $grab->update if $grab;
98 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 133
116 check_tooltip; 134 check_tooltip;
117 } 135 }
118 136
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 138 if $HOVER;
123} 139}
124 140
125# convert position array to integers 141# convert position array to integers
126sub harmonize { 142sub harmonize {
127 my ($vals) = @_; 143 my ($vals) = @_;
… …
133 $rem += $_ - $i; 149 $rem += $_ - $i;
134 $_ = $i; 150 $_ = $i;
135 } 151 }
136} 152}
137 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
138############################################################################# 195#############################################################################
139 196
140package CFClient::UI::Base; 197package CFClient::UI::Base;
141 198
142use strict; 199use strict;
… …
145 202
146sub new { 203sub new {
147 my $class = shift; 204 my $class = shift;
148 205
149 my $self = bless { 206 my $self = bless {
150 x => 0, 207 x => "center",
151 y => 0, 208 y => "center",
152 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
153 can_events => 1, 212 can_events => 1,
154 @_ 213 @_
155 }, $class; 214 }, $class;
156 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
157 for (keys %$self) { 218 for (keys %$self) {
158 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
160 } 221 }
161 } 222 }
162 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
163 $self 236 $self
164} 237}
165 238
166sub destroy { 239sub destroy {
167 my ($self) = @_; 240 my ($self) = @_;
… …
176 return if $self->{parent}; 249 return if $self->{parent};
177 250
178 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
179} 252}
180 253
181sub hide { 254sub set_visible {
182 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};
183 278
184 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
186 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
187 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
188 if $self->{parent}; 313 if $self->{parent};
189} 314}
190 315
191sub move { 316sub move_abs {
192 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
193 318
194 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
197 322
198 $self->update; 323 $self->update;
199} 324}
200 325
201sub set_size { 326sub set_size {
202 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
203 328
204 $self->{user_w} = $w; 329 $self->{force_w} = $w;
205 $self->{user_h} = $h; 330 $self->{force_h} = $h;
206 331
207 $self->check_size; 332 $self->realloc;
208} 333}
209 334
210sub size_request { 335sub size_request {
211 require Carp; 336 require Carp;
212 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
214 339
215sub configure { 340sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
217 342
218 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
221 348
222 # use alignment to adjust x, y 349 # use alignment to adjust x, y
223 350
224 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 353 }
229 354
230 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 356 $self->{x} = $x;
232 $self->{y} = $y; 357 $self->{y} = $y;
233 $self->update; 358 $self->update;
234 } 359 }
235 360
236 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
237 $self->{w} = $w; 364 $self->{alloc_w} = $w;
238 $self->{h} = $h; 365 $self->{alloc_h} = $h;
239 366
240 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
241 $self->update;
242 } 368 }
243} 369}
244 370
245sub size_allocate { 371sub size_allocate {
246 # nothing to be done 372 # nothing to be done
247} 373}
248 374
249sub children { 375sub children {
376 # nop
250} 377}
251 378
252# call when resoltuion changes etc. 379sub visible_children {
253sub reconfigure { 380 $_[0]->children
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 381}
261 382
262sub set_max_size { 383sub set_max_size {
263 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
264 385
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 388}
268 389
269# return top left coordinates 390sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 391 my ($self, $tooltip) = @_;
272 392
273 $self->{parent} 393 $tooltip =~ s/^\s+//;
274 or Carp::confess "no parent widget in _topleft\n";#d# 394 $tooltip =~ s/\s+$//;
275 395
276 $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 }
277} 404}
278 405
279# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
280sub coord2local { 407sub coord2local {
281 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
282 409
283 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 411}
286 412
287# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
288sub coord2global { 414sub coord2global {
289 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
290 416
291 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 418}
294 419
295sub focus_in { 420sub focus_in {
296 my ($self) = @_; 421 my ($self) = @_;
297 422
298 return if $FOCUS == $self; 423 return if $FOCUS == $self;
299 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
300 425
301 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
302 427
303 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
304 429
305 $focus->update if $focus; 430 $focus->update if $focus;
306 $FOCUS->update; 431 $FOCUS->update;
307} 432}
308 433
… …
311 436
312 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
313 438
314 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
315 440
316 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
317 442
318 $focus->update if $focus; #? 443 $focus->update if $focus; #?
319}
320 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
321sub mouse_motion { } 449sub mouse_motion { 0 }
322sub button_up { } 450sub button_up { 0 }
323sub key_down { } 451sub key_down { 0 }
324sub key_up { } 452sub key_up { 0 }
325 453
326sub button_down { 454sub button_down {
327 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
328 456
329 $self->focus_in; 457 $self->focus_in;
330}
331 458
332sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
333sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
334sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
335sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
336sub 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
337 535
338sub draw { 536sub draw {
339 my ($self) = @_; 537 my ($self) = @_;
340 538
341 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);
342 550
343 glPushMatrix; 551 glPushMatrix;
344 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
345 $self->_draw;
346 glPopMatrix;
347 553
348 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
349 my ($x, $y) = @$self{qw(x y)};
350
351 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
352 glEnable GL_BLEND; 556 glEnable GL_BLEND;
353 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
354 glBegin GL_QUADS; 558 glBegin GL_QUADS;
355 glVertex $x , $y;
356 glVertex $x + $self->{w}, $y;
357 glVertex $x + $self->{w}, $y + $self->{h};
358 glVertex $x , $y + $self->{h};
359 glEnd;
360 glDisable GL_BLEND;
361 }
362
363 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix;
365 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0; 559 glVertex 0 , 0;
369 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
372 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;
373 glPopMatrix; 577 glPopMatrix;
374 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;
375 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
376} 583}
377 584
378sub _draw { 585sub _draw {
379 my ($self) = @_; 586 my ($self) = @_;
380 587
381 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
382} 589}
383 590
384sub find_widget {
385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
388
389 return $self
390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
392
393 ()
394}
395
396sub set_parent {
397 my ($self, $parent) = @_;
398
399 Scalar::Util::weaken ($self->{parent} = $parent);
400}
401
402sub check_size {
403 my ($self) = @_;
404
405 $self->{parent}
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426}
427
428sub update {
429 my ($self) = @_;
430
431 $self->{parent}->update
432 if $self->{parent};
433}
434
435sub connect {
436 my ($self, $signal, $cb) = @_;
437
438 push @{ $self->{signal_cb}{$signal} }, $cb;
439}
440
441sub emit {
442 my ($self, $signal, @args) = @_;
443
444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
445}
446
447sub DESTROY { 591sub DESTROY {
448 my ($self) = @_; 592 my ($self) = @_;
449 593
594 delete $WIDGET{$self+0};
450 #$self->deactivate; 595 #$self->deactivate;
451} 596}
452 597
453############################################################################# 598#############################################################################
454 599
… …
463 my $class = shift; 608 my $class = shift;
464 609
465 # range [value, low, high, page] 610 # range [value, low, high, page]
466 611
467 $class->SUPER::new ( 612 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 613 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 614 #active_bg => [1, 1, 1, 0.5],
470 @_ 615 @_
471 ) 616 )
472} 617}
473 618
474sub _draw { 619sub _draw {
475 my ($self) = @_; 620 my ($self) = @_;
476 621
622 my $color = $FOCUS == $self && $self->{active_bg}
623 ? $self->{active_bg}
624 : $self->{bg};
625
626 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
478 628
479 glEnable GL_BLEND; 629 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 631 glColor_premultiply @$color;
482 632
483 glBegin GL_QUADS; 633 glBegin GL_QUADS;
484 glVertex 0 , 0; 634 glVertex 0 , 0;
485 glVertex 0 , $h; 635 glVertex 0 , $h;
486 glVertex $w, $h; 636 glVertex $w, $h;
487 glVertex $w, 0; 637 glVertex $w, 0;
488 glEnd; 638 glEnd;
489 639
490 glDisable GL_BLEND; 640 glDisable GL_BLEND;
641 }
491} 642}
492 643
493############################################################################# 644#############################################################################
494 645
495package CFClient::UI::Empty; 646package CFClient::UI::Empty;
… …
500 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
502} 653}
503 654
504sub size_request { 655sub size_request {
505 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
506} 659}
507 660
508sub draw { } 661sub draw { }
509 662
510############################################################################# 663#############################################################################
… …
514our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
515 668
516sub new { 669sub new {
517 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
518 671
519 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
520 673
521 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
522 children => [], 675 children => [],
523 can_events => 0, 676 can_events => 0,
524 %arg, 677 %arg,
525 ); 678 );
679
526 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
527 682
528 $self 683 $self
529} 684}
530 685
531sub add { 686sub add {
532 my ($self, $child) = @_; 687 my ($self, @widgets) = @_;
533 688
534 $child->set_parent ($self); 689 $_->set_parent ($self)
690 for @widgets;
535 691
536 use sort 'stable'; 692 use sort 'stable';
537 693
538 $self->{children} = [ 694 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 696 @{$self->{children}}, @widgets
541 ]; 697 ];
542 698
543 $child->check_size; 699 $self->realloc;
544} 700}
545 701
546sub children { 702sub children {
547 @{ $_[0]{children} } 703 @{ $_[0]{children} }
548} 704}
… …
553 delete $child->{parent}; 709 delete $child->{parent};
554 $child->hide; 710 $child->hide;
555 711
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557 713
558 $self->check_size; 714 $self->realloc;
559 $self->update;
560} 715}
561 716
562sub clear { 717sub clear {
563 my ($self) = @_; 718 my ($self) = @_;
564 719
… …
567 722
568 for (@$children) { 723 for (@$children) {
569 delete $_->{parent}; 724 delete $_->{parent};
570 $_->hide; 725 $_->hide;
571 } 726 }
727
728 $self->realloc;
572} 729}
573 730
574sub find_widget { 731sub find_widget {
575 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
576 733
577 $x -= $self->{x}; 734 $x -= $self->{x};
578 $y -= $self->{y}; 735 $y -= $self->{y};
579 736
580 my $res; 737 my $res;
581 738
582 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
583 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
584 and return $res; 741 and return $res;
585 } 742 }
586 743
587 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
636 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
637} 794}
638 795
639############################################################################# 796#############################################################################
640 797
798# back-buffered drawing area
799
641package CFClient::UI::Window; 800package CFClient::UI::Window;
642 801
643our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
644 803
645use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
651} 810}
652 811
653sub update { 812sub update {
654 my ($self) = @_; 813 my ($self) = @_;
655 814
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 815 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 816 $self->SUPER::update;
658} 817}
659 818
660sub size_allocate { 819sub size_allocate {
661 my ($self, $w, $h) = @_; 820 my ($self, $w, $h) = @_;
662 821
663 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 823 $self->update;
824}
825
826sub _render {
827 my ($self) = @_;
828
829 $self->{children}[0]->draw;
665} 830}
666 831
667sub render_child { 832sub render_child {
668 my ($self) = @_; 833 my ($self) = @_;
669 834
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 838
674# glColorMask 1, 1, 1, 0; 839 {
675# glEnable GL_BLEND; 840 package CFClient::UI::Base;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 841
677# glRasterPos 0, 0; 842 ($draw_x, $draw_y, $draw_w, $draw_h) =
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 843 (0, 0, $self->{w}, $self->{h});
679# glDisable GL_BLEND; 844 }
680# glColorMask 1, 1, 1, 1; 845
846 $self->_render;
681 }; 847 };
682} 848}
683 849
684sub _draw { 850sub _draw {
685 my ($self) = @_; 851 my ($self) = @_;
686 852
687 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
688 854
689 my $tex = $self->{texture} 855 my $tex = $self->{texture}
690 or return; 856 or return;
691 857
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 860 glColor 0, 0, 0, 1;
697 861
698 $tex->draw_quad (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 863
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
702} 865}
703 866
704############################################################################# 867#############################################################################
705 868
706package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
707 870
708our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
709
710sub new { die }
711
712sub size_request {
713 my ($self) = @_;
714
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717
718 @$self{qw(child_w child_h)}
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 $self->{children}[1]->draw;
725}
726
727
728#############################################################################
729
730package CFClient::UI::Frame;
731
732our @ISA = CFClient::UI::Bin::;
733
734use CFClient::OpenGL;
735 872
736sub new { 873sub new {
737 my $class = shift; 874 my $class = shift;
738 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
739 my $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 976 vp => (new CFClient::UI::ViewPort expand => 1),
741 border_bg => [1, 1, 1, 1], 977 slider => $slider,
742 border => 0.8, 978 %arg,
743 @_
744 ); 979 );
745 980
981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
983
746 $self 984 $self
747} 985}
748 986
749sub _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 {
750 my ($self) = @_; 1004 my ($self, $w, $h) = @_;
751 1005
752 my ($w, $h) = ($self->{w}, $self->{h}); 1006 $self->SUPER::size_allocate ($w, $h);
753 1007
754 glEnable GL_BLEND; 1008 my $child = $self->{vp}->child;
755 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]);
756 glEnable GL_TEXTURE_2D;
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758
759# glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0;
762# glVertex 0 , $h;
763# glVertex $w, $h;
764# glVertex $w, 0;
765# glEnd;
766
767
768 $self->child->draw;
769 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D;
771} 1010}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
772 1014
773############################################################################# 1015#############################################################################
774 1016
775package CFClient::UI::FancyFrame; 1017package CFClient::UI::Frame;
776 1018
777our @ISA = CFClient::UI::Bin::; 1019our @ISA = CFClient::UI::Bin::;
778 1020
779use CFClient::OpenGL; 1021use CFClient::OpenGL;
780
781my @tex =
782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
783 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
784 1022
785sub new { 1023sub new {
786 my $class = shift; 1024 my $class = shift;
787 1025
788 # 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};
789 1075
790 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
793 border => 0.6, 1079 border => 0.6,
794 can_events => 1, 1080 can_events => 1,
795 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
796 ); 1084 );
797 1085
798 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
799 align => 0, 1087 align => 0,
800 valign => 1, 1088 valign => 1,
801 text => $self->{title}, 1089 text => $title,
802 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
803 1092
804 $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};
805} 1101}
806 1102
807sub border { 1103sub border {
808 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
809} 1105}
810 1106
811sub size_request { 1107sub size_request {
812 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
813 1112
814 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
815 1114
816 ( 1115 (
817 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
820} 1119}
821 1120
822sub size_allocate { 1121sub size_allocate {
823 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
824 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
825 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
827 1134
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
829 if $self->{title};
830
831 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
832} 1136}
833 1137
834sub button_down { 1138sub button_down {
835 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
836 1140
… …
852 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
853 1157
854 my $dx = $ev->{x} - $ox; 1158 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
856 1160
857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1163
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
860 $self->check_size; 1165 $self->realloc;
861 }; 1166 };
862 1167
863 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
864 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
865 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
… …
867 $self->{motion} = sub { 1172 $self->{motion} = sub {
868 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
869 1174
870 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
871 1176
872 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
873 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
874 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
875 } 1185 1
876} 1186}
877 1187
878sub button_up { 1188sub button_up {
879 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
880 1190
881 delete $self->{motion}; 1191 !!delete $self->{motion}
882} 1192}
883 1193
884sub mouse_motion { 1194sub mouse_motion {
885 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
886 1196
887 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
888} 1200}
889 1201
890sub _draw { 1202sub _draw {
891 my ($self) = @_; 1203 my ($self) = @_;
892 1204
1205 my $child = $self->{children}[0];
1206
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
895 1209
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1212
901 my $border = $self->border; 1213 my $border = $self->border;
902 1214
903 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1220
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1222 glColor @{ $self->{bg} };
911 1223
912 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
1225 # solve this better(?)
913 my $rep_x = $cw / $bg->{w}; 1226 $bg->{s} = $cw / $bg->{w};
914 my $rep_y = $ch / $bg->{h}; 1227 $bg->{t} = $ch / $bg->{h};
915
916 glColor @{ $self->{bg} };
917
918 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1229 }
922 1230
923 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1232
927 $self->{title}->draw if $self->{title};
928
929 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
930} 1239}
931 1240
932############################################################################# 1241#############################################################################
933 1242
934package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
942sub new { 1251sub new {
943 my $class = shift; 1252 my $class = shift;
944 1253
945 $class->SUPER::new ( 1254 $class->SUPER::new (
946 col_expand => [], 1255 col_expand => [],
947 @_ 1256 @_,
948 ) 1257 )
1258}
1259
1260sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} }
949} 1262}
950 1263
951sub add { 1264sub add {
952 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
953 1266
954 $child->set_parent ($self); 1267 $child->set_parent ($self);
955 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
956 1269
957 $child->check_size; 1270 $self->realloc;
958} 1271}
959 1272
960sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962}
963
964# 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?
965sub clear { 1274sub clear {
966 my ($self) = @_; 1275 my ($self) = @_;
967 1276
968 my @children = $self->children; 1277 my @children = $self->children;
969 delete $self->{children}; 1278 delete $self->{children};
… …
971 for (@children) { 1280 for (@children) {
972 delete $_->{parent}; 1281 delete $_->{parent};
973 $_->hide; 1282 $_->hide;
974 } 1283 }
975 1284
976 $self->update; 1285 $self->realloc;
977} 1286}
978 1287
979sub get_wh { 1288sub get_wh {
980 my ($self) = @_; 1289 my ($self) = @_;
981 1290
… …
1012sub size_allocate { 1321sub size_allocate {
1013 my ($self, $w, $h) = @_; 1322 my ($self, $w, $h) = @_;
1014 1323
1015 my ($ws, $hs) = $self->get_wh; 1324 my ($ws, $hs) = $self->get_wh;
1016 1325
1017 my $req_w = sum @$ws; 1326 my $req_w = (sum @$ws) || 1;
1018 my $req_h = sum @$hs; 1327 my $req_h = (sum @$hs) || 1;
1019 1328
1020 # TODO: nicer code && do row_expand 1329 # TODO: nicer code && do row_expand
1021 my @col_expand = @{$self->{col_expand}}; 1330 my @col_expand = @{$self->{col_expand}};
1022 @col_expand = (1) x @$ws unless @col_expand; 1331 @col_expand = (1) x @$ws unless @col_expand;
1023 my $col_expand = (sum @col_expand) || 1; 1332 my $col_expand = (sum @col_expand) || 1;
… …
1077 } 1386 }
1078} 1387}
1079 1388
1080############################################################################# 1389#############################################################################
1081 1390
1082package CFClient::UI::HBox; 1391package CFClient::UI::Box;
1083
1084# TODO: wrap into common Box base class
1085 1392
1086our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
1087 1394
1088sub size_request { 1395sub size_request {
1089 my ($self) = @_; 1396 my ($self) = @_;
1090 1397
1091 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
1092 1399 ? (
1093 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1094 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1095 (List::Util::max map $_->[1], @alloc), 1402 )
1096 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
1097} 1407}
1098 1408
1099sub size_allocate { 1409sub size_allocate {
1100 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
1101 1411
1102 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
1103
1104 my $children = $self->{children}; 1413 my $children = $self->{children};
1105 1414
1106 my @h = map $_->{req_w}, @$children; 1415 my @req;
1107 1416
1108 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
1109 1418 @req = ($space / (@$children || 1)) x @$children;
1110 if ($req_h > $h) {
1111 # ah well, not enough space
1112 $_ *= $h / $req_h for @h;
1113 } 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 {
1114 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1115 $exp ||= 1;
1116 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
1117 for (0 .. $#$children) { 1432 for 0 .. $#$children;
1118 my $child = $children->[$_];
1119
1120 my $alloc_h = $h[$_];
1121 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1122 $h[$_] = $alloc_h;
1123 } 1433 }
1124 } 1434 }
1125 1435
1126 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
1127 1437
1128 my $y = 0; 1438 my $pos = 0;
1129 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
1130 my $child = $children->[$_];
1131 my $h = $h[$_]; 1440 my $alloc = $req[$_];
1132 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1133 1442
1134 $y += $h; 1443 $pos += $alloc;
1135 } 1444 }
1136 1445
1137 1 1446 1
1138} 1447}
1139 1448
1140############################################################################# 1449#############################################################################
1141 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
1142package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
1143 1467
1144# TODO: wrap into common Box base class
1145
1146our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
1147 1469
1148sub size_request { 1470sub new {
1149 my ($self) = @_; 1471 my $class = shift;
1150 1472
1151 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1152 1474 vertical => 1,
1153 ( 1475 @_,
1154 (List::Util::max map $_->[0], @alloc),
1155 (List::Util::sum map $_->[1], @alloc),
1156 ) 1476 )
1157} 1477}
1158 1478
1159sub size_allocate {
1160 my ($self, $w, $h) = @_;
1161
1162 my $children = $self->{children};
1163
1164 my @h = map $_->{req_h}, @$children;
1165
1166 my $req_h = List::Util::sum @h;
1167
1168 if ($req_h > $h) {
1169 # ah well, not enough space
1170 $_ *= $h / $req_h for @h;
1171 } else {
1172 my $exp = List::Util::sum map $_->{expand}, @$children;
1173 $exp ||= 1;
1174
1175 for (0 .. $#$children) {
1176 my $child = $children->[$_];
1177
1178 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1179 }
1180 }
1181
1182 CFClient::UI::harmonize \@h;
1183
1184 my $y = 0;
1185 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_];
1188 $child->configure (0, $y, $w, $h);
1189
1190 $y += $h;
1191 }
1192
1193 1
1194}
1195
1196############################################################################# 1479#############################################################################
1197 1480
1198package CFClient::UI::Label; 1481package CFClient::UI::Label;
1199 1482
1200our @ISA = CFClient::UI::Base::; 1483our @ISA = CFClient::UI::DrawBG::;
1201 1484
1202use CFClient::OpenGL; 1485use CFClient::OpenGL;
1203 1486
1204sub new { 1487sub new {
1205 my ($class, %arg) = @_; 1488 my ($class, %arg) = @_;
1206 1489
1207 my $self = $class->SUPER::new ( 1490 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1491 fg => [1, 1, 1],
1492 #bg => none
1493 #active_bg => none
1209 #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),
1210 fontsize => 1, 1500 fontsize => 1,
1211 text => "",
1212 align => -1, 1501 align => -1,
1213 valign => -1, 1502 valign => -1,
1214 padding => 2, 1503 padding_x => 2,
1215 layout => new CFClient::Layout, 1504 padding_y => 2,
1216 can_events => 0, 1505 can_events => 0,
1217 %arg 1506 %arg
1218 ); 1507 );
1219 1508
1220 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1510 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1511 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1512 $self->{template} = $layout;
1224 } 1513 }
1225 1514
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1515 if (exists $self->{markup}) {
1227 $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 }
1228 1520
1229 $self 1521 $self
1230} 1522}
1231 1523
1232sub escape { 1524sub escape($) {
1233 local $_ = $_[1]; 1525 local $_ = $_[0];
1234 1526
1235 s/&/&amp;/g; 1527 s/&/&amp;/g;
1236 s/>/&gt;/g; 1528 s/>/&gt;/g;
1237 s/</&lt;/g; 1529 s/</&lt;/g;
1238 1530
1239 $_[1] 1531 $_
1240} 1532}
1241 1533
1242sub update { 1534sub update {
1243 my ($self) = @_; 1535 my ($self) = @_;
1244 1536
1245 delete $self->{texture}; 1537 delete $self->{texture};
1246 $self->SUPER::update; 1538 $self->SUPER::update;
1247} 1539}
1248 1540
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1541sub set_text {
1256 my ($self, $text) = @_; 1542 my ($self, $text) = @_;
1257 1543
1258 return if $self->{text} eq "T$text"; 1544 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1545 $self->{text} = "T$text";
1260 1546
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1262 1549
1263 delete $self->{texture}; 1550 $self->realloc;
1264 $self->update; 1551 $self->update;
1265 $self->check_size;
1266} 1552}
1267 1553
1268sub set_markup { 1554sub set_markup {
1269 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1270 1556
1271 return if $self->{text} eq "M$markup"; 1557 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1558 $self->{text} = "M$markup";
1273 1559
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1275 1564
1276 delete $self->{texture}; 1565 $self->realloc;
1277 $self->update; 1566 $self->update;
1278 $self->check_size;
1279} 1567}
1280 1568
1281sub size_request { 1569sub size_request {
1282 my ($self) = @_; 1570 my ($self) = @_;
1283 1571
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1572 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $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});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1577
1288 my ($w, $h) = $self->{layout}->size; 1578 my ($w, $h) = $self->{layout}->size;
1289 1579
1290 if (exists $self->{template}) { 1580 if (exists $self->{template}) {
… …
1295 1585
1296 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1297 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1298 } 1588 }
1299 1589
1300 ( 1590 ($w, $h)
1301 $w + $self->{padding} * 2,
1302 $h + $self->{padding} * 2,
1303 )
1304} 1591}
1305 1592
1306sub size_allocate { 1593sub size_allocate {
1307 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1308 1595
1596 delete $self->{ox};
1597
1309 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1310} 1600}
1311 1601
1312sub set_fontsize { 1602sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1314 1604
1315 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1606 delete $self->{texture};
1317 $self->check_size; 1607
1318 $self->update; 1608 $self->realloc;
1319} 1609}
1320 1610
1321sub _draw { 1611sub _draw {
1322 my ($self) = @_; 1612 my ($self) = @_;
1323 1613
1614 $self->SUPER::_draw; # draw background, if applicable
1615
1324 my $tex = $self->{texture} ||= do { 1616 my $tex = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1618 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $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});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623
1328 new_from_layout CFClient::Texture $self->{layout} 1624 new_from_layout CFClient::Texture $self->{layout}
1329 }; 1625 };
1330 1626
1331 glEnable GL_BLEND; 1627 unless (exists $self->{ox}) {
1332 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
1333 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1639
1336 glColor @{$self->{fg}}; 1640 glColor_premultiply @{$self->{fg}}
1641 if $tex->{format} == GL_ALPHA;
1337 1642
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $tex->draw_quad ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1351 1644
1352 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1646}
1355 1647
1356############################################################################# 1648#############################################################################
1357 1649
1358package CFClient::UI::EntryBase; 1650package CFClient::UI::EntryBase;
… …
1371 active_fg => [0, 0, 0], 1663 active_fg => [0, 0, 0],
1372 can_hover => 1, 1664 can_hover => 1,
1373 can_focus => 1, 1665 can_focus => 1,
1374 valign => 0, 1666 valign => 0,
1375 can_events => 1, 1667 can_events => 1,
1668 #text => ...
1376 @_ 1669 @_
1377 ) 1670 )
1378} 1671}
1379 1672
1380sub _set_text { 1673sub _set_text {
… …
1382 1675
1383 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1384 1677
1385 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1386 1679
1387 delete $self->{texture};
1388
1389 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1390 $self->{text} = $text; 1681 $self->{text} = $text;
1391 1682
1392 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1394 1685
1395 $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;
1396} 1697}
1397 1698
1398sub get_text { 1699sub get_text {
1399 $_[0]{text} 1700 $_[0]{text}
1400} 1701}
… …
1403 my ($self) = @_; 1704 my ($self) = @_;
1404 1705
1405 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1406 1707
1407 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1408}
1409
1410sub size_allocate {
1411 my ($self, $w, $h) = @_;
1412
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414}
1415
1416sub set_text {
1417 my ($self, $text) = @_;
1418
1419 $self->{cursor} = length $text;
1420 $self->_set_text ($text);
1421 $self->update;
1422} 1709}
1423 1710
1424sub key_down { 1711sub key_down {
1425 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1426 1713
… …
1428 my $sym = $ev->{sym}; 1715 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1716 my $uni = $ev->{unicode};
1430 1717
1431 my $text = $self->get_text; 1718 my $text = $self->get_text;
1432 1719
1433 if ($sym == 8) { 1720 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1722 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1723 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1724 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1725 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1726 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1727 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1732 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1733 $self->_emit ('escape');
1447 } elsif ($uni) { 1734 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1449 } 1738 }
1450 1739
1451 $self->_set_text ($text); 1740 $self->_set_text ($text);
1452 $self->update; 1741
1742 $self->realloc;
1743
1744 1
1453} 1745}
1454 1746
1455sub focus_in { 1747sub focus_in {
1456 my ($self) = @_; 1748 my ($self) = @_;
1457 1749
… …
1472 utf8::encode $text; 1764 utf8::encode $text;
1473 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1474 1766
1475 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1476 $self->update; 1768 $self->update;
1769
1770 1
1477} 1771}
1478 1772
1479sub mouse_motion { 1773sub mouse_motion {
1480 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1481# 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
1482} 1778}
1483 1779
1484sub _draw { 1780sub _draw {
1485 my ($self) = @_; 1781 my ($self) = @_;
1486 1782
1487 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1488 1784
1489 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1490 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1491 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1492 } else { 1788 } else {
1493 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1494 } 1790 }
1495 1791
1496 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1497 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1498 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1499 glVertex 0 , 0; 1795 glVertex 0 , 0;
1500 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1501 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1502 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1537 if ($sym == 13) { 1833 if ($sym == 13) {
1538 unshift @{$self->{history}}, 1834 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 1835 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1; 1836 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 1837 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 1838 $self->_emit (activate => $txt);
1543 $self->update; 1839 $self->update;
1544 1840
1545 } elsif ($sym == CFClient::SDLK_UP) { 1841 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 1842 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 1843 $self->{history_saveback} = $self->get_text;
… …
1563 } else { 1859 } else {
1564 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1565 } 1861 }
1566 1862
1567 } else { 1863 } else {
1568 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1569 } 1867 1
1570
1571} 1868}
1572 1869
1573############################################################################# 1870#############################################################################
1574 1871
1575package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1584 1881
1585sub new { 1882sub new {
1586 my $class = shift; 1883 my $class = shift;
1587 1884
1588 $class->SUPER::new ( 1885 $class->SUPER::new (
1589 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1590 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1593 can_hover => 1, 1890 can_hover => 1,
1594 align => 0, 1891 align => 0,
1595 valign => 0, 1892 valign => 0,
1596 can_events => 1, 1893 can_events => 1,
1597 @_ 1894 @_
1598 ) 1895 )
1599} 1896}
1600 1897
1898sub activate { }
1899
1601sub button_up { 1900sub button_up {
1602 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1603 1902
1903 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate"); 1906
1607 } 1907 1
1608} 1908}
1609 1909
1610sub _draw { 1910sub _draw {
1611 my ($self) = @_; 1911 my ($self) = @_;
1612 1912
1613 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1614 1914
1615 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg};
1617 }
1618
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1624 1918
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1920
1627 glDisable GL_TEXTURE_2D; 1921 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1922
1630 $self->SUPER::_draw; 1923 $self->SUPER::_draw;
1631} 1924}
1632 1925
1633############################################################################# 1926#############################################################################
… …
1644 1937
1645sub new { 1938sub new {
1646 my $class = shift; 1939 my $class = shift;
1647 1940
1648 $class->SUPER::new ( 1941 $class->SUPER::new (
1649 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1650 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1651 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],
1652 state => 0, 1948 state => 0,
1653 can_hover => 1, 1949 can_hover => 1,
1654 @_ 1950 @_
1655 ) 1951 )
1656} 1952}
1657 1953
1658sub size_request { 1954sub size_request {
1659 my ($self) = @_; 1955 my ($self) = @_;
1660 1956
1661 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1662} 1958}
1663 1959
1664sub button_down { 1960sub button_down {
1665 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1666 1962
1667 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1668 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1669 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1670 $self->emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1671 } 1971 1
1672} 1972}
1673 1973
1674sub _draw { 1974sub _draw {
1675 my ($self) = @_; 1975 my ($self) = @_;
1676 1976
1677 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1678 1978
1679 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1680 1980
1681 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;
1682 1984
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1986
1685 glEnable GL_BLEND; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1988
1686 glEnable GL_TEXTURE_2D; 1989 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1990 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1991 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1992}
1696 1993
1697############################################################################# 1994#############################################################################
1698 1995
1699package CFClient::UI::Image; 1996package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 2039 glTranslate 0, -$self->{w}, 0;
1743 2040
1744 ($w, $h) = ($h, $w); 2041 ($w, $h) = ($h, $w);
1745 } 2042 }
1746 2043
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 2044 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2045 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 2046
1752 $tex->draw_quad (0, 0, $w, $h); 2047 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 2048
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 2049 glDisable GL_TEXTURE_2D;
1756} 2050}
1757 2051
1758############################################################################# 2052#############################################################################
1759 2053
… …
1849 2143
1850 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
1851 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
1852 2146
1853 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
1854 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;
1855 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
1856 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1857 2152
1858 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
1859 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
… …
1948 qw(s1_slider.png s1_slider_bg.png); 2243 qw(s1_slider.png s1_slider_bg.png);
1949 2244
1950sub new { 2245sub new {
1951 my $class = shift; 2246 my $class = shift;
1952 2247
1953 # range [value, low, high, page] 2248 # range [value, low, high, page, unit]
1954 2249
1955 # TODO: 0-width page 2250 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2251 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2252 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2253 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
1960 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],
1961 range => [0, 0, 100, 10], 2258 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2259 min_w => $::WIDTH / 80,
1963 req_h => 20, 2260 min_h => $::WIDTH / 80,
1964 vertical => 0, 2261 vertical => 0,
1965 can_hover => 1, 2262 can_hover => 1,
1966 inner_pad => 5, 2263 inner_pad => 0.02,
1967 @_ 2264 @_
1968 ); 2265 );
1969 2266
2267 $self->set_value ($self->{range}[0]);
2268 $self->update;
2269
1970 $self 2270 $self
1971} 2271}
1972 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
1973sub size_request { 2307sub size_request {
1974 my ($self) = @_; 2308 my ($self) = @_;
1975 2309
1976 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
1977 my $h = $self->{req_h};
1978
1979 $self->{vertical} ? ($h, $w) : ($w, $h)
1980} 2311}
1981 2312
1982sub button_down { 2313sub button_down {
1983 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
1984 2315
1985 $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
1986 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
1987} 2321}
1988 2322
1989sub mouse_motion { 2323sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
1991 2325
1992 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
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2355 my $range = ($hi - $page - $lo) || 1e-100;
1994 2356
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2357 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2358
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2359 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2360 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2361
2000 $x -= $inner_pad_px; # substract the padding 2362 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2363 $value = $value * $self->{scale} + $self->{offset};
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2364
2006 $self->emit (changed => $x); 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2366 $self->{knob_w} = $knob_w;
2008 } 2367 }
2009}
2010
2011# the inner_* stuff is for generating a padding for the slider handle,
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017}
2018
2019sub _draw {
2020 my ($self) = @_;
2021 2368
2022 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2023 2370
2024 my ($w, $h) = @$self{qw(w h)}; 2371 glScale $self->{w}, $self->{h};
2025 2372
2026 if ($self->{vertical}) { 2373 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2374 # draw a vertical slider like a rotated horizontal slider
2028 2375
2376 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2377 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2378 }
2034 2379
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2380 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2381 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2382
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2383 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2385
2061 # draw background 2386 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2387 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2388
2064 # draw handle 2389 # draw handle
2065 $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);
2066 2391
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2392 glDisable GL_TEXTURE_2D;
2069} 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 (@_) }
2070 2435
2071############################################################################# 2436#############################################################################
2072 2437
2073package CFClient::UI::TextView; 2438package CFClient::UI::TextView;
2074 2439
… …
2083 fontsize => 1, 2448 fontsize => 1,
2084 can_events => 0, 2449 can_events => 0,
2085 #font => default_font 2450 #font => default_font
2086 @_, 2451 @_,
2087 2452
2088 layout => (new CFClient::Layout), 2453 layout => (new CFClient::Layout 1),
2089 par => [], 2454 par => [],
2090 height => 0, 2455 height => 0,
2091 children => [ 2456 children => [
2092 (new CFClient::UI::Empty expand => 1), 2457 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2458 (new CFClient::UI::Slider vertical => 1),
… …
2104 2469
2105 $self->{fontsize} = $fontsize; 2470 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2471 $self->reflow;
2107} 2472}
2108 2473
2109sub text_height {
2110 my ($self, $text) = @_;
2111
2112 my $layout = $self->{layout};
2113
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text);
2117
2118 ($layout->size)[1]
2119}
2120
2121sub reflow {
2122 my ($self) = @_;
2123
2124 $self->{need_reflow}++;
2125 $self->update;
2126}
2127
2128sub size_allocate { 2474sub size_allocate {
2129 my ($self, $w, $h) = @_; 2475 my ($self, $w, $h) = @_;
2130 2476
2131 $self->SUPER::size_allocate ($w, $h); 2477 $self->SUPER::size_allocate ($w, $h);
2132 2478
… …
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 2481 $self->{layout}->set_width ($self->{children}[0]{w});
2136 2482
2137 $self->reflow; 2483 $self->reflow;
2138} 2484}
2139 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
2140sub add_paragraph { 2520sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2521 my ($self, $color, $text, $indent) = @_;
2142 2522
2143 #TODO: intelligently "reformat" paragraph 2523 for my $line (split /\n/, $text) {
2144 2524 my ($w, $h) = $self->text_size ($line);
2145 my $height = $self->text_height ($text);
2146
2147 $self->{height} += $height; 2525 $self->{height} += $h;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2527 }
2148 2528
2149 push @{$self->{par}}, [$height, $color, $text];
2150
2151 $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]);
2152 $self->{children}[1]->update;
2153} 2530}
2154 2531
2155sub update { 2532sub update {
2156 my ($self) = @_; 2533 my ($self) = @_;
2157 2534
… …
2159 2536
2160 return unless $self->{h} > 0; 2537 return unless $self->{h} > 0;
2161 2538
2162 delete $self->{texture}; 2539 delete $self->{texture};
2163 2540
2164 $ROOT->on_refresh ($self, sub { 2541 $ROOT->on_post_alloc ($self, sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543
2165 if (delete $self->{need_reflow}) { 2544 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2545 my $height = 0;
2167 2546
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2169 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 }
2170 2562
2171 $self->{height} = $height; 2563 $self->{height} = $height;
2172 2564
2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174 2566
2175 delete $self->{texture}; 2567 delete $self->{texture};
2176 } 2568 }
2177 2569
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2179 glClearColor 0, 0, 0, 0; 2571 glClearColor 0, 0, 0, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2181 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
2182 glEnable GL_BLEND; 2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187 my $top = int $self->{children}[1]{range}[0];
2188
2189 my $y0 = $top;
2190 my $y1 = $top + $self->{h};
2191
2192 my $y = 0;
2193
2194 my $layout = $self->{layout};
2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197 2588
2198 for my $par (@{$self->{par}}) { 2589 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2590 my $h = $par->[1];
2200 2591
2201 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]);
2202 $layout->set_text ($par->[2]); 2595 $layout->set_markup ($par->[4]);
2203 2596
2204 glColor @{ $par->[1] }; 2597 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205 my ($W, $H) = $layout->size; 2598
2206 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;
2207 } 2601 }
2208 2602
2209 $y += $h; 2603 $y += $h;
2210 } 2604 }
2211 2605
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND; 2606 glDisable GL_BLEND;
2214 }; 2607 };
2215 }); 2608 });
2216} 2609}
2217 2610
2218sub _draw { 2611sub _draw {
2219 my ($self) = @_; 2612 my ($self) = @_;
2220 2613
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2619
2230 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2231 2621
2232} 2622}
2233 2623
… …
2281 2671
2282sub new { 2672sub new {
2283 my $class = shift; 2673 my $class = shift;
2284 2674
2285 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
2286 state => 0, 2676 state => 0,
2287 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2288 @_ 2678 @_
2289 ); 2679 );
2290 2680
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2681 $self
2297} 2682}
2298 2683
2299sub toggle_flopper { 2684sub toggle_flopper {
2300 my ($self) = @_; 2685 my ($self) = @_;
2301 2686
2302 # TODO: use animation 2687 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 2688}
2314 2689
2315############################################################################# 2690#############################################################################
2316 2691
2317package CFClient::UI::Tooltip; 2692package CFClient::UI::Tooltip;
… …
2327 @_, 2702 @_,
2328 can_events => 0, 2703 can_events => 0,
2329 ) 2704 )
2330} 2705}
2331 2706
2332sub set_markup { 2707sub set_tooltip_from {
2333 my ($self, $text) = @_; 2708 my ($self, $widget) = @_;
2334 2709
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2710 my $tooltip = $widget->{tooltip};
2336 $self->{label}->set_markup ($text); 2711
2337 $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 );
2338} 2727}
2339 2728
2340sub size_request { 2729sub size_request {
2341 my ($self) = @_; 2730 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2731
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2733
2347 ($w + 4, $h + 4) 2734 ($w + 4, $h + 4)
2348} 2735}
… …
2351 my ($self, $w, $h) = @_; 2738 my ($self, $w, $h) = @_;
2352 2739
2353 $self->SUPER::size_allocate ($w - 4, $h - 4); 2740 $self->SUPER::size_allocate ($w - 4, $h - 4);
2354} 2741}
2355 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
2356sub _draw { 2761sub _draw {
2357 my ($self) = @_; 2762 my ($self) = @_;
2358 2763
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2764 glTranslate 0.375, 0.375;
2361 2765
2362 my ($w, $h) = @$self{qw(w h)}; 2766 my ($w, $h) = @$self{qw(w h)};
2363 2767
2364 glColor 1, 0.8, 0.4; 2768 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2779 glVertex 0 , $h;
2376 glVertex $w, $h; 2780 glVertex $w, $h;
2377 glVertex $w, 0; 2781 glVertex $w, 0;
2378 glEnd; 2782 glEnd;
2379 2783
2380 glPopMatrix; 2784 glTranslate 2 - 0.375, 2 - 0.375;
2381 2785
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2786 $self->SUPER::_draw;
2384} 2787}
2385 2788
2386############################################################################# 2789#############################################################################
2387 2790
… …
2392use CFClient::OpenGL; 2795use CFClient::OpenGL;
2393 2796
2394sub new { 2797sub new {
2395 my $class = shift; 2798 my $class = shift;
2396 2799
2397 $class->SUPER::new ( 2800 my $self = $class->SUPER::new (
2398 aspect => 1, 2801 aspect => 1,
2802 can_events => 0,
2399 @_, 2803 @_,
2400 ) 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
2401} 2821}
2402 2822
2403sub size_request { 2823sub size_request {
2404 (32, 8) 2824 (32, 8)
2405} 2825}
2406 2826
2827sub update {
2828 my ($self) = @_;
2829
2830 return unless $self->{visible};
2831
2832 $self->SUPER::update;
2833}
2834
2407sub _draw { 2835sub _draw {
2408 my ($self) = @_; 2836 my ($self) = @_;
2409 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
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2850
2412 # TODO animation
2413 if ($tex) { 2851 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 } 2857 }
2423} 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.
2424 2876
2425############################################################################# 2877#############################################################################
2426 2878
2427package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2428 2880
… …
2462 2914
2463# popup given the event (must be a mouse button down event currently) 2915# popup given the event (must be a mouse button down event currently)
2464sub popup { 2916sub popup {
2465 my ($self, $ev) = @_; 2917 my ($self, $ev) = @_;
2466 2918
2467 $self->emit ("popdown"); 2919 $self->_emit ("popdown");
2468 2920
2469 # maybe save $GRAB? must be careful about events... 2921 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self; 2922 $GRAB = $self;
2471 $self->{button} = $ev->{button}; 2923 $self->{button} = $ev->{button};
2472 2924
2473 $self->show; 2925 $self->show;
2474 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2475} 2927}
2476 2928
2477sub mouse_motion { 2929sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2479 2931
2480 # TODO: should use vbox->fdind_widget or so 2932 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2483} 2937}
2484 2938
2485sub button_up { 2939sub button_up {
2486 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2487 2941
2488 if ($ev->{button} == $self->{button}) { 2942 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB; 2943 undef $GRAB;
2490 $self->hide; 2944 $self->hide;
2491 2945
2492 $self->emit ("popdown"); 2946 $self->_emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover}; 2947 $self->{hover}[1]->() if $self->{hover};
2948 } else {
2949 return 0
2950 }
2951
2494 } 2952 1
2495} 2953}
2496 2954
2497############################################################################# 2955#############################################################################
2498 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
3072 $class->SUPER::new (
3073 fontsize => 0.8,
3074 @_,
3075 )
3076}
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
2499package CFClient::UI::Root; 3470package CFClient::UI::Root;
2500 3471
2501our @ISA = CFClient::UI::Container::; 3472our @ISA = CFClient::UI::Container::;
2502 3473
2503use CFClient::OpenGL; 3474use CFClient::OpenGL;
2504 3475
2505sub check_size { 3476sub new {
2506 my ($self) = @_; 3477 my $class = shift;
2507 3478
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3479 my $self = $class->SUPER::new (
3480 visible => 1,
3481 @_,
3482 );
3483
3484 Scalar::Util::weaken ($self->{root} = $self);
3485
3486 $self
2509} 3487}
2510 3488
2511sub size_request { 3489sub size_request {
2512 ($::WIDTH, $::HEIGHT) 3490 my ($self) = @_;
2513}
2514 3491
2515sub configure { 3492 ($self->{w}, $self->{h})
3493}
3494
3495sub _to_pixel {
3496 my ($coord, $size, $max) = @_;
3497
3498 $coord =
3499 $coord eq "center" ? ($max - $size) * 0.5
3500 : $coord eq "max" ? $max
3501 : $coord;
3502
3503 $coord = 0 if $coord < 0;
3504 $coord = $max - $size if $coord > $max - $size;
3505
3506 int $coord + 0.5
3507}
3508
3509sub size_allocate {
2516 my ($self, $x, $y, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
2517 3511
2518 $self->SUPER::configure ($x, $y, $w, $h);
2519
2520 for my $child (@{$self->{children}}) { 3512 for my $child ($self->children) {
2521 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)};
2522 3514
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3515 $X = $child->{force_x} if exists $child->{force_x};
2524 $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
2525 $child->configure ($X, $Y, $W,$H); 3521 $child->configure ($X, $Y, $W, $H);
2526 } 3522 }
2527} 3523}
2528 3524
2529sub _topleft { 3525sub coord2local {
2530 my ($self, $x, $y) = @_; 3526 my ($self, $x, $y) = @_;
2531 3527
2532 ($x, $y) 3528 ($x, $y)
2533} 3529}
2534 3530
3531sub coord2global {
3532 my ($self, $x, $y) = @_;
3533
3534 ($x, $y)
3535}
3536
2535sub update { 3537sub update {
2536 my ($self) = @_; 3538 my ($self) = @_;
2537 3539
2538 $self->check_size; 3540 $::WANT_REFRESH++;
2539 ::refresh ();
2540} 3541}
2541 3542
2542sub add { 3543sub add {
2543 my ($self, $child) = @_; 3544 my ($self, @children) = @_;
2544 3545
2545 # integerize window positions 3546 $_->{is_toplevel} = 1
2546 $child->{x} = int $child->{x}; 3547 for @children;
2547 $child->{y} = int $child->{y};
2548 3548
2549 $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 }
2550} 3565}
2551 3566
2552sub on_refresh { 3567sub on_refresh {
2553 my ($self, $id, $cb) = @_; 3568 my ($self, $id, $cb) = @_;
2554 3569
2555 $self->{refresh_hook}{$id} = $cb; 3570 $self->{refresh_hook}{$id} = $cb;
2556} 3571}
2557 3572
3573sub on_post_alloc {
3574 my ($self, $id, $cb) = @_;
3575
3576 $self->{post_alloc_hook}{$id} = $cb;
3577}
3578
2558sub draw { 3579sub draw {
2559 my ($self) = @_; 3580 my ($self) = @_;
2560 3581
2561 while (my $rcb = delete $self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 3583 $_->()
3584 for values %{delete $self->{refresh_hook}};
2563 } 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
2564 3675
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
2568 3679
2569 glMatrixMode GL_PROJECTION; 3680 glMatrixMode GL_PROJECTION;
2570 glLoadIdentity; 3681 glLoadIdentity;
2571 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
2573 glLoadIdentity; 3684 glLoadIdentity;
2574 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
2575 $self->_draw; 3693 $self->_draw;
2576} 3694}
2577 3695
2578############################################################################# 3696#############################################################################
2579 3697
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 }
2682}
2683
2684
2685#############################################################################
2686
2687package CFClient::UI; 3698package CFClient::UI;
2688 3699
2689$ROOT = new CFClient::UI::Root; 3700$ROOT = new CFClient::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 3701$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2691 3702
26921 37031
2693 3704

Diff Legend

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