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.288 by root, Mon Jun 5 21:14:40 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 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc;
536 $self->update;
537}
538
539# using global variables seems a bit hacky, but passing through all drawing
540# functions seems pointless.
541our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
365 542
366sub draw { 543sub draw {
367 my ($self) = @_; 544 my ($self) = @_;
368 545
369 return unless $self->{h} && $self->{w}; 546 return unless $self->{h} && $self->{w};
547
548 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553
554 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
370 557
371 glPushMatrix; 558 glPushMatrix;
372 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
373 $self->_draw;
374 glPopMatrix;
375 560
376 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
377 my ($x, $y) = @$self{qw(x y)};
378
379 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
380 glEnable GL_BLEND; 563 glEnable GL_BLEND;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
382 glBegin GL_QUADS; 565 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; 566 glVertex 0 , 0;
397 glVertex $self->{w}, 0; 567 glVertex $self->{w}, 0;
398 glVertex $self->{w}, $self->{h}; 568 glVertex $self->{w}, $self->{h};
399 glVertex 0 , $self->{h}; 569 glVertex 0 , $self->{h};
400 glEnd; 570 glEnd;
571 glDisable GL_BLEND;
572 }
573
574 if ($ENV{CFPLUS_DEBUG} & 1) {
575 glPushMatrix;
576 glColor 1, 1, 0, 1;
577 glTranslate 0.375, 0.375;
578 glBegin GL_LINE_LOOP;
579 glVertex 0 , 0;
580 glVertex $self->{w} - 1, 0;
581 glVertex $self->{w} - 1, $self->{h} - 1;
582 glVertex 0 , $self->{h} - 1;
583 glEnd;
401 glPopMatrix; 584 glPopMatrix;
402 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
403 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
404} 590}
405 591
406sub _draw { 592sub _draw {
407 my ($self) = @_; 593 my ($self) = @_;
408 594
409 warn "no draw defined for $self\n"; 595 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} 596}
459 597
460sub DESTROY { 598sub DESTROY {
461 my ($self) = @_; 599 my ($self) = @_;
462 600
… …
494 632
495 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
496 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
497 635
498 glEnable GL_BLEND; 636 glEnable GL_BLEND;
499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
500 glColor @$color; 638 glColor_premultiply @$color;
501 639
502 glBegin GL_QUADS; 640 glBegin GL_QUADS;
503 glVertex 0 , 0; 641 glVertex 0 , 0;
504 glVertex 0 , $h; 642 glVertex 0 , $h;
505 glVertex $w, $h; 643 glVertex $w, $h;
… …
520 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
521 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
522} 660}
523 661
524sub size_request { 662sub size_request {
525 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
526} 666}
527 667
528sub draw { } 668sub draw { }
529 669
530############################################################################# 670#############################################################################
… …
534our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
535 675
536sub new { 676sub new {
537 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
538 678
539 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
540 680
541 my $self = $class->SUPER::new ( 681 my $self = $class->SUPER::new (
542 children => [], 682 children => [],
543 can_events => 0, 683 can_events => 0,
544 %arg, 684 %arg,
545 ); 685 );
686
546 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
547 689
548 $self 690 $self
549} 691}
550 692
551sub add { 693sub add {
… …
559 $self->{children} = [ 701 $self->{children} = [
560 sort { $a->{z} <=> $b->{z} } 702 sort { $a->{z} <=> $b->{z} }
561 @{$self->{children}}, @widgets 703 @{$self->{children}}, @widgets
562 ]; 704 ];
563 705
564 $self->check_size (1); 706 $self->realloc;
565 $self->update;
566} 707}
567 708
568sub children { 709sub children {
569 @{ $_[0]{children} } 710 @{ $_[0]{children} }
570} 711}
… …
575 delete $child->{parent}; 716 delete $child->{parent};
576 $child->hide; 717 $child->hide;
577 718
578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 719 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579 720
580 $self->check_size; 721 $self->realloc;
581 $self->update;
582} 722}
583 723
584sub clear { 724sub clear {
585 my ($self) = @_; 725 my ($self) = @_;
586 726
… …
590 for (@$children) { 730 for (@$children) {
591 delete $_->{parent}; 731 delete $_->{parent};
592 $_->hide; 732 $_->hide;
593 } 733 }
594 734
595 $self->check_size; 735 $self->realloc;
596 $self->update;
597} 736}
598 737
599sub find_widget { 738sub find_widget {
600 my ($self, $x, $y) = @_; 739 my ($self, $x, $y) = @_;
601 740
602 $x -= $self->{x}; 741 $x -= $self->{x};
603 $y -= $self->{y}; 742 $y -= $self->{y};
604 743
605 my $res; 744 my $res;
606 745
607 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
608 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
609 and return $res; 748 and return $res;
610 } 749 }
611 750
612 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
661 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
662} 801}
663 802
664############################################################################# 803#############################################################################
665 804
805# back-buffered drawing area
806
666package CFClient::UI::Window; 807package CFClient::UI::Window;
667 808
668our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
669 810
670use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
688 $self->SUPER::size_allocate ($w, $h); 829 $self->SUPER::size_allocate ($w, $h);
689 $self->update; 830 $self->update;
690} 831}
691 832
692sub _render { 833sub _render {
834 my ($self) = @_;
835
693 $_[0]{children}[0]->draw; 836 $self->{children}[0]->draw;
694} 837}
695 838
696sub render_child { 839sub render_child {
697 my ($self) = @_; 840 my ($self) = @_;
698 841
699 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
700 glClearColor 0, 0, 0, 0; 843 glClearColor 0, 0, 0, 0;
701 glClear GL_COLOR_BUFFER_BIT; 844 glClear GL_COLOR_BUFFER_BIT;
702 845
846 {
847 package CFClient::UI::Base;
848
849 ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h});
851 }
852
703 $self->_render; 853 $self->_render;
704 }; 854 };
705} 855}
706 856
707sub _draw { 857sub _draw {
708 my ($self) = @_; 858 my ($self) = @_;
709 859
710 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
711 861
712 my $tex = $self->{texture} 862 my $tex = $self->{texture}
713 or return; 863 or return;
714 864
715 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
717 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
718 868
719 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
720 870
721 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
722} 872}
… …
725 875
726package CFClient::UI::ViewPort; 876package CFClient::UI::ViewPort;
727 877
728our @ISA = CFClient::UI::Window::; 878our @ISA = CFClient::UI::Window::;
729 879
880sub new {
881 my $class = shift;
882
883 $class->SUPER::new (
884 scroll_x => 0,
885 scroll_y => 1,
886 @_,
887 )
888}
889
730sub size_request { 890sub size_request {
731 my ($self) = @_; 891 my ($self) = @_;
732 892
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 893 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 894
736 @$self{qw(child_w child_h)} 895 $w = 10 if $self->{scroll_x};
896 $h = 10 if $self->{scroll_y};
897
898 ($w, $h)
737} 899}
738 900
739sub size_allocate { 901sub size_allocate {
740 my ($self, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
741 903
904 my $child = $self->child;
905
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908
909 $self->child->configure (0, 0, $w, $h);
742 $self->update; 910 $self->update;
743} 911}
744 912
745sub set_offset { 913sub set_offset {
746 my ($self, $x, $y) = @_; 914 my ($self, $x, $y) = @_;
… …
780} 948}
781 949
782sub _render { 950sub _render {
783 my ($self) = @_; 951 my ($self) = @_;
784 952
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
954 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
955
785 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
786 957
787 $self->SUPER::_render; 958 $self->SUPER::_render;
788} 959}
789 960
… …
792package CFClient::UI::ScrolledWindow; 963package CFClient::UI::ScrolledWindow;
793 964
794our @ISA = CFClient::UI::HBox::; 965our @ISA = CFClient::UI::HBox::;
795 966
796sub new { 967sub new {
797 my $class = shift; 968 my ($class, %arg) = @_;
969
970 my $child = delete $arg{child};
798 971
799 my $self; 972 my $self;
800 973
801 my $slider = new CFClient::UI::Slider 974 my $slider = new CFClient::UI::Slider
802 vertical => 1, 975 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 976 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 977 on_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 978 $self->{vp}->set_offset (0, $_[1]);
806 }, 979 },
807 ; 980 ;
808 981
809 $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 983 vp => (new CFClient::UI::ViewPort expand => 1),
811 slider => $slider, 984 slider => $slider,
812 @_, 985 %arg,
813 ); 986 );
814 987
815 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
818 990
819 $self 991 $self
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->{vp}->add ($self->{child} = $widget);
998}
999
1000sub update {
1001 my ($self) = @_;
1002
1003 $self->SUPER::update;
1004
1005 # todo: overwrite size_allocate of child
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1008}
1009
1010sub size_allocate {
1011 my ($self, $w, $h) = @_;
1012
1013 $self->SUPER::size_allocate ($w, $h);
1014
1015 my $child = $self->{vp}->child;
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
820} 1017}
821 1018
822#TODO# update range on size_allocate depending on child 1019#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 1020# update viewport offset on scroll
824 1021
… …
844 1041
845 if ($self->{bg}) { 1042 if ($self->{bg}) {
846 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
847 1044
848 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
849 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
850 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
851 1048
852 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
853 glVertex 0 , 0; 1050 glVertex 0 , 0;
854 glVertex 0 , $h; 1051 glVertex 0 , $h;
855 glVertex $w, $h; 1052 glVertex $w, $h;
… …
868 1065
869our @ISA = CFClient::UI::Bin::; 1066our @ISA = CFClient::UI::Bin::;
870 1067
871use CFClient::OpenGL; 1068use CFClient::OpenGL;
872 1069
873my @tex = 1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
874 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1075 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); 1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
876 1077
877sub new { 1078sub new {
878 my $class = shift; 1079 my ($class, %arg) = @_;
879 1080
880 # TODO: user_x, user_y, overwrite moveto? 1081 my $title = delete $arg{title};
881 1082
882 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
885 border => 0.6, 1086 border => 0.6,
886 toplevel => 1,
887 can_events => 1, 1087 can_events => 1,
888 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
889 ); 1091 );
890 1092
891 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
892 align => 0, 1094 align => 0,
893 valign => 1, 1095 valign => 1,
894 text => $self->{title}, 1096 text => $title,
895 fontsize => $self->{border}; 1097 fontsize => $self->{border}
1098 if defined $title;
896 1099
897 $self 1100 $self
1101}
1102
1103sub add {
1104 my ($self, @widgets) = @_;
1105
1106 $self->SUPER::add (@widgets);
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
898} 1108}
899 1109
900sub border { 1110sub border {
901 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
902} 1112}
903 1113
904sub size_request { 1114sub size_request {
905 my ($self) = @_; 1115 my ($self) = @_;
1116
1117 $self->{title}->size_request
1118 if $self->{title};
906 1119
907 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
908 1121
909 ( 1122 (
910 $w + $self->border * 2, 1123 $w + $self->border * 2,
… …
913} 1126}
914 1127
915sub size_allocate { 1128sub size_allocate {
916 my ($self, $w, $h) = @_; 1129 my ($self, $w, $h) = @_;
917 1130
1131 if ($self->{title}) {
1132 $self->{title}{w} = $w;
1133 $self->{title}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h);
1135 }
1136
1137 my $border = $self->border;
1138
918 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
919 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
920 1141
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); 1142 $self->child->configure ($border, $border, $w, $h);
925} 1143}
926 1144
927sub button_down { 1145sub button_down {
928 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
929 1147
… …
945 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
946 1164
947 my $dx = $ev->{x} - $ox; 1165 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
949 1167
950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1170
952 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
953 $self->check_size; 1172 $self->realloc;
954 }; 1173 };
955 1174
956 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
957 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
958 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
… …
960 $self->{motion} = sub { 1179 $self->{motion} = sub {
961 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
962 1181
963 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
964 1183
965 $self->move ($bx + $x - $ox, $by + $y - $oy); 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
966 $self->update; 1185 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
967 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
968 } 1192 1
969} 1193}
970 1194
971sub button_up { 1195sub button_up {
972 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
973 1197
974 delete $self->{motion}; 1198 !!delete $self->{motion}
975} 1199}
976 1200
977sub mouse_motion { 1201sub mouse_motion {
978 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
979 1203
980 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
981} 1207}
982 1208
983sub _draw { 1209sub _draw {
984 my ($self) = @_; 1210 my ($self) = @_;
985 1211
1212 my $child = $self->{children}[0];
1213
986 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
987 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
988 1216
989 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991 1219
992 my $border = $self->border; 1220 my $border = $self->border;
993 1221
994 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
995 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
999 1227
1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1001 my $bg = $tex[0]; 1229 glColor @{ $self->{bg} };
1002 1230
1003 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
1232 # solve this better(?)
1004 my $rep_x = $cw / $bg->{w}; 1233 $bg->{s} = $cw / $bg->{w};
1005 my $rep_y = $ch / $bg->{h}; 1234 $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); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 } 1236 }
1014 1237
1015 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
1016 1239
1017 $self->{title}->draw if $self->{title};
1018
1019 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
1020} 1246}
1021 1247
1022############################################################################# 1248#############################################################################
1023 1249
1024package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
1032sub new { 1258sub new {
1033 my $class = shift; 1259 my $class = shift;
1034 1260
1035 $class->SUPER::new ( 1261 $class->SUPER::new (
1036 col_expand => [], 1262 col_expand => [],
1037 @_ 1263 @_,
1038 ) 1264 )
1265}
1266
1267sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1269}
1040 1270
1041sub add { 1271sub add {
1042 my ($self, $x, $y, $child) = @_; 1272 my ($self, $x, $y, $child) = @_;
1043 1273
1044 $child->set_parent ($self); 1274 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1275 $self->{children}[$y][$x] = $child;
1046 1276
1047 $child->check_size; 1277 $self->realloc;
1048} 1278}
1049 1279
1050sub children {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1052}
1053
1054# TODO: move to container class maybe? send childs a signal on removal? 1280# TODO: move to container class maybe? send children a signal on removal?
1055sub clear { 1281sub clear {
1056 my ($self) = @_; 1282 my ($self) = @_;
1057 1283
1058 my @children = $self->children; 1284 my @children = $self->children;
1059 delete $self->{children}; 1285 delete $self->{children};
… …
1061 for (@children) { 1287 for (@children) {
1062 delete $_->{parent}; 1288 delete $_->{parent};
1063 $_->hide; 1289 $_->hide;
1064 } 1290 }
1065 1291
1066 $self->update; 1292 $self->realloc;
1067} 1293}
1068 1294
1069sub get_wh { 1295sub get_wh {
1070 my ($self) = @_; 1296 my ($self) = @_;
1071 1297
… …
1102sub size_allocate { 1328sub size_allocate {
1103 my ($self, $w, $h) = @_; 1329 my ($self, $w, $h) = @_;
1104 1330
1105 my ($ws, $hs) = $self->get_wh; 1331 my ($ws, $hs) = $self->get_wh;
1106 1332
1107 my $req_w = sum @$ws; 1333 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1334 my $req_h = (sum @$hs) || 1;
1109 1335
1110 # TODO: nicer code && do row_expand 1336 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1337 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1338 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1339 my $col_expand = (sum @col_expand) || 1;
… …
1167 } 1393 }
1168} 1394}
1169 1395
1170############################################################################# 1396#############################################################################
1171 1397
1172package CFClient::UI::HBox; 1398package CFClient::UI::Box;
1173
1174# TODO: wrap into common Box base class
1175 1399
1176our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Container::;
1177 1401
1178sub size_request { 1402sub size_request {
1179 my ($self) = @_; 1403 my ($self) = @_;
1180 1404
1181 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $self->{vertical}
1182 1406 ? (
1183 ( 1407 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1184 (List::Util::sum map $_->[0], @alloc), 1408 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1185 (List::Util::max map $_->[1], @alloc), 1409 )
1186 ) 1410 : (
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 )
1187} 1414}
1188 1415
1189sub size_allocate { 1416sub size_allocate {
1190 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1191 1418
1192 ($h, $w) = ($w, $h); 1419 my $space = $self->{vertical} ? $h : $w;
1193
1194 my $children = $self->{children}; 1420 my $children = $self->{children};
1195 1421
1196 my @h = map $_->{req_w}, @$children; 1422 my @req;
1197 1423
1198 my $req_h = List::Util::sum @h; 1424 if ($self->{homogeneous}) {
1199 1425 @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 { 1426 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1428 my $req = List::Util::sum @req;
1429
1430 if ($req > $space) {
1431 # ah well, not enough space
1432 $_ *= $space / $req for @req;
1433 } else {
1204 my $exp = List::Util::sum map $_->{expand}, @$children; 1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1205 $exp ||= 1;
1206 1435
1436 $space = ($space - $req) / $expand; # remaining space to give away
1437
1438 $req[$_] += $space * $children->[$_]{expand}
1207 for (0 .. $#$children) { 1439 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 } 1440 }
1214 } 1441 }
1215 1442
1216 CFClient::UI::harmonize \@h; 1443 CFClient::UI::harmonize \@req;
1217 1444
1218 my $y = 0; 1445 my $pos = 0;
1219 for (0 .. $#$children) { 1446 for (0 .. $#$children) {
1220 my $child = $children->[$_];
1221 my $h = $h[$_]; 1447 my $alloc = $req[$_];
1222 $child->configure ($y, 0, $h, $w); 1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1223 1449
1224 $y += $h; 1450 $pos += $alloc;
1225 } 1451 }
1226 1452
1227 1 1453 1
1228} 1454}
1229 1455
1230############################################################################# 1456#############################################################################
1231 1457
1458package CFClient::UI::HBox;
1459
1460our @ISA = CFClient::UI::Box::;
1461
1462sub new {
1463 my $class = shift;
1464
1465 $class->SUPER::new (
1466 vertical => 0,
1467 @_,
1468 )
1469}
1470
1471#############################################################################
1472
1232package CFClient::UI::VBox; 1473package CFClient::UI::VBox;
1233 1474
1234# TODO: wrap into common Box base class
1235
1236our @ISA = CFClient::UI::Container::; 1475our @ISA = CFClient::UI::Box::;
1237 1476
1238sub size_request { 1477sub new {
1239 my ($self) = @_; 1478 my $class = shift;
1240 1479
1241 my @alloc = map [$_->size_request], @{$self->{children}}; 1480 $class->SUPER::new (
1242 1481 vertical => 1,
1243 ( 1482 @_,
1244 (List::Util::max map $_->[0], @alloc),
1245 (List::Util::sum map $_->[1], @alloc),
1246 ) 1483 )
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} 1484}
1287 1485
1288############################################################################# 1486#############################################################################
1289 1487
1290package CFClient::UI::Label; 1488package CFClient::UI::Label;
… …
1307 ellipsise => 3, # end 1505 ellipsise => 3, # end
1308 layout => (new CFClient::Layout), 1506 layout => (new CFClient::Layout),
1309 fontsize => 1, 1507 fontsize => 1,
1310 align => -1, 1508 align => -1,
1311 valign => -1, 1509 valign => -1,
1312 padding => 2, 1510 padding_x => 2,
1511 padding_y => 2,
1313 can_events => 0, 1512 can_events => 0,
1314 %arg 1513 %arg
1315 ); 1514 );
1316 1515
1317 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
… …
1344 1543
1345 delete $self->{texture}; 1544 delete $self->{texture};
1346 $self->SUPER::update; 1545 $self->SUPER::update;
1347} 1546}
1348 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1349sub set_text { 1555sub set_text {
1350 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1351 1557
1352 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1353 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1354 1560
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1357 1563
1564 delete $self->{req_h};
1565 $self->realloc;
1358 $self->update; 1566 $self->update;
1359 $self->check_size;
1360} 1567}
1361 1568
1362sub set_markup { 1569sub set_markup {
1363 my ($self, $markup) = @_; 1570 my ($self, $markup) = @_;
1364 1571
… …
1368 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369 1576
1370 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1371 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1372 1579
1580 delete $self->{req_h};
1581 $self->realloc;
1373 $self->update; 1582 $self->update;
1374 $self->check_size;
1375} 1583}
1376 1584
1377sub size_request { 1585sub size_request {
1378 my ($self) = @_; 1586 my ($self) = @_;
1379 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1380 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1381 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1382 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1383 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1596
1386 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1387 1598
1388 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1389 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1390 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1391 1602
1392 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1393 1604
1394 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1395 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1396 } 1607 }
1397 1608
1609 ($w, $h)
1398 ( 1610 }
1399 $w + $self->{padding} * 2,
1400 $h + $self->{padding} * 2,
1401 )
1402} 1611}
1403 1612
1404sub size_allocate { 1613sub size_allocate {
1405 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1406 1615
1616 delete $self->{ox};
1617
1407 delete $self->{texture}; 1618 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1408} 1620}
1409 1621
1410sub set_fontsize { 1622sub set_fontsize {
1411 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1412 1624
1413 $self->{fontsize} = $fontsize; 1625 $self->{fontsize} = $fontsize;
1414 delete $self->{texture}; 1626 delete $self->{texture};
1415 1627
1416 $self->update; 1628 $self->realloc;
1417 $self->check_size;
1418} 1629}
1419 1630
1420sub _draw { 1631sub _draw {
1421 my ($self) = @_; 1632 my ($self) = @_;
1422 1633
… …
1428 $self->{layout}->set_width ($self->{w}); 1639 $self->{layout}->set_width ($self->{w});
1429 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1640 $self->{layout}->set_ellipsise ($self->{ellipsise});
1430 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432 1643
1433 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1644 new_from_layout CFClient::Texture $self->{layout}
1645 };
1434 1646
1647 unless (exists $self->{ox}) {
1435 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1436 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1437 : ($self->{w} - $tex->{w}) * 0.5); 1650 : ($self->{w} - $tex->{w}) * 0.5);
1438 1651
1439 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1440 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1441 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1442
1443 $tex
1444 }; 1655 };
1445 1656
1446 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1448 1658
1449 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1450 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1451 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1452 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1453 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1454 } 1666 }
1455 1667
1456 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1457} 1669}
… …
1474 active_fg => [0, 0, 0], 1686 active_fg => [0, 0, 0],
1475 can_hover => 1, 1687 can_hover => 1,
1476 can_focus => 1, 1688 can_focus => 1,
1477 valign => 0, 1689 valign => 0,
1478 can_events => 1, 1690 can_events => 1,
1691 #text => ...
1479 @_ 1692 @_
1480 ) 1693 )
1481} 1694}
1482 1695
1483sub _set_text { 1696sub _set_text {
… …
1485 1698
1486 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1487 1700
1488 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1489 1702
1490 delete $self->{texture};
1491
1492 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1493 $self->{text} = $text; 1704 $self->{text} = $text;
1494 1705
1495 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1497 1709
1498 $self->emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1499} 1714}
1500 1715
1501sub set_text { 1716sub set_text {
1502 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1503 1718
1504 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1505 $self->_set_text ($text); 1720 $self->_set_text ($text);
1506 $self->update;
1507 $self->check_size;
1508} 1721}
1509 1722
1510sub get_text { 1723sub get_text {
1511 $_[0]{text} 1724 $_[0]{text}
1512} 1725}
… …
1515 my ($self) = @_; 1728 my ($self) = @_;
1516 1729
1517 my ($w, $h) = $self->SUPER::size_request; 1730 my ($w, $h) = $self->SUPER::size_request;
1518 1731
1519 ($w + 1, $h) # add 1 for cursor 1732 ($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} 1733}
1527 1734
1528sub key_down { 1735sub key_down {
1529 my ($self, $ev) = @_; 1736 my ($self, $ev) = @_;
1530 1737
… …
1545 } elsif ($sym == CFClient::SDLK_HOME) { 1752 } elsif ($sym == CFClient::SDLK_HOME) {
1546 $self->{cursor} = 0; 1753 $self->{cursor} = 0;
1547 } elsif ($sym == CFClient::SDLK_END) { 1754 } elsif ($sym == CFClient::SDLK_END) {
1548 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1756 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1757 $self->_emit ('escape');
1551 } elsif ($uni) { 1758 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1553 } 1762 }
1554 1763
1555 $self->_set_text ($text); 1764 $self->_set_text ($text);
1556 $self->update; 1765
1557 $self->check_size; 1766 $self->realloc;
1767
1768 1
1558} 1769}
1559 1770
1560sub focus_in { 1771sub focus_in {
1561 my ($self) = @_; 1772 my ($self) = @_;
1562 1773
… …
1577 utf8::encode $text; 1788 utf8::encode $text;
1578 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1579 1790
1580 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1581 $self->update; 1792 $self->update;
1793
1794 1
1582} 1795}
1583 1796
1584sub mouse_motion { 1797sub mouse_motion {
1585 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1586# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800
1801 0
1587} 1802}
1588 1803
1589sub _draw { 1804sub _draw {
1590 my ($self) = @_; 1805 my ($self) = @_;
1591 1806
1592 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1593 1808
1594 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1595 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1596 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1597 } else { 1812 } else {
1598 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1599 } 1814 }
1600 1815
1601 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1603 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1604 glVertex 0 , 0; 1819 glVertex 0 , 0;
1605 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1606 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1607 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1642 if ($sym == 13) { 1857 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1858 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1859 my $txt = $self->get_text;
1645 $self->{history_pointer} = -1; 1860 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1861 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1862 $self->_emit (activate => $txt);
1648 $self->update; 1863 $self->update;
1649 1864
1650 } elsif ($sym == CFClient::SDLK_UP) { 1865 } elsif ($sym == CFClient::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) { 1866 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text; 1867 $self->{history_saveback} = $self->get_text;
… …
1668 } else { 1883 } else {
1669 $self->set_text ($self->{history_saveback}); 1884 $self->set_text ($self->{history_saveback});
1670 } 1885 }
1671 1886
1672 } else { 1887 } else {
1673 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1674 } 1891 1
1675
1676} 1892}
1677 1893
1678############################################################################# 1894#############################################################################
1679 1895
1680package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1689 1905
1690sub new { 1906sub new {
1691 my $class = shift; 1907 my $class = shift;
1692 1908
1693 $class->SUPER::new ( 1909 $class->SUPER::new (
1694 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1695 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1696 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1697 can_hover => 1, 1914 can_hover => 1,
1698 align => 0, 1915 align => 0,
1699 valign => 0, 1916 valign => 0,
1700 can_events => 1, 1917 can_events => 1,
1701 @_ 1918 @_
1702 ) 1919 )
1703} 1920}
1704 1921
1922sub activate { }
1923
1705sub button_up { 1924sub button_up {
1706 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1707 1926
1927 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1929 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate"); 1930
1711 } 1931 1
1712} 1932}
1713 1933
1714sub _draw { 1934sub _draw {
1715 my ($self) = @_; 1935 my ($self) = @_;
1716 1936
1717 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1718
1719 if ($GRAB == $self) {
1720 $self->{fg} = $self->{active_fg};
1721 }
1722 1938
1723 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1725 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1726 1942
… …
1745 1961
1746sub new { 1962sub new {
1747 my $class = shift; 1963 my $class = shift;
1748 1964
1749 $class->SUPER::new ( 1965 $class->SUPER::new (
1750 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1751 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1752 active_fg => [1, 1, 0], 1969 active_fg => [1, 1, 0],
1753 bg => [0, 0, 0, 0.2], 1970 bg => [0, 0, 0, 0.2],
1754 active_bg => [1, 1, 1, 0.5], 1971 active_bg => [1, 1, 1, 0.5],
1755 state => 0, 1972 state => 0,
… …
1759} 1976}
1760 1977
1761sub size_request { 1978sub size_request {
1762 my ($self) = @_; 1979 my ($self) = @_;
1763 1980
1764 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1765} 1982}
1766 1983
1767sub button_down { 1984sub button_down {
1768 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1769 1986
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1772 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1774 } 1995 1
1775} 1996}
1776 1997
1777sub _draw { 1998sub _draw {
1778 my ($self) = @_; 1999 my ($self) = @_;
1779 2000
1780 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1781 2002
1782 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1783 2004
1784 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2005 my ($w, $h) = @$self{qw(w h)};
2006
2007 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1785 2008
1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787 2010
1788 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789 2012
… …
1944 2167
1945 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
1946 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
1947 2170
1948 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
1949 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1950 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
1951 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1952 2176
1953 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
1954 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2053 my $self = $class->SUPER::new ( 2277 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2279 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2280 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2281 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2282 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2283 min_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2284 min_h => $::WIDTH / 80,
2061 vertical => 0, 2285 vertical => 0,
2062 can_hover => 1, 2286 can_hover => 1,
2063 inner_pad => 0.02, 2287 inner_pad => 0.02,
2064 @_ 2288 @_
2065 ); 2289 );
… …
2068 $self->update; 2292 $self->update;
2069 2293
2070 $self 2294 $self
2071} 2295}
2072 2296
2297sub changed { }
2298
2299sub set_range {
2300 my ($self, $range) = @_;
2301
2302 ($range, $self->{range}) = ($self->{range}, $range);
2303
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}";
2306}
2307
2073sub set_value { 2308sub set_value {
2074 my ($self, $value) = @_; 2309 my ($self, $value) = @_;
2075 2310
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2311 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2312
2078 $hi = $lo + 1 if $hi <= $lo; 2313 $hi = $lo + 1 if $hi <= $lo;
2079 2314
2315 $page = $hi - $lo if $page > $hi - $lo;
2316
2080 $value = $lo if $value < $lo; 2317 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2318 $value = $hi - $page if $value > $hi - $page;
2082 2319
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2320 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2321 if $unit;
2085 2322
2086 $page = $hi - $lo if $page > $hi - $lo;
2087
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2324
2090 if ($value != $old_value) { 2325 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2326 $self->_emit (changed => $value);
2092 $self->update; 2327 $self->update;
2093 } 2328 }
2094} 2329}
2095 2330
2096sub size_request { 2331sub size_request {
2097 my ($self) = @_; 2332 my ($self) = @_;
2098 2333
2099 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
2100 my $h = $self->{req_h};
2101
2102 $self->{vertical} ? ($h, $w) : ($w, $h)
2103} 2335}
2104 2336
2105sub button_down { 2337sub button_down {
2106 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2107 2339
2108 $self->SUPER::button_down ($ev, $x, $y); 2340 $self->SUPER::button_down ($ev, $x, $y);
2341
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343
2109 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
2110} 2345}
2111 2346
2112sub mouse_motion { 2347sub mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2114 2349
2115 if ($GRAB == $self) { 2350 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2352
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2353 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2354
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2355 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2356
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2357 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2358 } else {
2359 return 0;
2360 }
2361
2123 } 2362 1
2124} 2363}
2125 2364
2126sub update { 2365sub update {
2127 my ($self) = @_; 2366 my ($self) = @_;
2128 2367
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2368 delete $self->{knob_w};
2369 $self->SUPER::update;
2370}
2371
2372sub _draw {
2373 my ($self) = @_;
2374
2375 unless ($self->{knob_w}) {
2130 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2131 2377
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2379 my $range = ($hi - $page - $lo) || 1e-100;
2133 2380
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2381 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2382
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2383 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2384 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2385
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2386 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2387 $value = $value * $self->{scale} + $self->{offset};
2140 2388
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; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2390 $self->{knob_w} = $knob_w;
2148 }); 2391 }
2149
2150 $self->SUPER::update;
2151}
2152
2153sub _draw {
2154 my ($self) = @_;
2155 2392
2156 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2157 2394
2158 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2159 2396
… …
2176 # draw handle 2413 # draw handle
2177 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2414 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2178 2415
2179 glDisable GL_TEXTURE_2D; 2416 glDisable GL_TEXTURE_2D;
2180} 2417}
2418
2419#############################################################################
2420
2421package CFClient::UI::ValSlider;
2422
2423our @ISA = CFClient::UI::HBox::;
2424
2425sub new {
2426 my ($class, %arg) = @_;
2427
2428 my $range = delete $arg{range};
2429
2430 my $self = $class->SUPER::new (
2431 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2432 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2433 to_value => sub { shift },
2434 from_value => sub { shift },
2435 %arg,
2436 );
2437
2438 $self->{slider}->connect (changed => sub {
2439 my ($self, $value) = @_;
2440 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2441 $self->{parent}->emit (changed => $value);
2442 });
2443
2444# $self->{entry}->connect (changed => sub {
2445# my ($self, $value) = @_;
2446# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2447# $self->{parent}->emit (changed => $value);
2448# });
2449
2450 $self->add ($self->{slider}, $self->{entry});
2451
2452 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2453
2454 $self
2455}
2456
2457sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) }
2181 2459
2182############################################################################# 2460#############################################################################
2183 2461
2184package CFClient::UI::TextView; 2462package CFClient::UI::TextView;
2185 2463
… …
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2505 $self->{layout}->set_width ($self->{children}[0]{w});
2228 2506
2229 $self->reflow; 2507 $self->reflow;
2230} 2508}
2231 2509
2232sub text_height { 2510sub text_size {
2233 my ($self, $text, $indent) = @_; 2511 my ($self, $text, $indent) = @_;
2234 2512
2235 my $layout = $self->{layout}; 2513 my $layout = $self->{layout};
2236 2514
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2516 $layout->set_width ($self->{children}[0]{w} - $indent);
2239 $layout->set_markup ($text); 2517 $layout->set_markup ($text);
2240 2518
2241 ($layout->size)[1] 2519 $layout->size
2242} 2520}
2243 2521
2244sub reflow { 2522sub reflow {
2245 my ($self) = @_; 2523 my ($self) = @_;
2246 2524
2247 $self->{need_reflow}++; 2525 $self->{need_reflow}++;
2248 $self->update; 2526 $self->update;
2249} 2527}
2250 2528
2529sub set_offset {
2530 my ($self, $offset) = @_;
2531
2532 # todo: base offset on lines or so, not on pixels
2533 $self->{children}[1]->set_value ($offset);
2534}
2535
2536sub clear {
2537 my ($self) = @_;
2538
2539 $self->{par} = [];
2540 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542}
2543
2251sub add_paragraph { 2544sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2545 my ($self, $color, $text, $indent) = @_;
2253 2546
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2547 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2548 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2549 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2551 }
2261 2552
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2553 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263 $self->{children}[1]->update;
2264} 2554}
2265 2555
2266sub update { 2556sub update {
2267 my ($self) = @_; 2557 my ($self) = @_;
2268 2558
… …
2271 return unless $self->{h} > 0; 2561 return unless $self->{h} > 0;
2272 2562
2273 delete $self->{texture}; 2563 delete $self->{texture};
2274 2564
2275 $ROOT->on_post_alloc ($self, sub { 2565 $ROOT->on_post_alloc ($self, sub {
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567
2276 if (delete $self->{need_reflow}) { 2568 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2569 my $height = 0;
2278 2570
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2571 my $layout = $self->{layout};
2572
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2280 for @{$self->{par}}; 2575 for (@{$self->{par}}) {
2576 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2577 $layout->set_width ($W - $_->[3]);
2578 $layout->set_markup ($_->[4]);
2579 my ($w, $h) = $layout->size;
2580 $_->[0] = $w + $_->[3];
2581 $_->[1] = $h;
2582 }
2583
2584 $height += $_->[1];
2585 }
2281 2586
2282 $self->{height} = $height; 2587 $self->{height} = $height;
2283 2588
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2589 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update;
2286 2590
2287 delete $self->{texture}; 2591 delete $self->{texture};
2288 } 2592 }
2289 2593
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2293 2597
2294 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2295 2599
2296 my $y0 = $top; 2600 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2601 my $y1 = $top + $H;
2298 2602
2299 my $y = 0; 2603 my $y = 0;
2300 2604
2301 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2302 2606
2303 $layout->set_font ($self->{font}) if $self->{font}; 2607 $layout->set_font ($self->{font}) if $self->{font};
2304 2608
2305 glEnable GL_BLEND; 2609 glEnable GL_BLEND;
2610 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2612
2308 for my $par (@{$self->{par}}) { 2613 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2614 my $h = $par->[1];
2310 2615
2311 if ($y0 < $y + $h && $y < $y1) { 2616 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2617 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2618 $layout->set_width ($W - $par->[3]);
2314 $layout->set_markup ($par->[3]); 2619 $layout->set_markup ($par->[4]);
2315 2620
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2621 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2622
2318 glRasterPos $par->[2], $y - $y0; 2623 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2624 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2625 }
2321 2626
2322 $y += $h; 2627 $y += $h;
2323 } 2628 }
… …
2330sub _draw { 2635sub _draw {
2331 my ($self) = @_; 2636 my ($self) = @_;
2332 2637
2333 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2336 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2338 2643
2339 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2340 2645
2341} 2646}
… …
2390 2695
2391sub new { 2696sub new {
2392 my $class = shift; 2697 my $class = shift;
2393 2698
2394 my $self = $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2395 state => 0, 2700 state => 0,
2396 connect_activate => \&toggle_flopper, 2701 on_activate => \&toggle_flopper,
2397 @_ 2702 @_
2398 ); 2703 );
2399 2704
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2705 $self
2406} 2706}
2407 2707
2408sub toggle_flopper { 2708sub toggle_flopper {
2409 my ($self) = @_; 2709 my ($self) = @_;
2410 2710
2411 # TODO: use animation 2711 $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} 2712}
2423 2713
2424############################################################################# 2714#############################################################################
2425 2715
2426package CFClient::UI::Tooltip; 2716package CFClient::UI::Tooltip;
… …
2439} 2729}
2440 2730
2441sub set_tooltip_from { 2731sub set_tooltip_from {
2442 my ($self, $widget) = @_; 2732 my ($self, $widget) = @_;
2443 2733
2734 my $tooltip = $widget->{tooltip};
2735
2736 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}";
2741 }
2742
2444 $self->add (new CFClient::UI::Label 2743 $self->add (new CFClient::UI::Label
2445 markup => $widget->{tooltip}, 2744 markup => $tooltip,
2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447 fontsize => 0.8, 2746 fontsize => 0.8,
2448 fg => [0, 0, 0, 1], 2747 fg => [0, 0, 0, 1],
2449 ellipsise => 0, 2748 ellipsise => 0,
2450 font => ($widget->{tooltip_font} || $::FONT_PROP), 2749 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2461 2760
2462sub size_allocate { 2761sub size_allocate {
2463 my ($self, $w, $h) = @_; 2762 my ($self, $w, $h) = @_;
2464 2763
2465 $self->SUPER::size_allocate ($w - 4, $h - 4); 2764 $self->SUPER::size_allocate ($w - 4, $h - 4);
2765}
2766
2767sub visibility_change {
2768 my ($self, $visible) = @_;
2769
2770 return unless $visible;
2771
2772 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner}
2774 or return;
2775
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH;
2780
2781 $self->move_abs ($x, $y);
2782 });
2466} 2783}
2467 2784
2468sub _draw { 2785sub _draw {
2469 my ($self) = @_; 2786 my ($self) = @_;
2470 2787
… …
2487 glVertex $w, $h; 2804 glVertex $w, $h;
2488 glVertex $w, 0; 2805 glVertex $w, 0;
2489 glEnd; 2806 glEnd;
2490 2807
2491 glTranslate 2 - 0.375, 2 - 0.375; 2808 glTranslate 2 - 0.375, 2 - 0.375;
2809
2492 $self->SUPER::_draw; 2810 $self->SUPER::_draw;
2493} 2811}
2494 2812
2495############################################################################# 2813#############################################################################
2496 2814
… …
2502 2820
2503sub new { 2821sub new {
2504 my $class = shift; 2822 my $class = shift;
2505 2823
2506 my $self = $class->SUPER::new ( 2824 my $self = $class->SUPER::new (
2507 aspect => 1, 2825 aspect => 1,
2826 can_events => 0,
2508 @_, 2827 @_,
2509 ); 2828 );
2510 2829
2511 if ($self->{anim} && $self->{animspeed}) { 2830 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2831 Scalar::Util::weaken (my $widget = $self);
… …
2527 2846
2528sub size_request { 2847sub size_request {
2529 (32, 8) 2848 (32, 8)
2530} 2849}
2531 2850
2851sub update {
2852 my ($self) = @_;
2853
2854 return unless $self->{visible};
2855
2856 $self->SUPER::update;
2857}
2858
2532sub _draw { 2859sub _draw {
2533 my ($self) = @_; 2860 my ($self) = @_;
2534 2861
2535 return unless $::CONN;#d# manage and cache textures differently 2862 return unless $::CONN;
2536 2863
2537 my $face; 2864 my $face;
2538 2865
2539 if ($self->{frame}) { 2866 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2867 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2546 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2547 2874
2548 if ($tex) { 2875 if ($tex) {
2549 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2551 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2552 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2553 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2554 } 2881 }
2555} 2882}
2556 2883
… …
2563 $self->SUPER::DESTROY; 2890 $self->SUPER::DESTROY;
2564} 2891}
2565 2892
2566############################################################################# 2893#############################################################################
2567 2894
2568package CFClient::UI::InventoryItem; 2895package CFClient::UI::Buttonbar;
2569 2896
2570our @ISA = CFClient::UI::HBox::; 2897our @ISA = CFClient::UI::HBox::;
2571 2898
2572sub _item_to_desc { 2899# 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 2900
2721############################################################################# 2901#############################################################################
2722 2902
2723package CFClient::UI::Menu; 2903package CFClient::UI::Menu;
2724 2904
… …
2758 2938
2759# popup given the event (must be a mouse button down event currently) 2939# popup given the event (must be a mouse button down event currently)
2760sub popup { 2940sub popup {
2761 my ($self, $ev) = @_; 2941 my ($self, $ev) = @_;
2762 2942
2763 $self->emit ("popdown"); 2943 $self->_emit ("popdown");
2764 2944
2765 # maybe save $GRAB? must be careful about events... 2945 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 2946 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 2947 $self->{button} = $ev->{button};
2768 2948
2769 $self->show; 2949 $self->show;
2770 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2771} 2951}
2772 2952
2773sub mouse_motion { 2953sub mouse_motion {
2774 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2775 2955
2776 # TODO: should use vbox->find_widget or so 2956 # TODO: should use vbox->find_widget or so
2777 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2778 $self->{hover} = $self->{item}{$HOVER}; 2958 $self->{hover} = $self->{item}{$HOVER};
2959
2960 0
2779} 2961}
2780 2962
2781sub button_up { 2963sub button_up {
2782 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2783 2965
2784 if ($ev->{button} == $self->{button}) { 2966 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 2967 undef $GRAB;
2786 $self->hide; 2968 $self->hide;
2787 2969
2788 $self->emit ("popdown"); 2970 $self->_emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 2971 $self->{hover}[1]->() if $self->{hover};
2972 } else {
2973 return 0
2974 }
2975
2790 } 2976 1
2791} 2977}
2792 2978
2793############################################################################# 2979#############################################################################
2794 2980
2795package CFClient::UI::Statusbox; 2981package CFClient::UI::Multiplexer;
2796 2982
2797our @ISA = CFClient::UI::VBox::; 2983our @ISA = CFClient::UI::Container::;
2798 2984
2799sub new { 2985sub new {
2800 my $class = shift; 2986 my $class = shift;
2801 2987
2802 $class->SUPER::new ( 2988 my $self = $class->SUPER::new (
2989 @_,
2990 );
2991
2992 $self->{current} = $self->{children}[0]
2993 if @{ $self->{children} };
2994
2995 $self
2996}
2997
2998sub add {
2999 my ($self, @widgets) = @_;
3000
3001 $self->SUPER::add (@widgets);
3002
3003 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} };
3005}
3006
3007sub set_current_page {
3008 my ($self, $page_or_widget) = @_;
3009
3010 my $widget = ref $page_or_widget
3011 ? $page_or_widget
3012 : $self->{children}[$page_or_widget];
3013
3014 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016
3017 $self->_emit (page_changed => $self->{current});
3018
3019 $self->realloc;
3020}
3021
3022sub visible_children {
3023 $_[0]{current}
3024}
3025
3026sub size_request {
3027 my ($self) = @_;
3028
3029 $self->{current}->size_request
3030}
3031
3032sub size_allocate {
3033 my ($self, $w, $h) = @_;
3034
3035 $self->{current}->configure (0, 0, $w, $h);
3036}
3037
3038sub _draw {
3039 my ($self) = @_;
3040
3041 $self->{current}->draw;
3042}
3043
3044#############################################################################
3045
3046package CFClient::UI::Notebook;
3047
3048our @ISA = CFClient::UI::VBox::;
3049
3050sub new {
3051 my $class = shift;
3052
3053 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self
3057 @_,
3058 );
3059
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3061 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3062
3063 $self
3064}
3065
3066sub add {
3067 my ($self, $title, $widget, $tooltip) = @_;
3068
3069 Scalar::Util::weaken $self;
3070
3071 $self->{buttonbar}->add (new CFClient::UI::Button
3072 markup => $title,
3073 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) },
3075 );
3076
3077 $self->{multiplexer}->add ($widget);
3078}
3079
3080sub set_current_page {
3081 my ($self, $page) = @_;
3082
3083 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current});
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::Statusbox;
3090
3091our @ISA = CFClient::UI::VBox::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (
2803 fontsize => 0.8, 3097 fontsize => 0.8,
2804 @_, 3098 @_,
2805 ) 3099 );
3100
3101 Scalar::Util::weaken (my $this = $self);
3102
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104
3105 $self
2806} 3106}
2807 3107
2808sub reorder { 3108sub reorder {
2809 my ($self) = @_; 3109 my ($self) = @_;
2810 my $NOW = time; 3110 my $NOW = Time::HiRes::time;
3111
3112 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} };
2811 3116
2812 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
2813 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2814 } 3119 }
2815 3120
… …
2818 my @items = sort { 3123 my @items = sort {
2819 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
2820 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
2821 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
2822 3127
3128 $self->{timer}->interval (1);
3129
2823 my $count = 10 + 1; 3130 my $count = 10 + 1;
2824 for my $item (@items) { 3131 for my $item (@items) {
2825 last unless --$count; 3132 last unless --$count;
2826 3133
2827 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
2828 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
2829 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
2830 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
2831 : $item->{text}; 3138 : $item->{text};
2832 3139
… …
2840 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
2841 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
2842 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
2843 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
2844 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
2845 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
2846 can_events => 1, 3153 can_events => 1,
2847 can_hover => 1 3154 can_hover => 1
2848 }; 3155 };
3156
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1;
3162 $self->{timer}->interval (1/30);
3163 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 }
3166
3167 push @widgets, $label;
2849 } 3168 }
2850 3169
2851 $self->clear; 3170 $self->clear;
2852 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
2853} 3172}
… …
2856 my ($self, $text, %arg) = @_; 3175 my ($self, $text, %arg) = @_;
2857 3176
2858 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
2860 3179
3180 return unless $text;
3181
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2862 3183
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 3185
2865 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
2866 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
2896 3217
2897 $self->reorder; 3218 $self->reorder;
2898 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
2899} 3220}
2900 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
2901############################################################################# 3230#############################################################################
2902 3231
2903package CFClient::UI::Root; 3232package CFClient::UI::Inventory;
2904 3233
2905our @ISA = CFClient::UI::Container::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
2906
2907use CFClient::OpenGL;
2908 3235
2909sub new { 3236sub new {
2910 my $class = shift; 3237 my $class = shift;
2911 3238
2912 $class->SUPER::new ( 3239 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3241 @_,
3242 );
3243
3244 $self
3245}
3246
3247sub set_items {
3248 my ($self, $items) = @_;
3249
3250 $self->{child}->clear;
3251 return unless $items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 binding => [],
3480 commands => [],
2913 @_, 3481 @_,
2914 ) 3482 )
2915} 3483}
2916 3484
2917sub configure { 3485# XXX: Do sorting? Argl...
2918 my ($self, $x, $y, $w, $h) = @_; 3486sub add_spell {
2919
2920 $self->{w} = $w;
2921 $self->{h} = $h;
2922}
2923
2924sub check_size {
2925 my ($self) = @_; 3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
2926 3489
2927 $self->size_allocate ($self->{w}, $self->{h}) 3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2928 if $self->{w}; 3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517}
3518
3519sub remove_spell {
3520 my ($self, $spell) = @_;
3521 delete $self->{spells}->{$spell->{name}};
3522 $self->rebuild_spell_list;
3523}
3524
3525#############################################################################
3526
3527package CFClient::UI::Root;
3528
3529our @ISA = CFClient::UI::Container::;
3530
3531use List::Util qw(min max);
3532
3533use CFClient::OpenGL;
3534
3535sub new {
3536 my $class = shift;
3537
3538 my $self = $class->SUPER::new (
3539 visible => 1,
3540 @_,
3541 );
3542
3543 Scalar::Util::weaken ($self->{root} = $self);
3544
3545 $self
2929} 3546}
2930 3547
2931sub size_request { 3548sub size_request {
2932 my ($self) = @_; 3549 my ($self) = @_;
2933 3550
2934 ($self->{w}, $self->{h}) 3551 ($self->{w}, $self->{h})
3552}
3553
3554sub _to_pixel {
3555 my ($coord, $size, $max) = @_;
3556
3557 $coord =
3558 $coord eq "center" ? ($max - $size) * 0.5
3559 : $coord eq "max" ? $max
3560 : $coord;
3561
3562 $coord = 0 if $coord < 0;
3563 $coord = $max - $size if $coord > $max - $size;
3564
3565 int $coord + 0.5
2935} 3566}
2936 3567
2937sub size_allocate { 3568sub size_allocate {
2938 my ($self, $w, $h) = @_; 3569 my ($self, $w, $h) = @_;
2939 3570
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) { 3571 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 3573
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3574 $X = $child->{force_x} if exists $child->{force_x};
2950 if exists $child->{req_x}; 3575 $Y = $child->{force_y} if exists $child->{force_y};
2951 3576
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3577 $X = _to_pixel $X, $W, $self->{w};
2953 if exists $child->{req_y}; 3578 $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 3579
2958 $child->configure ($X, $Y, $W, $H); 3580 $child->configure ($X, $Y, $W, $H);
2959 } 3581 }
2960} 3582}
2961 3583
… …
2972} 3594}
2973 3595
2974sub update { 3596sub update {
2975 my ($self) = @_; 3597 my ($self) = @_;
2976 3598
2977 $self->check_size;
2978 $::WANT_REFRESH++; 3599 $::WANT_REFRESH++;
2979} 3600}
2980 3601
2981sub add { 3602sub add {
2982 my ($self, @children) = @_; 3603 my ($self, @children) = @_;
2983 3604
2984 for my $child (@children) {
2985 $child->{toplevel} = 1; 3605 $_->{is_toplevel} = 1
2986 3606 for @children;
2987 # integerise window positions
2988 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y};
2990 }
2991 3607
2992 $self->SUPER::add (@children); 3608 $self->SUPER::add (@children);
3609}
3610
3611sub remove {
3612 my ($self, @children) = @_;
3613
3614 $self->SUPER::remove (@children);
3615
3616 delete $self->{is_toplevel}
3617 for @children;
3618
3619 while (@children) {
3620 my $w = pop @children;
3621 push @children, $w->children;
3622 $w->set_invisible;
3623 }
2993} 3624}
2994 3625
2995sub on_refresh { 3626sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3627 my ($self, $id, $cb) = @_;
2997 3628
… …
3010 while ($self->{refresh_hook}) { 3641 while ($self->{refresh_hook}) {
3011 $_->() 3642 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3643 for values %{delete $self->{refresh_hook}};
3013 } 3644 }
3014 3645
3015 if ($self->{check_size}) { 3646 if ($self->{realloc}) {
3016 my @queue = ([], []); 3647 my %queue;
3648 my @queue;
3649 my $widget;
3017 3650
3018 for (;;) { 3651 outer:
3019 if ($self->{check_size}) { 3652 while () {
3020 # heuristic: check containers last 3653 if (my $realloc = delete $self->{realloc}) {
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3654 for $widget (values %$realloc) {
3022 for values %{delete $self->{check_size}} 3655 $widget->{visible} or next; # do not resize invisible widgets
3656
3657 $queue{$widget+0}++ and next; # duplicates are common
3658
3659 push @{ $queue[$widget->{visible}] }, $widget;
3660 }
3023 } 3661 }
3024 3662
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3663 while () {
3664 @queue or last outer;
3026 3665
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3666 $widget = pop @{ $queue[-1] || [] }
3028 ? @$widget{qw(user_w user_h)} 3667 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 3668
3669 pop @queue;
3670 }
3671
3672 delete $queue{$widget+0};
3673
3674 my ($w, $h) = $widget->size_request;
3675
3676 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3677 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3678
3679 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3680 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3681
3682 $w = $widget->{force_w} if exists $widget->{force_w};
3683 $h = $widget->{force_h} if exists $widget->{force_h};
3684
3685 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3686 || delete $widget->{force_realloc}) {
3035 $widget->{req_w} = $w; 3687 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h; 3688 $widget->{req_h} = $h;
3037 3689
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3690 $self->{size_alloc}{$widget+0} = $widget;
3039 3691
3040 $widget->{parent}->check_size
3041 if $widget->{parent}; 3692 if (my $parent = $widget->{parent}) {
3693 $self->{realloc}{$parent+0} = $parent
3694 unless $queue{$parent+0};
3695
3696 $parent->{force_size_alloc} = 1;
3697 $self->{size_alloc}{$parent+0} = $parent;
3698 }
3042 } 3699 }
3700
3701 delete $self->{realloc}{$widget+0};
3043 } 3702 }
3044 } 3703 }
3045 3704
3046 while ($self->{size_alloc}) { 3705 while (my $size_alloc = delete $self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) { 3706 my @queue = sort { $b->{visible} <=> $a->{visible} }
3048 my ($widget, $w, $h) = @$_; 3707 values %$size_alloc;
3708
3709 while () {
3710 my $widget = pop @queue || last;
3711
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3049 3713
3050 $w = 0 if $w < 0; 3714 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3715 $h = 0 if $h < 0;
3052 3716
3717 $w = int $w + 0.5;
3718 $h = int $h + 0.5;
3719
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w};
3722 $widget->{old_h} = $widget->{h};
3723
3053 $widget->{w} = $w; 3724 $widget->{w} = $w;
3054 $widget->{h} = $h; 3725 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h); 3726
3056 $widget->emit (size_allocate => $w, $h); 3727 $widget->emit (size_allocate => $w, $h);
3728 }
3057 } 3729 }
3058 } 3730 }
3059 3731
3060 while ($self->{post_alloc_hook}) { 3732 while ($self->{post_alloc_hook}) {
3061 $_->() 3733 $_->()
3062 for values %{delete $self->{post_alloc_hook}}; 3734 for values %{delete $self->{post_alloc_hook}};
3063 } 3735 }
3736
3064 3737
3065 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3067 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
3068 3741
… …
3070 glLoadIdentity; 3743 glLoadIdentity;
3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3072 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
3073 glLoadIdentity; 3746 glLoadIdentity;
3074 3747
3748 {
3749 package CFClient::UI::Base;
3750
3751 ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h});
3753 }
3754
3075 $self->_draw; 3755 $self->_draw;
3076} 3756}
3077 3757
3078############################################################################# 3758#############################################################################
3079 3759

Diff Legend

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