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

Diff Legend

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