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.213 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.292 by root, Tue Jun 6 03:02:15 2006 UTC

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

Diff Legend

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