ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 2006 UTC

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

Diff Legend

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