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.222 by root, Mon May 22 03:59:51 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 {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub hide { 255sub set_visible {
217 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};
218 279
219 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
220 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
221 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
222 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
223 if $self->{parent}; 314 if $self->{parent};
224} 315}
225 316
226sub move { 317sub move_abs {
227 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
228 319
229 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
230 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
231 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
232 323
233 $self->update; 324 $self->update;
234} 325}
235 326
236sub set_size { 327sub set_size {
237 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
238 329
239 $self->{user_w} = $w; 330 $self->{force_w} = $w;
240 $self->{user_h} = $h; 331 $self->{force_h} = $h;
241 332
242 $self->check_size; 333 $self->realloc;
243} 334}
244 335
245sub size_request { 336sub size_request {
246 require Carp; 337 require Carp;
247 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
249 340
250sub configure { 341sub configure {
251 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
252 343
253 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
254 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
255 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
256 349
257 # use alignment to adjust x, y 350 # use alignment to adjust x, y
258 351
259 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
260 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
261
262 ($w, $h) = ($w2, $h2);
263 } 354 }
264 355
265 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
266 $self->{x} = $x; 357 $self->{x} = $x;
267 $self->{y} = $y; 358 $self->{y} = $y;
268 $self->update; 359 $self->update;
269 } 360 }
270 361
271 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
272 $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;
273 } 369 }
274} 370}
275 371
276sub size_allocate { 372sub size_allocate {
277 # nothing to be done 373 # nothing to be done
278} 374}
279 375
280sub reconfigure {
281 my ($self) = @_;
282
283 $self->check_size (1);
284 $self->update;
285}
286
287sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
288} 382}
289 383
290sub set_max_size { 384sub set_max_size {
291 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
292 386
293 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
294 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
295} 391}
296 392
297sub set_tooltip { 393sub set_tooltip {
298 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
299 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
300 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
301 402
302 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
304 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
305 } 406 }
306} 407}
307 408
308# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
309sub coord2local { 410sub coord2local {
… …
325 return if $FOCUS == $self; 426 return if $FOCUS == $self;
326 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
327 428
328 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
329 430
330 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
331 432
332 $focus->update if $focus; 433 $focus->update if $focus;
333 $FOCUS->update; 434 $FOCUS->update;
334} 435}
335 436
… …
338 439
339 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
340 441
341 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
342 443
343 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
344 445
345 $focus->update if $focus; #? 446 $focus->update if $focus; #?
346}
347 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
348sub mouse_motion { } 452sub mouse_motion { 0 }
349sub button_up { } 453sub button_up { 0 }
350sub key_down { } 454sub key_down { 0 }
351sub key_up { } 455sub key_up { 0 }
352 456
353sub button_down { 457sub button_down {
354 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
355 459
356 $self->focus_in; 460 $self->focus_in;
357}
358 461
359sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
360sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
361sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
362sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
363sub 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
364 542
365sub draw { 543sub draw {
366 my ($self) = @_; 544 my ($self) = @_;
367 545
368 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);
369 557
370 glPushMatrix; 558 glPushMatrix;
371 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
372 $self->_draw;
373 glPopMatrix;
374 560
375 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
376 my ($x, $y) = @$self{qw(x y)};
377
378 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
379 glEnable GL_BLEND; 563 glEnable GL_BLEND;
380 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
381 glBegin GL_QUADS; 565 glBegin GL_QUADS;
382 glVertex $x , $y;
383 glVertex $x + $self->{w}, $y;
384 glVertex $x + $self->{w}, $y + $self->{h};
385 glVertex $x , $y + $self->{h};
386 glEnd;
387 glDisable GL_BLEND;
388 }
389
390 if ($ENV{PCLIENT_DEBUG}) {
391 glPushMatrix;
392 glColor 1, 1, 0, 1;
393 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
394 glBegin GL_LINE_LOOP;
395 glVertex 0 , 0; 566 glVertex 0 , 0;
396 glVertex $self->{w}, 0; 567 glVertex $self->{w}, 0;
397 glVertex $self->{w}, $self->{h}; 568 glVertex $self->{w}, $self->{h};
398 glVertex 0 , $self->{h}; 569 glVertex 0 , $self->{h};
399 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;
400 glPopMatrix; 584 glPopMatrix;
401 #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;
402 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
403} 590}
404 591
405sub _draw { 592sub _draw {
406 my ($self) = @_; 593 my ($self) = @_;
407 594
408 warn "no draw defined for $self\n"; 595 warn "no draw defined for $self\n";
409}
410
411sub find_widget {
412 my ($self, $x, $y) = @_;
413
414 return () unless $self->{can_events};
415
416 return $self
417 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
418 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
419
420 ()
421}
422
423sub set_parent {
424 my ($self, $parent) = @_;
425
426 Scalar::Util::weaken ($self->{parent} = $parent);
427
428 # TODO: req_w _does_change after ->reconfigure
429 $self->check_size
430 unless exists $self->{req_w};
431
432 $self->show;
433}
434
435sub check_size {
436 my ($self, $forced) = @_;
437
438 $self->{force_alloc} = 1 if $forced;
439 $CFClient::UI::ROOT->{check_size}{$self} = $self;
440}
441
442sub update {
443 my ($self) = @_;
444
445 $self->{parent}->update
446 if $self->{parent};
447}
448
449sub connect {
450 my ($self, $signal, $cb) = @_;
451
452 push @{ $self->{signal_cb}{$signal} }, $cb;
453}
454
455sub emit {
456 my ($self, $signal, @args) = @_;
457
458 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
459} 596}
460 597
461sub DESTROY { 598sub DESTROY {
462 my ($self) = @_; 599 my ($self) = @_;
463 600
… …
495 632
496 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
497 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
498 635
499 glEnable GL_BLEND; 636 glEnable GL_BLEND;
500 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
501 glColor @$color; 638 glColor_premultiply @$color;
502 639
503 glBegin GL_QUADS; 640 glBegin GL_QUADS;
504 glVertex 0 , 0; 641 glVertex 0 , 0;
505 glVertex 0 , $h; 642 glVertex 0 , $h;
506 glVertex $w, $h; 643 glVertex $w, $h;
… …
521 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
522 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
523} 660}
524 661
525sub size_request { 662sub size_request {
526 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
527} 666}
528 667
529sub draw { } 668sub draw { }
530 669
531############################################################################# 670#############################################################################
… …
535our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
536 675
537sub new { 676sub new {
538 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
539 678
540 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
541 680
542 my $self = $class->SUPER::new ( 681 my $self = $class->SUPER::new (
543 children => [], 682 children => [],
544 can_events => 0, 683 can_events => 0,
545 %arg, 684 %arg,
546 ); 685 );
686
547 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
548 689
549 $self 690 $self
550} 691}
551 692
552sub add { 693sub add {
… …
560 $self->{children} = [ 701 $self->{children} = [
561 sort { $a->{z} <=> $b->{z} } 702 sort { $a->{z} <=> $b->{z} }
562 @{$self->{children}}, @widgets 703 @{$self->{children}}, @widgets
563 ]; 704 ];
564 705
565 $self->check_size (1); 706 $self->realloc;
566 $self->update;
567} 707}
568 708
569sub children { 709sub children {
570 @{ $_[0]{children} } 710 @{ $_[0]{children} }
571} 711}
… …
576 delete $child->{parent}; 716 delete $child->{parent};
577 $child->hide; 717 $child->hide;
578 718
579 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 719 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
580 720
581 $self->check_size; 721 $self->realloc;
582 $self->update;
583} 722}
584 723
585sub clear { 724sub clear {
586 my ($self) = @_; 725 my ($self) = @_;
587 726
… …
591 for (@$children) { 730 for (@$children) {
592 delete $_->{parent}; 731 delete $_->{parent};
593 $_->hide; 732 $_->hide;
594 } 733 }
595 734
596 $self->check_size; 735 $self->realloc;
597 $self->update;
598} 736}
599 737
600sub find_widget { 738sub find_widget {
601 my ($self, $x, $y) = @_; 739 my ($self, $x, $y) = @_;
602 740
603 $x -= $self->{x}; 741 $x -= $self->{x};
604 $y -= $self->{y}; 742 $y -= $self->{y};
605 743
606 my $res; 744 my $res;
607 745
608 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
609 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
610 and return $res; 748 and return $res;
611 } 749 }
612 750
613 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
662 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
663} 801}
664 802
665############################################################################# 803#############################################################################
666 804
805# back-buffered drawing area
806
667package CFClient::UI::Window; 807package CFClient::UI::Window;
668 808
669our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
670 810
671use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
689 $self->SUPER::size_allocate ($w, $h); 829 $self->SUPER::size_allocate ($w, $h);
690 $self->update; 830 $self->update;
691} 831}
692 832
693sub _render { 833sub _render {
834 my ($self) = @_;
835
694 $_[0]{children}[0]->draw; 836 $self->{children}[0]->draw;
695} 837}
696 838
697sub render_child { 839sub render_child {
698 my ($self) = @_; 840 my ($self) = @_;
699 841
700 $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 {
701 glClearColor 0, 0, 0, 0; 843 glClearColor 0, 0, 0, 0;
702 glClear GL_COLOR_BUFFER_BIT; 844 glClear GL_COLOR_BUFFER_BIT;
703 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
704 $self->_render; 853 $self->_render;
705 }; 854 };
706} 855}
707 856
708sub _draw { 857sub _draw {
709 my ($self) = @_; 858 my ($self) = @_;
710 859
711 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
712 861
713 my $tex = $self->{texture} 862 my $tex = $self->{texture}
714 or return; 863 or return;
715 864
716 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
718 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
719 868
720 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
721 870
722 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
723} 872}
… …
726 875
727package CFClient::UI::ViewPort; 876package CFClient::UI::ViewPort;
728 877
729our @ISA = CFClient::UI::Window::; 878our @ISA = CFClient::UI::Window::;
730 879
880sub new {
881 my $class = shift;
882
883 $class->SUPER::new (
884 scroll_x => 0,
885 scroll_y => 1,
886 @_,
887 )
888}
889
731sub size_request { 890sub size_request {
732 my ($self) = @_; 891 my ($self) = @_;
733 892
734 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 893 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
735 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
736 894
737 @$self{qw(child_w child_h)} 895 $w = 10 if $self->{scroll_x};
896 $h = 10 if $self->{scroll_y};
897
898 ($w, $h)
738} 899}
739 900
740sub size_allocate { 901sub size_allocate {
741 my ($self, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
742 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);
743 $self->update; 910 $self->update;
744} 911}
745 912
746sub set_offset { 913sub set_offset {
747 my ($self, $x, $y) = @_; 914 my ($self, $x, $y) = @_;
… …
781} 948}
782 949
783sub _render { 950sub _render {
784 my ($self) = @_; 951 my ($self) = @_;
785 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
786 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
787 957
788 $self->SUPER::_render; 958 $self->SUPER::_render;
789} 959}
790 960
… …
793package CFClient::UI::ScrolledWindow; 963package CFClient::UI::ScrolledWindow;
794 964
795our @ISA = CFClient::UI::HBox::; 965our @ISA = CFClient::UI::HBox::;
796 966
797sub new { 967sub new {
798 my $class = shift; 968 my ($class, %arg) = @_;
969
970 my $child = delete $arg{child};
799 971
800 my $self; 972 my $self;
801 973
802 my $slider = new CFClient::UI::Slider 974 my $slider = new CFClient::UI::Slider
803 vertical => 1, 975 vertical => 1,
804 range => [0, 0, 1, 0.01], # HACK fix 976 range => [0, 0, 1, 0.01], # HACK fix
805 connect_changed => sub { 977 on_changed => sub {
806 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 978 $self->{vp}->set_offset (0, $_[1]);
807 }, 979 },
808 ; 980 ;
809 981
810 $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
811 vp => (new CFClient::UI::ViewPort expand => 1), 983 vp => (new CFClient::UI::ViewPort expand => 1),
812 slider => $slider, 984 slider => $slider,
813 @_, 985 %arg,
814 ); 986 );
815 987
816 $self->{vp}->add ($self->{scrolled});
817 $self->add ($self->{vp});
818 $self->add ($self->{slider}); 988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
819 990
820 $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]);
821} 1017}
822 1018
823#TODO# update range on size_allocate depending on child 1019#TODO# update range on size_allocate depending on child
824# update viewport offset on scroll 1020# update viewport offset on scroll
825 1021
… …
845 1041
846 if ($self->{bg}) { 1042 if ($self->{bg}) {
847 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
848 1044
849 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
850 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
851 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
852 1048
853 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
854 glVertex 0 , 0; 1050 glVertex 0 , 0;
855 glVertex 0 , $h; 1051 glVertex 0 , $h;
856 glVertex $w, $h; 1052 glVertex $w, $h;
… …
869 1065
870our @ISA = CFClient::UI::Bin::; 1066our @ISA = CFClient::UI::Bin::;
871 1067
872use CFClient::OpenGL; 1068use CFClient::OpenGL;
873 1069
874my @tex = 1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
875 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
876 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);
877 1077
878sub new { 1078sub new {
879 my $class = shift; 1079 my ($class, %arg) = @_;
880 1080
881 # TODO: user_x, user_y, overwrite moveto? 1081 my $title = delete $arg{title};
882 1082
883 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
884 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
885 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
886 border => 0.6, 1086 border => 0.6,
887 toplevel => 1,
888 can_events => 1, 1087 can_events => 1,
889 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
890 ); 1091 );
891 1092
892 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
893 align => 0, 1094 align => 0,
894 valign => 1, 1095 valign => 1,
895 text => $self->{title}, 1096 text => $title,
896 fontsize => $self->{border}; 1097 fontsize => $self->{border}
1098 if defined $title;
897 1099
898 $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};
899} 1108}
900 1109
901sub border { 1110sub border {
902 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
903} 1112}
904 1113
905sub size_request { 1114sub size_request {
906 my ($self) = @_; 1115 my ($self) = @_;
1116
1117 $self->{title}->size_request
1118 if $self->{title};
907 1119
908 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
909 1121
910 ( 1122 (
911 $w + $self->border * 2, 1123 $w + $self->border * 2,
… …
914} 1126}
915 1127
916sub size_allocate { 1128sub size_allocate {
917 my ($self, $w, $h) = @_; 1129 my ($self, $w, $h) = @_;
918 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
919 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
920 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
921 1141
922 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
923 if $self->{title};
924
925 $self->child->configure ($self->border, $self->border, $w, $h); 1142 $self->child->configure ($border, $border, $w, $h);
926} 1143}
927 1144
928sub button_down { 1145sub button_down {
929 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
930 1147
… …
946 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
947 1164
948 my $dx = $ev->{x} - $ox; 1165 my $dx = $ev->{x} - $ox;
949 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
950 1167
951 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
952 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1170
953 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
954 $self->check_size; 1172 $self->realloc;
955 }; 1173 };
956 1174
957 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
958 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
959 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
… …
961 $self->{motion} = sub { 1179 $self->{motion} = sub {
962 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
963 1181
964 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
965 1183
966 $self->move ($bx + $x - $ox, $by + $y - $oy); 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
967 $self->update; 1185 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
968 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
969 } 1192 1
970} 1193}
971 1194
972sub button_up { 1195sub button_up {
973 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
974 1197
975 delete $self->{motion}; 1198 !!delete $self->{motion}
976} 1199}
977 1200
978sub mouse_motion { 1201sub mouse_motion {
979 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
980 1203
981 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
982} 1207}
983 1208
984sub _draw { 1209sub _draw {
985 my ($self) = @_; 1210 my ($self) = @_;
986 1211
1212 my $child = $self->{children}[0];
1213
987 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
988 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
989 1216
990 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
992 1219
993 my $border = $self->border; 1220 my $border = $self->border;
994 1221
995 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
996 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
997 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
998 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
999 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1000 1227
1001 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1002 my $bg = $tex[0]; 1229 glColor @{ $self->{bg} };
1003 1230
1004 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
1232 # solve this better(?)
1005 my $rep_x = $cw / $bg->{w}; 1233 $bg->{s} = $cw / $bg->{w};
1006 my $rep_y = $ch / $bg->{h}; 1234 $bg->{t} = $ch / $bg->{h};
1007
1008 glColor @{ $self->{bg} };
1009
1010 $bg->{s} = $rep_x;
1011 $bg->{t} = $rep_y;
1012 $bg->{wrap_mode} = 1;
1013 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1014 } 1236 }
1015 1237
1016 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
1017 1239
1018 $self->{title}->draw if $self->{title};
1019
1020 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
1021} 1246}
1022 1247
1023############################################################################# 1248#############################################################################
1024 1249
1025package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
1033sub new { 1258sub new {
1034 my $class = shift; 1259 my $class = shift;
1035 1260
1036 $class->SUPER::new ( 1261 $class->SUPER::new (
1037 col_expand => [], 1262 col_expand => [],
1038 @_ 1263 @_,
1039 ) 1264 )
1265}
1266
1267sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040} 1269}
1041 1270
1042sub add { 1271sub add {
1043 my ($self, $x, $y, $child) = @_; 1272 my ($self, $x, $y, $child) = @_;
1044 1273
1045 $child->set_parent ($self); 1274 $child->set_parent ($self);
1046 $self->{children}[$y][$x] = $child; 1275 $self->{children}[$y][$x] = $child;
1047 1276
1048 $child->check_size; 1277 $self->realloc;
1049} 1278}
1050 1279
1051sub children {
1052 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053}
1054
1055# 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?
1056sub clear { 1281sub clear {
1057 my ($self) = @_; 1282 my ($self) = @_;
1058 1283
1059 my @children = $self->children; 1284 my @children = $self->children;
1060 delete $self->{children}; 1285 delete $self->{children};
… …
1062 for (@children) { 1287 for (@children) {
1063 delete $_->{parent}; 1288 delete $_->{parent};
1064 $_->hide; 1289 $_->hide;
1065 } 1290 }
1066 1291
1067 $self->update; 1292 $self->realloc;
1068} 1293}
1069 1294
1070sub get_wh { 1295sub get_wh {
1071 my ($self) = @_; 1296 my ($self) = @_;
1072 1297
… …
1103sub size_allocate { 1328sub size_allocate {
1104 my ($self, $w, $h) = @_; 1329 my ($self, $w, $h) = @_;
1105 1330
1106 my ($ws, $hs) = $self->get_wh; 1331 my ($ws, $hs) = $self->get_wh;
1107 1332
1108 my $req_w = sum @$ws; 1333 my $req_w = (sum @$ws) || 1;
1109 my $req_h = sum @$hs; 1334 my $req_h = (sum @$hs) || 1;
1110 1335
1111 # TODO: nicer code && do row_expand 1336 # TODO: nicer code && do row_expand
1112 my @col_expand = @{$self->{col_expand}}; 1337 my @col_expand = @{$self->{col_expand}};
1113 @col_expand = (1) x @$ws unless @col_expand; 1338 @col_expand = (1) x @$ws unless @col_expand;
1114 my $col_expand = (sum @col_expand) || 1; 1339 my $col_expand = (sum @col_expand) || 1;
… …
1168 } 1393 }
1169} 1394}
1170 1395
1171############################################################################# 1396#############################################################################
1172 1397
1173package CFClient::UI::HBox; 1398package CFClient::UI::Box;
1174
1175# TODO: wrap into common Box base class
1176 1399
1177our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Container::;
1178 1401
1179sub size_request { 1402sub size_request {
1180 my ($self) = @_; 1403 my ($self) = @_;
1181 1404
1182 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $self->{vertical}
1183 1406 ? (
1184 ( 1407 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1185 (List::Util::sum map $_->[0], @alloc), 1408 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1186 (List::Util::max map $_->[1], @alloc), 1409 )
1187 ) 1410 : (
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 )
1188} 1414}
1189 1415
1190sub size_allocate { 1416sub size_allocate {
1191 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1192 1418
1193 ($h, $w) = ($w, $h); 1419 my $space = $self->{vertical} ? $h : $w;
1194
1195 my $children = $self->{children}; 1420 my $children = $self->{children};
1196 1421
1197 my @h = map $_->{req_w}, @$children; 1422 my @req;
1198 1423
1199 my $req_h = List::Util::sum @h; 1424 if ($self->{homogeneous}) {
1200 1425 @req = ($space / (@$children || 1)) x @$children;
1201 if ($req_h > $h) {
1202 # ah well, not enough space
1203 $_ *= $h / $req_h for @h;
1204 } 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 {
1205 my $exp = List::Util::sum map $_->{expand}, @$children; 1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1206 $exp ||= 1;
1207 1435
1436 $space = ($space - $req) / $expand; # remaining space to give away
1437
1438 $req[$_] += $space * $children->[$_]{expand}
1208 for (0 .. $#$children) { 1439 for 0 .. $#$children;
1209 my $child = $children->[$_];
1210
1211 my $alloc_h = $h[$_];
1212 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1213 $h[$_] = $alloc_h;
1214 } 1440 }
1215 } 1441 }
1216 1442
1217 CFClient::UI::harmonize \@h; 1443 CFClient::UI::harmonize \@req;
1218 1444
1219 my $y = 0; 1445 my $pos = 0;
1220 for (0 .. $#$children) { 1446 for (0 .. $#$children) {
1221 my $child = $children->[$_];
1222 my $h = $h[$_]; 1447 my $alloc = $req[$_];
1223 $child->configure ($y, 0, $h, $w); 1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1224 1449
1225 $y += $h; 1450 $pos += $alloc;
1226 } 1451 }
1227 1452
1228 1 1453 1
1229} 1454}
1230 1455
1231############################################################################# 1456#############################################################################
1232 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
1233package CFClient::UI::VBox; 1473package CFClient::UI::VBox;
1234 1474
1235# TODO: wrap into common Box base class
1236
1237our @ISA = CFClient::UI::Container::; 1475our @ISA = CFClient::UI::Box::;
1238 1476
1239sub size_request { 1477sub new {
1240 my ($self) = @_; 1478 my $class = shift;
1241 1479
1242 my @alloc = map [$_->size_request], @{$self->{children}}; 1480 $class->SUPER::new (
1243 1481 vertical => 1,
1244 ( 1482 @_,
1245 (List::Util::max map $_->[0], @alloc),
1246 (List::Util::sum map $_->[1], @alloc),
1247 ) 1483 )
1248}
1249
1250sub size_allocate {
1251 my ($self, $w, $h) = @_;
1252
1253 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1254
1255 my $children = $self->{children};
1256
1257 my @h = map $_->{req_h}, @$children;
1258
1259 my $req_h = List::Util::sum @h;
1260
1261 if ($req_h > $h) {
1262 # ah well, not enough space
1263 $_ *= $h / $req_h for @h;
1264 } else {
1265 my $exp = List::Util::sum map $_->{expand}, @$children;
1266 $exp ||= 1;
1267
1268 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270
1271 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1272 }
1273 }
1274
1275 CFClient::UI::harmonize \@h;
1276
1277 my $y = 0;
1278 for (0 .. $#$children) {
1279 my $child = $children->[$_];
1280 my $h = $h[$_];
1281 $child->configure (0, $y, $w, $h);
1282
1283 $y += $h;
1284 }
1285
1286 1
1287} 1484}
1288 1485
1289############################################################################# 1486#############################################################################
1290 1487
1291package CFClient::UI::Label; 1488package CFClient::UI::Label;
… …
1308 ellipsise => 3, # end 1505 ellipsise => 3, # end
1309 layout => (new CFClient::Layout), 1506 layout => (new CFClient::Layout),
1310 fontsize => 1, 1507 fontsize => 1,
1311 align => -1, 1508 align => -1,
1312 valign => -1, 1509 valign => -1,
1313 padding => 2, 1510 padding_x => 2,
1511 padding_y => 2,
1314 can_events => 0, 1512 can_events => 0,
1315 %arg 1513 %arg
1316 ); 1514 );
1317 1515
1318 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
… …
1345 1543
1346 delete $self->{texture}; 1544 delete $self->{texture};
1347 $self->SUPER::update; 1545 $self->SUPER::update;
1348} 1546}
1349 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1350sub set_text { 1555sub set_text {
1351 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1352 1557
1353 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1354 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1355 1560
1356 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1357 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1358 1563
1564 delete $self->{req_h};
1565 $self->realloc;
1359 $self->update; 1566 $self->update;
1360 $self->check_size;
1361} 1567}
1362 1568
1363sub set_markup { 1569sub set_markup {
1364 my ($self, $markup) = @_; 1570 my ($self, $markup) = @_;
1365 1571
… …
1369 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370 1576
1371 $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;
1372 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1373 1579
1580 delete $self->{req_h};
1581 $self->realloc;
1374 $self->update; 1582 $self->update;
1375 $self->check_size;
1376} 1583}
1377 1584
1378sub size_request { 1585sub size_request {
1379 my ($self) = @_; 1586 my ($self) = @_;
1380 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1381 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1382 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1383 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1384 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1596
1387 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1388 1598
1389 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1390 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1391 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1392 1602
1393 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1394 1604
1395 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1396 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1397 } 1607 }
1398 1608
1609 ($w, $h)
1399 ( 1610 }
1400 $w + $self->{padding} * 2,
1401 $h + $self->{padding} * 2,
1402 )
1403} 1611}
1404 1612
1405sub size_allocate { 1613sub size_allocate {
1406 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1407 1615
1616 delete $self->{ox};
1617
1408 delete $self->{texture}; 1618 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1409} 1620}
1410 1621
1411sub set_fontsize { 1622sub set_fontsize {
1412 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1413 1624
1414 $self->{fontsize} = $fontsize; 1625 $self->{fontsize} = $fontsize;
1415 delete $self->{texture}; 1626 delete $self->{texture};
1416 1627
1417 $self->update; 1628 $self->realloc;
1418 $self->check_size;
1419} 1629}
1420 1630
1421sub _draw { 1631sub _draw {
1422 my ($self) = @_; 1632 my ($self) = @_;
1423 1633
… …
1429 $self->{layout}->set_width ($self->{w}); 1639 $self->{layout}->set_width ($self->{w});
1430 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1640 $self->{layout}->set_ellipsise ($self->{ellipsise});
1431 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1432 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1433 1643
1434 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1644 new_from_layout CFClient::Texture $self->{layout}
1645 };
1435 1646
1647 unless (exists $self->{ox}) {
1436 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1437 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1438 : ($self->{w} - $tex->{w}) * 0.5); 1650 : ($self->{w} - $tex->{w}) * 0.5);
1439 1651
1440 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1441 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1442 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1443
1444 $tex
1445 }; 1655 };
1446 1656
1447 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1448 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1449 1658
1450 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1451 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1452 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1453 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1454 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1455 } 1666 }
1456 1667
1457 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1458} 1669}
… …
1475 active_fg => [0, 0, 0], 1686 active_fg => [0, 0, 0],
1476 can_hover => 1, 1687 can_hover => 1,
1477 can_focus => 1, 1688 can_focus => 1,
1478 valign => 0, 1689 valign => 0,
1479 can_events => 1, 1690 can_events => 1,
1691 #text => ...
1480 @_ 1692 @_
1481 ) 1693 )
1482} 1694}
1483 1695
1484sub _set_text { 1696sub _set_text {
… …
1486 1698
1487 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1488 1700
1489 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1490 1702
1491 delete $self->{texture};
1492
1493 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1494 $self->{text} = $text; 1704 $self->{text} = $text;
1495 1705
1496 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1497 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1498 1709
1499 $self->emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1500} 1714}
1501 1715
1502sub set_text { 1716sub set_text {
1503 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1504 1718
1505 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1506 $self->_set_text ($text); 1720 $self->_set_text ($text);
1507 $self->update;
1508 $self->check_size;
1509} 1721}
1510 1722
1511sub get_text { 1723sub get_text {
1512 $_[0]{text} 1724 $_[0]{text}
1513} 1725}
… …
1516 my ($self) = @_; 1728 my ($self) = @_;
1517 1729
1518 my ($w, $h) = $self->SUPER::size_request; 1730 my ($w, $h) = $self->SUPER::size_request;
1519 1731
1520 ($w + 1, $h) # add 1 for cursor 1732 ($w + 1, $h) # add 1 for cursor
1521}
1522
1523sub size_allocate {
1524 my ($self, $w, $h) = @_;
1525
1526 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1527} 1733}
1528 1734
1529sub key_down { 1735sub key_down {
1530 my ($self, $ev) = @_; 1736 my ($self, $ev) = @_;
1531 1737
… …
1546 } elsif ($sym == CFClient::SDLK_HOME) { 1752 } elsif ($sym == CFClient::SDLK_HOME) {
1547 $self->{cursor} = 0; 1753 $self->{cursor} = 0;
1548 } elsif ($sym == CFClient::SDLK_END) { 1754 } elsif ($sym == CFClient::SDLK_END) {
1549 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1550 } elsif ($uni == 27) { 1756 } elsif ($uni == 27) {
1551 $self->emit ('escape'); 1757 $self->_emit ('escape');
1552 } elsif ($uni) { 1758 } elsif ($uni) {
1553 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1554 } 1762 }
1555 1763
1556 $self->_set_text ($text); 1764 $self->_set_text ($text);
1557 $self->update; 1765
1558 $self->check_size; 1766 $self->realloc;
1767
1768 1
1559} 1769}
1560 1770
1561sub focus_in { 1771sub focus_in {
1562 my ($self) = @_; 1772 my ($self) = @_;
1563 1773
… …
1578 utf8::encode $text; 1788 utf8::encode $text;
1579 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1580 1790
1581 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1582 $self->update; 1792 $self->update;
1793
1794 1
1583} 1795}
1584 1796
1585sub mouse_motion { 1797sub mouse_motion {
1586 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1587# 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
1588} 1802}
1589 1803
1590sub _draw { 1804sub _draw {
1591 my ($self) = @_; 1805 my ($self) = @_;
1592 1806
1593 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1594 1808
1595 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1596 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1597 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1598 } else { 1812 } else {
1599 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1600 } 1814 }
1601 1815
1602 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1604 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1605 glVertex 0 , 0; 1819 glVertex 0 , 0;
1606 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1607 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1608 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1643 if ($sym == 13) { 1857 if ($sym == 13) {
1644 unshift @{$self->{history}}, 1858 unshift @{$self->{history}},
1645 my $txt = $self->get_text; 1859 my $txt = $self->get_text;
1646 $self->{history_pointer} = -1; 1860 $self->{history_pointer} = -1;
1647 $self->{history_saveback} = ''; 1861 $self->{history_saveback} = '';
1648 $self->emit (activate => $txt); 1862 $self->_emit (activate => $txt);
1649 $self->update; 1863 $self->update;
1650 1864
1651 } elsif ($sym == CFClient::SDLK_UP) { 1865 } elsif ($sym == CFClient::SDLK_UP) {
1652 if ($self->{history_pointer} < 0) { 1866 if ($self->{history_pointer} < 0) {
1653 $self->{history_saveback} = $self->get_text; 1867 $self->{history_saveback} = $self->get_text;
… …
1669 } else { 1883 } else {
1670 $self->set_text ($self->{history_saveback}); 1884 $self->set_text ($self->{history_saveback});
1671 } 1885 }
1672 1886
1673 } else { 1887 } else {
1674 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1675 } 1891 1
1676
1677} 1892}
1678 1893
1679############################################################################# 1894#############################################################################
1680 1895
1681package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1690 1905
1691sub new { 1906sub new {
1692 my $class = shift; 1907 my $class = shift;
1693 1908
1694 $class->SUPER::new ( 1909 $class->SUPER::new (
1695 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1696 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1697 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1698 can_hover => 1, 1914 can_hover => 1,
1699 align => 0, 1915 align => 0,
1700 valign => 0, 1916 valign => 0,
1701 can_events => 1, 1917 can_events => 1,
1702 @_ 1918 @_
1703 ) 1919 )
1704} 1920}
1705 1921
1922sub activate { }
1923
1706sub button_up { 1924sub button_up {
1707 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1708 1926
1927 $self->emit ("activate")
1709 if ($x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1710 && $y >= 0 && $y < $self->{h}) { 1929 && $y >= 0 && $y < $self->{h};
1711 $self->emit ("activate"); 1930
1712 } 1931 1
1713} 1932}
1714 1933
1715sub _draw { 1934sub _draw {
1716 my ($self) = @_; 1935 my ($self) = @_;
1717 1936
1718 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1719
1720 if ($GRAB == $self) {
1721 $self->{fg} = $self->{active_fg};
1722 }
1723 1938
1724 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1725 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1726 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1727 1942
… …
1746 1961
1747sub new { 1962sub new {
1748 my $class = shift; 1963 my $class = shift;
1749 1964
1750 $class->SUPER::new ( 1965 $class->SUPER::new (
1751 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1752 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1753 active_fg => [1, 1, 0], 1969 active_fg => [1, 1, 0],
1754 bg => [0, 0, 0, 0.2], 1970 bg => [0, 0, 0, 0.2],
1755 active_bg => [1, 1, 1, 0.5], 1971 active_bg => [1, 1, 1, 0.5],
1756 state => 0, 1972 state => 0,
… …
1760} 1976}
1761 1977
1762sub size_request { 1978sub size_request {
1763 my ($self) = @_; 1979 my ($self) = @_;
1764 1980
1765 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1766} 1982}
1767 1983
1768sub button_down { 1984sub button_down {
1769 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1770 1986
1771 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1772 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1773 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1774 $self->emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1775 } 1995 1
1776} 1996}
1777 1997
1778sub _draw { 1998sub _draw {
1779 my ($self) = @_; 1999 my ($self) = @_;
1780 2000
1781 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1782 2002
1783 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1784 2004
1785 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;
1786 2008
1787 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1788 2010
1789 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
1790 2012
… …
1945 2167
1946 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
1947 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
1948 2170
1949 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
1950 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;
1951 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
1952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1953 2176
1954 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
1955 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2054 my $self = $class->SUPER::new ( 2277 my $self = $class->SUPER::new (
2055 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
2056 active_fg => [0, 0, 0], 2279 active_fg => [0, 0, 0],
2057 bg => [0, 0, 0, 0.2], 2280 bg => [0, 0, 0, 0.2],
2058 active_bg => [1, 1, 1, 0.5], 2281 active_bg => [1, 1, 1, 0.5],
2059 range => [0, 0, 100, 10], 2282 range => [0, 0, 100, 10, 0],
2060 req_w => $::WIDTH / 80, 2283 min_w => $::WIDTH / 80,
2061 req_h => $::WIDTH / 80, 2284 min_h => $::WIDTH / 80,
2062 vertical => 0, 2285 vertical => 0,
2063 can_hover => 1, 2286 can_hover => 1,
2064 inner_pad => 0.02, 2287 inner_pad => 0.02,
2065 @_ 2288 @_
2066 ); 2289 );
… …
2069 $self->update; 2292 $self->update;
2070 2293
2071 $self 2294 $self
2072} 2295}
2073 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
2074sub set_value { 2308sub set_value {
2075 my ($self, $value) = @_; 2309 my ($self, $value) = @_;
2076 2310
2077 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2311 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078 2312
2079 $hi = $lo + 1 if $hi <= $lo; 2313 $hi = $lo + 1 if $hi <= $lo;
2080 2314
2315 $page = $hi - $lo if $page > $hi - $lo;
2316
2081 $value = $lo if $value < $lo; 2317 $value = $lo if $value < $lo;
2082 $value = $hi if $value > $hi; 2318 $value = $hi - $page if $value > $hi - $page;
2083 2319
2084 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2320 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085 if $unit; 2321 if $unit;
2086 2322
2087 $page = $hi - $lo if $page > $hi - $lo;
2088
2089 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090 2324
2091 if ($value != $old_value) { 2325 if ($value != $old_value) {
2092 $self->emit (changed => $value); 2326 $self->_emit (changed => $value);
2093 $self->update; 2327 $self->update;
2094 } 2328 }
2095} 2329}
2096 2330
2097sub size_request { 2331sub size_request {
2098 my ($self) = @_; 2332 my ($self) = @_;
2099 2333
2100 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
2101 my $h = $self->{req_h};
2102
2103 $self->{vertical} ? ($h, $w) : ($w, $h)
2104} 2335}
2105 2336
2106sub button_down { 2337sub button_down {
2107 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2108 2339
2109 $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
2110 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
2111} 2345}
2112 2346
2113sub mouse_motion { 2347sub mouse_motion {
2114 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2115 2349
2116 if ($GRAB == $self) { 2350 if ($GRAB == $self) {
2117 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118 2352
2119 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2353 my (undef, $lo, $hi, $page) = @{$self->{range}};
2120 2354
2121 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2355 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2122 2356
2123 $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
2124 } 2362 1
2125} 2363}
2126 2364
2127sub update { 2365sub update {
2128 my ($self) = @_; 2366 my ($self) = @_;
2129 2367
2130 $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}) {
2131 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2132 2377
2133 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2379 my $range = ($hi - $page - $lo) || 1e-100;
2134 2380
2135 my $inner_w = 1 - 2 * $self->{inner_pad}; 2381 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2136 2382
2137 $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;
2138 2385
2139 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2386 $value = ($value - $lo) / $range;
2140 $value = $self->{scale} * ($value - $lo); 2387 $value = $value * $self->{scale} + $self->{offset};
2141 2388
2142 $value = $self->{inner_pad} + ($value - $page * 0.5);
2143
2144 $value = 0 if $value < 0;
2145 $page = 1 - $value if $value + $page > 1;
2146
2147 $self->{knob_x} = $value; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2148 $self->{knob_w} = $page; 2390 $self->{knob_w} = $knob_w;
2149 }); 2391 }
2150
2151 $self->SUPER::update;
2152}
2153
2154sub _draw {
2155 my ($self) = @_;
2156 2392
2157 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2158 2394
2159 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2160 2396
… …
2177 # draw handle 2413 # draw handle
2178 $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);
2179 2415
2180 glDisable GL_TEXTURE_2D; 2416 glDisable GL_TEXTURE_2D;
2181} 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 (@_) }
2182 2459
2183############################################################################# 2460#############################################################################
2184 2461
2185package CFClient::UI::TextView; 2462package CFClient::UI::TextView;
2186 2463
… …
2228 $self->{layout}->set_width ($self->{children}[0]{w}); 2505 $self->{layout}->set_width ($self->{children}[0]{w});
2229 2506
2230 $self->reflow; 2507 $self->reflow;
2231} 2508}
2232 2509
2233sub text_height { 2510sub text_size {
2234 my ($self, $text, $indent) = @_; 2511 my ($self, $text, $indent) = @_;
2235 2512
2236 my $layout = $self->{layout}; 2513 my $layout = $self->{layout};
2237 2514
2238 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239 $layout->set_width ($self->{children}[0]{w} - $indent); 2516 $layout->set_width ($self->{children}[0]{w} - $indent);
2240 $layout->set_markup ($text); 2517 $layout->set_markup ($text);
2241 2518
2242 ($layout->size)[1] 2519 $layout->size
2243} 2520}
2244 2521
2245sub reflow { 2522sub reflow {
2246 my ($self) = @_; 2523 my ($self) = @_;
2247 2524
2248 $self->{need_reflow}++; 2525 $self->{need_reflow}++;
2249 $self->update; 2526 $self->update;
2250} 2527}
2251 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
2252sub add_paragraph { 2544sub add_paragraph {
2253 my ($self, $color, $text, $indent) = @_; 2545 my ($self, $color, $text, $indent) = @_;
2254 2546
2255 #TODO: intelligently "reformat" paragraph
2256
2257 for my $line (split /\n/, $text) { 2547 for my $line (split /\n/, $text) {
2258 my $height = $self->text_height ($line); 2548 my ($w, $h) = $self->text_size ($line);
2259 $self->{height} += $height; 2549 $self->{height} += $h;
2260 push @{$self->{par}}, [$height, $color, $indent, $line]; 2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2261 } 2551 }
2262 2552
2263 $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]);
2264 $self->{children}[1]->update;
2265} 2554}
2266 2555
2267sub update { 2556sub update {
2268 my ($self) = @_; 2557 my ($self) = @_;
2269 2558
… …
2272 return unless $self->{h} > 0; 2561 return unless $self->{h} > 0;
2273 2562
2274 delete $self->{texture}; 2563 delete $self->{texture};
2275 2564
2276 $ROOT->on_post_alloc ($self, sub { 2565 $ROOT->on_post_alloc ($self, sub {
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567
2277 if (delete $self->{need_reflow}) { 2568 if (delete $self->{need_reflow}) {
2278 my $height = 0; 2569 my $height = 0;
2279 2570
2280 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2571 my $layout = $self->{layout};
2572
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2281 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 }
2282 2586
2283 $self->{height} = $height; 2587 $self->{height} = $height;
2284 2588
2285 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2589 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2286 $self->{children}[1]->update;
2287 2590
2288 delete $self->{texture}; 2591 delete $self->{texture};
2289 } 2592 }
2290 2593
2291 $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 {
2292 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2293 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2294 2597
2295 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2296 2599
2297 my $y0 = $top; 2600 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2601 my $y1 = $top + $H;
2299 2602
2300 my $y = 0; 2603 my $y = 0;
2301 2604
2302 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2303 2606
2304 $layout->set_font ($self->{font}) if $self->{font}; 2607 $layout->set_font ($self->{font}) if $self->{font};
2305 2608
2306 glEnable GL_BLEND; 2609 glEnable GL_BLEND;
2610 #TODO# not correct in windows where rgba is forced off
2307 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308 2612
2309 for my $par (@{$self->{par}}) { 2613 for my $par (@{$self->{par}}) {
2310 my $h = $par->[0]; 2614 my $h = $par->[1];
2311 2615
2312 if ($y0 < $y + $h && $y < $y1) { 2616 if ($y0 < $y + $h && $y < $y1) {
2313 $layout->set_foreground (@{ $par->[1] }); 2617 $layout->set_foreground (@{ $par->[2] });
2314 $layout->set_width ($self->{w} - $par->[2]); 2618 $layout->set_width ($W - $par->[3]);
2315 $layout->set_markup ($par->[3]); 2619 $layout->set_markup ($par->[4]);
2316 2620
2317 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2621 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2318 2622
2319 glRasterPos $par->[2], $y - $y0; 2623 glRasterPos $par->[3], $y - $y0;
2320 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2624 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2321 } 2625 }
2322 2626
2323 $y += $h; 2627 $y += $h;
2324 } 2628 }
… …
2331sub _draw { 2635sub _draw {
2332 my ($self) = @_; 2636 my ($self) = @_;
2333 2637
2334 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2336 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2337 $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});
2338 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2339 2643
2340 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2341 2645
2342} 2646}
… …
2391 2695
2392sub new { 2696sub new {
2393 my $class = shift; 2697 my $class = shift;
2394 2698
2395 my $self = $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2396 state => 0, 2700 state => 0,
2397 connect_activate => \&toggle_flopper, 2701 on_activate => \&toggle_flopper,
2398 @_ 2702 @_
2399 ); 2703 );
2400 2704
2401 if ($self->{state}) {
2402 $self->{state} = 0;
2403 $self->toggle_flopper;
2404 }
2405
2406 $self 2705 $self
2407} 2706}
2408 2707
2409sub toggle_flopper { 2708sub toggle_flopper {
2410 my ($self) = @_; 2709 my ($self) = @_;
2411 2710
2412 # TODO: use animation 2711 $self->{other}->toggle_visibility;
2413 if ($self->{state} = !$self->{state}) {
2414 $CFClient::UI::ROOT->add ($self->{other});
2415 $self->{other}->move ($self->coord2global (0, $self->{h}));
2416 $self->emit ("open");
2417 } else {
2418 $CFClient::UI::ROOT->remove ($self->{other});
2419 $self->emit ("close");
2420 }
2421
2422 $self->emit (changed => $self->{state});
2423} 2712}
2424 2713
2425############################################################################# 2714#############################################################################
2426 2715
2427package CFClient::UI::Tooltip; 2716package CFClient::UI::Tooltip;
… …
2440} 2729}
2441 2730
2442sub set_tooltip_from { 2731sub set_tooltip_from {
2443 my ($self, $widget) = @_; 2732 my ($self, $widget) = @_;
2444 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
2445 $self->add (new CFClient::UI::Label 2743 $self->add (new CFClient::UI::Label
2446 markup => $widget->{tooltip}, 2744 markup => $tooltip,
2447 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2448 fontsize => 0.8, 2746 fontsize => 0.8,
2449 fg => [0, 0, 0, 1], 2747 fg => [0, 0, 0, 1],
2450 ellipsise => 0, 2748 ellipsise => 0,
2451 font => ($widget->{tooltip_font} || $::FONT_PROP), 2749 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2462 2760
2463sub size_allocate { 2761sub size_allocate {
2464 my ($self, $w, $h) = @_; 2762 my ($self, $w, $h) = @_;
2465 2763
2466 $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 });
2467} 2783}
2468 2784
2469sub _draw { 2785sub _draw {
2470 my ($self) = @_; 2786 my ($self) = @_;
2471 2787
… …
2488 glVertex $w, $h; 2804 glVertex $w, $h;
2489 glVertex $w, 0; 2805 glVertex $w, 0;
2490 glEnd; 2806 glEnd;
2491 2807
2492 glTranslate 2 - 0.375, 2 - 0.375; 2808 glTranslate 2 - 0.375, 2 - 0.375;
2809
2493 $self->SUPER::_draw; 2810 $self->SUPER::_draw;
2494} 2811}
2495 2812
2496############################################################################# 2813#############################################################################
2497 2814
… …
2503 2820
2504sub new { 2821sub new {
2505 my $class = shift; 2822 my $class = shift;
2506 2823
2507 my $self = $class->SUPER::new ( 2824 my $self = $class->SUPER::new (
2508 aspect => 1, 2825 aspect => 1,
2826 can_events => 0,
2509 @_, 2827 @_,
2510 ); 2828 );
2511 2829
2512 if ($self->{anim} && $self->{animspeed}) { 2830 if ($self->{anim} && $self->{animspeed}) {
2513 Scalar::Util::weaken (my $widget = $self); 2831 Scalar::Util::weaken (my $widget = $self);
… …
2539} 2857}
2540 2858
2541sub _draw { 2859sub _draw {
2542 my ($self) = @_; 2860 my ($self) = @_;
2543 2861
2544 return unless $::CONN;#d# manage and cache textures differently 2862 return unless $::CONN;
2545 2863
2546 my $face; 2864 my $face;
2547 2865
2548 if ($self->{frame}) { 2866 if ($self->{frame}) {
2549 my $anim = $::CONN->{anim}[$self->{anim}]; 2867 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2555 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2556 2874
2557 if ($tex) { 2875 if ($tex) {
2558 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2559 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2560 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2561 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2562 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2563 } 2881 }
2564} 2882}
2565 2883
… …
2572 $self->SUPER::DESTROY; 2890 $self->SUPER::DESTROY;
2573} 2891}
2574 2892
2575############################################################################# 2893#############################################################################
2576 2894
2577package CFClient::UI::InventoryItem; 2895package CFClient::UI::Buttonbar;
2578 2896
2579our @ISA = CFClient::UI::HBox::; 2897our @ISA = CFClient::UI::HBox::;
2580 2898
2581sub _item_to_desc { 2899# TODO: should actualyl wrap buttons and other goodies.
2582 my ($item) = @_;
2583
2584 my $desc =
2585 $item->{nrof} < 2
2586 ? $item->{name}
2587 : "$item->{nrof} × $item->{name_pl}";
2588
2589 $item->{flags} & Crossfire::Protocol::F_OPEN
2590 and $desc .= " (open)";
2591 $item->{flags} & Crossfire::Protocol::F_APPLIED
2592 and $desc .= " (applied)";
2593 $item->{flags} & Crossfire::Protocol::F_UNPAID
2594 and $desc .= " (unpaid)";
2595 $item->{flags} & Crossfire::Protocol::F_MAGIC
2596 and $desc .= " (magic)";
2597 $item->{flags} & Crossfire::Protocol::F_CURSED
2598 and $desc .= " (cursed)";
2599 $item->{flags} & Crossfire::Protocol::F_DAMNED
2600 and $desc .= " (damned)";
2601 $item->{flags} & Crossfire::Protocol::F_LOCKED
2602 and $desc .= " *";
2603
2604 $desc
2605}
2606
2607sub new {
2608 my $class = shift;
2609
2610 my %args = @_;
2611
2612 my $item = delete $args{item};
2613
2614 my $desc = _item_to_desc ($item);
2615
2616 my $self = $class->SUPER::new (
2617 can_hover => 1,
2618 can_events => 1,
2619 tooltip => ((CFClient::UI::Label::escape $desc)
2620 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621 connect_button_down => sub {
2622 my ($self, $ev, $x, $y) = @_;
2623
2624 # todo: maybe put examine on 1? but should just be a tooltip :(
2625 if ($ev->{button} == 1) {
2626 my $targ = $::CONN->{player}{tag};
2627
2628 if ($item->{container} == $::CONN->{player}{tag}) {
2629 $targ = $main::OPENCONT;
2630 }
2631
2632 $::CONN->send ("move $targ $item->{tag} 0");
2633 } elsif ($ev->{button} == 2) {
2634 $::CONN->send ("apply $item->{tag}");
2635 } elsif ($ev->{button} == 3) {
2636 my @menu_items = (
2637 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640 (
2641 $item->{flags} & Crossfire::Protocol::F_LOCKED
2642 ? (
2643 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644 )
2645 : (
2646 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648 )
2649 ),
2650 );
2651
2652 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653 }
2654
2655 1
2656 },
2657 %args
2658 );
2659
2660
2661 $self->add (new CFClient::UI::Face
2662 can_events => 0,
2663 face => $item->{face},
2664 anim => $item->{anim},
2665 animspeed => $item->{animspeed},
2666 );
2667
2668 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670 $self->{item} = $item;
2671
2672 $self->update_item;
2673
2674 $self
2675}
2676
2677sub update_item {
2678 my ($self) = @_;
2679
2680 my $desc = _item_to_desc ($self->{item});
2681
2682 $self->{name_lbl}->set_text ($desc);
2683}
2684
2685#############################################################################
2686
2687package CFClient::UI::Inventory;
2688
2689our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691sub new {
2692 my $class = shift;
2693
2694 my $self = $class->SUPER::new (
2695 scrolled => (new CFClient::UI::VBox),
2696 @_,
2697 );
2698
2699 $self
2700}
2701
2702sub set_items {
2703 my ($self, $items) = @_;
2704
2705 $self->{scrolled}->clear;
2706 return unless $items;
2707
2708 my @items = sort {
2709 ($a->{type} <=> $b->{type})
2710 or ($a->{name} cmp $b->{name})
2711 } @$items;
2712
2713 $self->{real_items} = \@items;
2714
2715 for my $item (@items) {
2716 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2717 $item->update_item ();
2718 }
2719
2720 $self->{scrolled}->add (@items);
2721
2722# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2723}
2724
2725sub size_request {
2726 my ($self) = @_;
2727 ($self->{req_w}, $self->{req_h});
2728}
2729 2900
2730############################################################################# 2901#############################################################################
2731 2902
2732package CFClient::UI::Menu; 2903package CFClient::UI::Menu;
2733 2904
… …
2767 2938
2768# 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)
2769sub popup { 2940sub popup {
2770 my ($self, $ev) = @_; 2941 my ($self, $ev) = @_;
2771 2942
2772 $self->emit ("popdown"); 2943 $self->_emit ("popdown");
2773 2944
2774 # maybe save $GRAB? must be careful about events... 2945 # maybe save $GRAB? must be careful about events...
2775 $GRAB = $self; 2946 $GRAB = $self;
2776 $self->{button} = $ev->{button}; 2947 $self->{button} = $ev->{button};
2777 2948
2778 $self->show; 2949 $self->show;
2779 $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);
2780} 2951}
2781 2952
2782sub mouse_motion { 2953sub mouse_motion {
2783 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2784 2955
2785 # TODO: should use vbox->find_widget or so 2956 # TODO: should use vbox->find_widget or so
2786 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2787 $self->{hover} = $self->{item}{$HOVER}; 2958 $self->{hover} = $self->{item}{$HOVER};
2959
2960 0
2788} 2961}
2789 2962
2790sub button_up { 2963sub button_up {
2791 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2792 2965
2793 if ($ev->{button} == $self->{button}) { 2966 if ($ev->{button} == $self->{button}) {
2794 undef $GRAB; 2967 undef $GRAB;
2795 $self->hide; 2968 $self->hide;
2796 2969
2797 $self->emit ("popdown"); 2970 $self->_emit ("popdown");
2798 $self->{hover}[1]->() if $self->{hover}; 2971 $self->{hover}[1]->() if $self->{hover};
2972 } else {
2973 return 0
2974 }
2975
2799 } 2976 1
2800} 2977}
2801 2978
2802############################################################################# 2979#############################################################################
2803 2980
2804package CFClient::UI::Statusbox; 2981package CFClient::UI::Multiplexer;
2805 2982
2806our @ISA = CFClient::UI::VBox::; 2983our @ISA = CFClient::UI::Container::;
2807 2984
2808sub new { 2985sub new {
2809 my $class = shift; 2986 my $class = shift;
2810 2987
2811 $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 (
2812 fontsize => 0.8, 3097 fontsize => 0.8,
2813 @_, 3098 @_,
2814 ) 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
2815} 3106}
2816 3107
2817sub reorder { 3108sub reorder {
2818 my ($self) = @_; 3109 my ($self) = @_;
2819 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} };
2820 3116
2821 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
2822 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2823 } 3119 }
2824 3120
… …
2827 my @items = sort { 3123 my @items = sort {
2828 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
2829 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
2830 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
2831 3127
3128 $self->{timer}->interval (1);
3129
2832 my $count = 10 + 1; 3130 my $count = 10 + 1;
2833 for my $item (@items) { 3131 for my $item (@items) {
2834 last unless --$count; 3132 last unless --$count;
2835 3133
2836 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
2837 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
2838 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
2839 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
2840 : $item->{text}; 3138 : $item->{text};
2841 3139
… …
2849 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
2850 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
2851 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
2852 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
2853 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
2854 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
2855 can_events => 1, 3153 can_events => 1,
2856 can_hover => 1 3154 can_hover => 1
2857 }; 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;
2858 } 3168 }
2859 3169
2860 $self->clear; 3170 $self->clear;
2861 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
2862} 3172}
… …
2865 my ($self, $text, %arg) = @_; 3175 my ($self, $text, %arg) = @_;
2866 3176
2867 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
2868 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
2869 3179
3180 return unless $text;
3181
2870 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2871 3183
2872 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873 3185
2874 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
2875 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
2905 3217
2906 $self->reorder; 3218 $self->reorder;
2907 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
2908} 3220}
2909 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
2910############################################################################# 3230#############################################################################
2911 3231
2912package CFClient::UI::Root; 3232package CFClient::UI::Inventory;
2913 3233
2914our @ISA = CFClient::UI::Container::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
2915
2916use CFClient::OpenGL;
2917 3235
2918sub new { 3236sub new {
2919 my $class = shift; 3237 my $class = shift;
2920 3238
2921 $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 => [],
2922 @_, 3481 @_,
2923 ) 3482 )
2924} 3483}
2925 3484
2926sub configure { 3485# XXX: Do sorting? Argl...
2927 my ($self, $x, $y, $w, $h) = @_; 3486sub add_spell {
2928
2929 $self->{w} = $w;
2930 $self->{h} = $h;
2931}
2932
2933sub check_size {
2934 my ($self) = @_; 3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
2935 3489
2936 $self->size_allocate ($self->{w}, $self->{h}) 3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2937 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
2938} 3546}
2939 3547
2940sub size_request { 3548sub size_request {
2941 my ($self) = @_; 3549 my ($self) = @_;
2942 3550
2943 ($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
2944} 3566}
2945 3567
2946sub size_allocate { 3568sub size_allocate {
2947 my ($self, $w, $h) = @_; 3569 my ($self, $w, $h) = @_;
2948 3570
2949 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954
2955 for my $child ($self->children) { 3571 for my $child ($self->children) {
2956 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)};
2957 3573
2958 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3574 $X = $child->{force_x} if exists $child->{force_x};
2959 if exists $child->{req_x}; 3575 $Y = $child->{force_y} if exists $child->{force_y};
2960 3576
2961 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3577 $X = _to_pixel $X, $W, $self->{w};
2962 if exists $child->{req_y}; 3578 $Y = _to_pixel $Y, $H, $self->{h};
2963
2964 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2965 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966 3579
2967 $child->configure ($X, $Y, $W, $H); 3580 $child->configure ($X, $Y, $W, $H);
2968 } 3581 }
2969} 3582}
2970 3583
… …
2981} 3594}
2982 3595
2983sub update { 3596sub update {
2984 my ($self) = @_; 3597 my ($self) = @_;
2985 3598
2986 $self->check_size;
2987 $::WANT_REFRESH++; 3599 $::WANT_REFRESH++;
2988} 3600}
2989 3601
2990sub add { 3602sub add {
2991 my ($self, @children) = @_; 3603 my ($self, @children) = @_;
2992 3604
2993 for my $child (@children) {
2994 $child->{toplevel} = 1; 3605 $_->{is_toplevel} = 1
2995 3606 for @children;
2996 # integerise window positions
2997 $child->{x} = int $child->{x};
2998 $child->{y} = int $child->{y};
2999 }
3000 3607
3001 $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;
3002 3618
3003 while (@children) { 3619 while (@children) {
3004 my $w = pop @children; 3620 my $w = pop @children;
3005 push @children, $w->children; 3621 push @children, $w->children;
3006 $w->{visible} = 1; 3622 $w->set_invisible;
3007 }
3008}
3009
3010sub remove {
3011 my ($self, @children) = @_;
3012
3013 $self->SUPER::remove (@children);
3014
3015 while (@children) {
3016 my $w = pop @children;
3017 push @children, $w->children;
3018 delete $w->{visible};
3019 } 3623 }
3020} 3624}
3021 3625
3022sub on_refresh { 3626sub on_refresh {
3023 my ($self, $id, $cb) = @_; 3627 my ($self, $id, $cb) = @_;
… …
3037 while ($self->{refresh_hook}) { 3641 while ($self->{refresh_hook}) {
3038 $_->() 3642 $_->()
3039 for values %{delete $self->{refresh_hook}}; 3643 for values %{delete $self->{refresh_hook}};
3040 } 3644 }
3041 3645
3042 if ($self->{check_size}) { 3646 if ($self->{realloc}) {
3043 my @queue = ([], []); 3647 my %queue;
3648 my @queue;
3649 my $widget;
3044 3650
3045 for (;;) { 3651 outer:
3046 if ($self->{check_size}) { 3652 while () {
3047 # heuristic: check containers last 3653 if (my $realloc = delete $self->{realloc}) {
3048 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3654 for $widget (values %$realloc) {
3049 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 }
3050 } 3661 }
3051 3662
3052 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3663 while () {
3664 @queue or last outer;
3053 3665
3054 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3666 $widget = pop @{ $queue[-1] || [] }
3055 ? @$widget{qw(user_w user_h)} 3667 and last;
3056 : $widget->size_request;
3057
3058 if (delete $widget->{force_alloc}
3059 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3060 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3061 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}) {
3062 $widget->{req_w} = $w; 3687 $widget->{req_w} = $w;
3063 $widget->{req_h} = $h; 3688 $widget->{req_h} = $h;
3064 3689
3065 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3690 $self->{size_alloc}{$widget+0} = $widget;
3066 3691
3067 $widget->{parent}->check_size
3068 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 }
3069 } 3699 }
3700
3701 delete $self->{realloc}{$widget+0};
3070 } 3702 }
3071 } 3703 }
3072 3704
3073 while ($self->{size_alloc}) { 3705 while (my $size_alloc = delete $self->{size_alloc}) {
3074 for (values %{delete $self->{size_alloc}}) { 3706 my @queue = sort { $b->{visible} <=> $a->{visible} }
3075 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)};
3076 3713
3077 $w = 0 if $w < 0; 3714 $w = 0 if $w < 0;
3078 $h = 0 if $h < 0; 3715 $h = 0 if $h < 0;
3079 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
3080 $widget->{w} = $w; 3724 $widget->{w} = $w;
3081 $widget->{h} = $h; 3725 $widget->{h} = $h;
3082 $widget->size_allocate ($w, $h); 3726
3083 $widget->emit (size_allocate => $w, $h); 3727 $widget->emit (size_allocate => $w, $h);
3728 }
3084 } 3729 }
3085 } 3730 }
3086 3731
3087 while ($self->{post_alloc_hook}) { 3732 while ($self->{post_alloc_hook}) {
3088 $_->() 3733 $_->()
3089 for values %{delete $self->{post_alloc_hook}}; 3734 for values %{delete $self->{post_alloc_hook}};
3090 } 3735 }
3736
3091 3737
3092 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3093 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3094 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
3095 3741
… …
3097 glLoadIdentity; 3743 glLoadIdentity;
3098 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3099 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
3100 glLoadIdentity; 3746 glLoadIdentity;
3101 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
3102 $self->_draw; 3755 $self->_draw;
3103} 3756}
3104 3757
3105############################################################################# 3758#############################################################################
3106 3759

Diff Legend

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