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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 2006 UTC

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

Diff Legend

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