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.206 by root, Mon May 15 17:45:29 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

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

Diff Legend

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