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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.285 by root, Mon Jun 5 03:07:01 2006 UTC

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

Diff Legend

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