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

Diff Legend

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