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.199 by root, Fri May 12 15:45:42 2006 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFPlus::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
17sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
18 if (!$GRAB) { 23 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
23 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
24 32
25 my $tip = $widget->{tooltip}; 33 return if $ENV{CFPLUS_DEBUG} & 8;
26 34
27 $tip = $tip->($widget) if CODE:: eq ref $tip;
28
29 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 36 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 } 37 }
42 38
43 return; 39 return;
44 } 40 }
45 } 41 }
46 } 42 }
47 43
48 $TOOLTIP->hide; 44 $TOOLTIP->hide;
45 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
49 delete $TOOLTIP->{owner}; 46 delete $TOOLTIP->{owner};
47});
48
49sub get_layout {
50 my $layout;
51
52 for (grep { $_->{name} } values %WIDGET) {
53 my $win = $layout->{$_->{name}} = { };
54
55 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
56 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
57 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
58 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
59
60 $win->{show} = $_->{visible} && $_->{is_toplevel};
61 }
62
63 $layout
64}
65
66sub set_layout {
67 my ($layout) = @_;
68
69 $LAYOUT = $layout;
50} 70}
51 71
52# class methods for events 72# class methods for events
53sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 75 if $FOCUS;
56} 76}
57 77
58sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 80 if $FOCUS;
81}
82
83sub check_hover {
84 my ($widget) = @_;
85
86 if ($widget != $HOVER) {
87 my $hover = $HOVER; $HOVER = $widget;
88
89 $hover->update if $hover && $hover->{can_hover};
90 $HOVER->update if $HOVER && $HOVER->{can_hover};
91
92 $TOOLTIP_WATCHER->start;
93 }
61} 94}
62 95
63sub feed_sdl_button_down_event { 96sub feed_sdl_button_down_event {
64 my ($ev) = @_; 97 my ($ev) = @_;
65 my ($x, $y) = ($ev->{x}, $ev->{y}); 98 my ($x, $y) = ($ev->{x}, $ev->{y});
66 99
67 if (!$BUTTON_STATE) { 100 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
101
102 unless ($GRAB) {
68 my $widget = $ROOT->find_widget ($x, $y); 103 my $widget = $ROOT->find_widget ($x, $y);
69 104
70 $GRAB = $widget; 105 $GRAB = $widget;
71 $GRAB->update if $GRAB; 106 $GRAB->update if $GRAB;
72 107
73 check_tooltip; 108 $TOOLTIP_WATCHER->cb->();
74 } 109 }
75
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 110
78 if ($GRAB) { 111 if ($GRAB) {
79 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if ($ev->{button} == 4 || $ev->{button} == 5) {
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); 113 # mousewheel
114 my $delta = $ev->{button} * 2 - 9;
115 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
116
117 $ev->{dx} = $shift ? $delta : 0;
118 $ev->{dy} = $shift ? 0 : $delta;
119
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
81 } 124 }
82} 125}
83 126
84sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
85 my ($ev) = @_; 128 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y});
87 129
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
89 131
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 133
92 if ($GRAB) { 134 $GRAB->emit (button_up => $ev)
93 ($x, $y) = $GRAB->coord2local ($x, $y); 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 136
97 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 139 $grab->update if $grab;
100 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
101 141
102 check_tooltip; 142 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->();
103 } 144 }
104} 145}
105 146
106sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
107 my ($ev) = @_; 148 my ($ev) = @_;
108 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
109 150
110 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
111 152
112 if ($widget != $HOVER) { 153 check_hover $widget;
113 my $hover = $HOVER; $HOVER = $widget;
114 154
115 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
116 $HOVER->update if $HOVER && $HOVER->{can_hover};
117
118 check_tooltip;
119 }
120
121 if ($HOVER) { 156 if $HOVER;
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
124 }
125} 157}
126 158
127# convert position array to integers 159# convert position array to integers
128sub harmonize { 160sub harmonize {
129 my ($vals) = @_; 161 my ($vals) = @_;
… …
135 $rem += $_ - $i; 167 $rem += $_ - $i;
136 $_ = $i; 168 $_ = $i;
137 } 169 }
138} 170}
139 171
172sub full_refresh {
173 # make a copy, otherwise for complains about freed values.
174 my @widgets = values %WIDGET;
175
176 $_->update
177 for @widgets;
178}
179
180sub reconfigure_widgets {
181 # make a copy, otherwise C<for> complains about freed values.
182 my @widgets = values %WIDGET;
183
184 $_->reconfigure
185 for @widgets;
186}
187
188# call when resolution changes etc.
189sub rescale_widgets {
190 my ($sx, $sy) = @_;
191
192 for my $widget (values %WIDGET) {
193 if ($widget->{is_toplevel}) {
194 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
195 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
196
197 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
198 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
199 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
200 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
201 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
202 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
203
204 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
205 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
206
207 }
208 }
209
210 reconfigure_widgets;
211}
212
140############################################################################# 213#############################################################################
141 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
142package CFClient::UI::Base; 223package CFPlus::UI::Base;
143 224
144use strict; 225use strict;
145 226
146use CFClient::OpenGL; 227use CFPlus::OpenGL;
147 228
148sub new { 229sub new {
149 my $class = shift; 230 my $class = shift;
150 231
151 my $self = bless { 232 my $self = bless {
152 x => 0, 233 x => "center",
153 y => 0, 234 y => "center",
154 z => 0, 235 z => 0,
236 w => undef,
237 h => undef,
155 can_events => 1, 238 can_events => 1,
156 @_ 239 @_
157 }, $class; 240 }, $class;
158 241
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
243
159 for (keys %$self) { 244 for (keys %$self) {
160 if (/^connect_(.*)$/) { 245 if (/^on_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
162 } 247 }
163 } 248 }
164 249
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
255
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258
259 $self->show if $layout->{show};
260 }
261
165 $self 262 $self
166} 263}
167 264
168sub destroy { 265sub destroy {
169 my ($self) = @_; 266 my ($self) = @_;
170 267
171 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
172 %$self = (); 270 %$self = ();
173} 271}
174 272
273sub TO_JSON {
274 { "\fw" => $_[0]{s_id} }
275}
276
175sub show { 277sub show {
176 my ($self) = @_; 278 my ($self) = @_;
177 279
178 return if $self->{parent}; 280 return if $self->{parent};
179 281
180 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
181} 283}
182 284
183sub hide { 285sub set_visible {
184 my ($self) = @_; 286 my ($self) = @_;
287
288 return if $self->{visible};
289
290 $self->{root} = $self->{parent}{root};
291 $self->{visible} = $self->{parent}{visible} + 1;
292
293 $self->emit (visibility_change => 1);
294
295 $self->realloc if !exists $self->{req_w};
296
297 $_->set_visible for $self->children;
298}
299
300sub set_invisible {
301 my ($self) = @_;
302
303 return unless $self->{visible};
304
305 $_->set_invisible for $self->children;
306
307 delete $self->{visible};
308 delete $self->{root};
185 309
186 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
188 312
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
314 if $TOOLTIP->{owner} == $self;
315
316 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0);
318}
319
320sub set_visibility {
321 my ($self, $visible) = @_;
322
323 return if $self->{visible} == $visible;
324
325 $visible ? $self->show
326 : $self->hide;
327}
328
329sub toggle_visibility {
330 my ($self) = @_;
331
332 $self->{visible}
333 ? $self->hide
334 : $self->show;
335}
336
337sub hide {
338 my ($self) = @_;
339
340 $self->set_invisible;
341
189 $self->{parent}->remove ($self) 342 $self->{parent}->remove ($self)
190 if $self->{parent}; 343 if $self->{parent};
191} 344}
192 345
193sub move { 346sub move_abs {
194 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
195 348
196 $self->{x} = int $x; 349 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
197 $self->{y} = int $y; 350 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
198 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
199 352
200 $self->update; 353 $self->update;
201} 354}
202 355
203sub set_size { 356sub set_size {
204 my ($self, $w, $h) = @_; 357 my ($self, $w, $h) = @_;
205 358
206 $self->{user_w} = $w; 359 $self->{force_w} = $w;
207 $self->{user_h} = $h; 360 $self->{force_h} = $h;
208 361
209 $self->check_size; 362 $self->realloc;
363}
364
365# travsle the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return ($self->{alloc_w}, $self->{alloc_h})
370 if $self->{alloc_w} && !$self->{root}{realloc}{$self+0};
371
372 return $self->{parent}->get_max_wh
373 if $self->{parent};
374
375 ($::WIDTH, $::HEIGHT)
210} 376}
211 377
212sub size_request { 378sub size_request {
213 require Carp; 379 require Carp;
214 Carp::confess "size_request is abstract"; 380 Carp::confess "size_request is abstract";
215} 381}
216 382
383sub baseline_shift {
384 0
385}
386
217sub configure { 387sub configure {
218 my ($self, $x, $y, $w, $h) = @_; 388 my ($self, $x, $y, $w, $h) = @_;
219 389
220 if ($self->{aspect}) { 390 if ($self->{aspect}) {
391 my ($ow, $oh) = ($w, $h);
392
221 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 393 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
222 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 394 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
223 395
224 # use alignment to adjust x, y 396 # use alignment to adjust x, y
225 397
226 $x += int +($w - $w2) * 0.5; 398 $x += int 0.5 * ($ow - $w);
227 $y += int +($h - $h2) * 0.5; 399 $y += int 0.5 * ($oh - $h);
228
229 ($w, $h) = ($w2, $h2);
230 } 400 }
231 401
232 if ($self->{x} != $x || $self->{y} != $y) { 402 if ($self->{x} ne $x || $self->{y} ne $y) {
233 $self->{x} = $x; 403 $self->{x} = $x;
234 $self->{y} = $y; 404 $self->{y} = $y;
235 $self->update; 405 $self->update;
236 } 406 }
237 407
238 if ($self->{w} != $w || $self->{h} != $h) { 408 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 409 return unless $self->{visible};
240 }
241}
242 410
243sub size_allocate { 411 $self->{alloc_w} = $w;
244 # nothing to be done 412 $self->{alloc_h} = $h;
413
414 $self->{root}{size_alloc}{$self+0} = $self;
415 }
245} 416}
246 417
247sub children { 418sub children {
419 # nop
248} 420}
249 421
250# call when resolution changes etc. 422sub visible_children {
251sub reconfigure { 423 $_[0]->children
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259} 424}
260 425
261sub set_max_size { 426sub set_max_size {
262 my ($self, $w, $h) = @_; 427 my ($self, $w, $h) = @_;
263 428
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 429 $self->{max_w} = int $w if defined $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 430 $self->{max_h} = int $h if defined $h;
431
432 $self->realloc;
433}
434
435sub set_tooltip {
436 my ($self, $tooltip) = @_;
437
438 $tooltip =~ s/^\s+//;
439 $tooltip =~ s/\s+$//;
440
441 return if $self->{tooltip} eq $tooltip;
442
443 $self->{tooltip} = $tooltip;
444
445 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
446 delete $CFPlus::UI::TOOLTIP->{owner};
447 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
448 }
266} 449}
267 450
268# translate global coordinates to local coordinate system 451# translate global coordinates to local coordinate system
269sub coord2local { 452sub coord2local {
270 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
271 454
455 Carp::confess unless $self->{parent};#d#
456
272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 457 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
273} 458}
274 459
275# translate local coordinates to global coordinate system 460# translate local coordinates to global coordinate system
276sub coord2global { 461sub coord2global {
277 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
278 463
464 Carp::confess unless $self->{parent};#d#
465
279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 466 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
280} 467}
281 468
282sub focus_in { 469sub invoke_focus_in {
283 my ($self) = @_; 470 my ($self) = @_;
284 471
285 return if $FOCUS == $self; 472 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 473 return unless $self->{can_focus};
287 474
288 my $focus = $FOCUS; $FOCUS = $self; 475 $FOCUS = $self;
289 476
290 $self->emit (focus_in => $focus); 477 $self->update;
291 478
292 $focus->update if $focus; 479 0
293 $FOCUS->update;
294} 480}
295 481
296sub focus_out { 482sub invoke_focus_out {
297 my ($self) = @_; 483 my ($self) = @_;
298 484
299 return unless $FOCUS == $self; 485 return unless $FOCUS == $self;
300 486
301 my $focus = $FOCUS; undef $FOCUS; 487 undef $FOCUS;
302 488
303 $self->emit (focus_out => $focus); 489 $self->update;
304 490
305 $focus->update if $focus; #? 491 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
306} 492 unless $FOCUS;
307 493
494 0
495}
496
497sub grab_focus {
498 my ($self) = @_;
499
500 $FOCUS->emit ("focus_out") if $FOCUS;
501 $self->emit ("focus_in");
502}
503
308sub mouse_motion { } 504sub invoke_mouse_motion { 0 }
309sub button_up { } 505sub invoke_button_up { 0 }
310sub key_down { } 506sub invoke_key_down { 0 }
311sub key_up { } 507sub invoke_key_up { 0 }
508sub invoke_mouse_wheel { 0 }
312 509
313sub button_down { 510sub invoke_button_down {
314 my ($self, $ev, $x, $y) = @_; 511 my ($self, $ev, $x, $y) = @_;
315 512
316 $self->focus_in; 513 $self->grab_focus;
317}
318 514
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 515 0
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 516}
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
323sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
324 517
325sub draw { 518sub connect {
519 my ($self, $signal, $cb) = @_;
520
521 push @{ $self->{signal_cb}{$signal} }, $cb;
522
523 defined wantarray and CFPlus::guard {
524 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
525 @{ $self->{signal_cb}{$signal} };
526 }
527}
528
529sub disconnect_all {
326 my ($self) = @_; 530 my ($self, $signal) = @_;
327 531
328 return unless $self->{h} && $self->{w}; 532 delete $self->{signal_cb}{$signal};
329
330 glPushMatrix;
331 glTranslate $self->{x}, $self->{y}, 0;
332 $self->_draw;
333 glPopMatrix;
334
335 if ($self == $HOVER && $self->{can_hover}) {
336 my ($x, $y) = @$self{qw(x y)};
337
338 glColor 1, 0.8, 0.5, 0.2;
339 glEnable GL_BLEND;
340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
341 glBegin GL_QUADS;
342 glVertex $x , $y;
343 glVertex $x + $self->{w}, $y;
344 glVertex $x + $self->{w}, $y + $self->{h};
345 glVertex $x , $y + $self->{h};
346 glEnd;
347 glDisable GL_BLEND;
348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0;
356 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h};
359 glEnd;
360 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 }
363} 533}
364 534
365sub _draw { 535my %has_coords = (
366 my ($self) = @_; 536 button_down => 1,
537 button_up => 1,
538 mouse_motion => 1,
539 mouse_wheel => 1,
540);
367 541
368 warn "no draw defined for $self\n"; 542sub emit {
369} 543 my ($self, $signal, @args) = @_;
370 544
545 # I do not really like this solution, but I do not like duplication
546 # and needlessly verbose code, either.
547 my @append
548 = $has_coords{$signal}
549 ? $args[0]->xy ($self)
550 : ();
551
552 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
553
554 for my $cb (
555 @{$self->{signal_cb}{$signal} || []}, # before
556 ($self->can ("invoke_$signal") || sub { 1 }), # closure
557 ) {
558 return $cb->($self, @args, @append) || next;
559 }
560
561 # parent
562 $self->{parent} && $self->{parent}->emit ($signal, @args)
563}
564
371sub find_widget { 565#sub find_widget {
372 my ($self, $x, $y) = @_; 566# in .xs
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382 567
383sub set_parent { 568sub set_parent {
384 my ($self, $parent) = @_; 569 my ($self, $parent) = @_;
385 570
386 Scalar::Util::weaken ($self->{parent} = $parent); 571 CFPlus::weaken ($self->{parent} = $parent);
387 572 $self->set_visible if $parent->{visible};
388 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
391} 573}
392 574
393sub check_size { 575sub realloc {
394 my ($self, $forced) = @_; 576 my ($self) = @_;
395 577
396 $self->{force_alloc} = 1 if $forced; 578 if ($self->{visible}) {
397 $CFClient::UI::ROOT->{check_size}{$self} = $self; 579 return if $self->{root}{realloc}{$self+0};
580
581 $self->{root}{realloc}{$self+0} = $self;
582 $self->{root}->update;
583 } else {
584 delete $self->{req_w};
585 delete $self->{req_h};
586 }
398} 587}
399 588
400sub update { 589sub update {
401 my ($self) = @_; 590 my ($self) = @_;
402 591
403 $self->{parent}->update 592 $self->{parent}->update
404 if $self->{parent}; 593 if $self->{parent};
405} 594}
406 595
407sub connect { 596sub reconfigure {
408 my ($self, $signal, $cb) = @_; 597 my ($self) = @_;
409 598
410 push @{ $self->{signal_cb}{$signal} }, $cb; 599 $self->realloc;
600 $self->update;
411} 601}
412 602
413sub emit { 603# using global variables seems a bit hacky, but passing through all drawing
414 my ($self, $signal, @args) = @_; 604# functions seems pointless.
605our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
415 606
416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 607#sub draw {
608#CFPlus.xs
609
610sub _draw {
611 my ($self) = @_;
612
613 warn "no draw defined for $self\n";
417} 614}
418 615
419sub DESTROY { 616sub DESTROY {
420 my ($self) = @_; 617 my ($self) = @_;
421 618
422 #$self->deactivate; 619 return if CFPlus::in_destruct;
620
621 local $@;
622 eval { $self->destroy };
623 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
624
625 delete $WIDGET{$self+0};
423} 626}
424 627
425############################################################################# 628#############################################################################
426 629
427package CFClient::UI::DrawBG; 630package CFPlus::UI::DrawBG;
428 631
429our @ISA = CFClient::UI::Base::; 632our @ISA = CFPlus::UI::Base::;
430 633
431use strict; 634use strict;
432use CFClient::OpenGL; 635use CFPlus::OpenGL;
433 636
434sub new { 637sub new {
435 my $class = shift; 638 my $class = shift;
436 639
437 # range [value, low, high, page]
438
439 $class->SUPER::new ( 640 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 641 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 642 #active_bg => [1, 1, 1, 0.5],
442 @_ 643 @_
443 ) 644 )
444} 645}
445 646
446sub _draw { 647sub _draw {
447 my ($self) = @_; 648 my ($self) = @_;
448 649
650 my $color = $FOCUS == $self && $self->{active_bg}
651 ? $self->{active_bg}
652 : $self->{bg};
653
654 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 655 my ($w, $h) = @$self{qw(w h)};
450 656
451 glEnable GL_BLEND; 657 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 658 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 659 glColor_premultiply @$color;
454 660 glRect 0, 0, $w, $h;
455 glBegin GL_QUADS;
456 glVertex 0 , 0;
457 glVertex 0 , $h;
458 glVertex $w, $h;
459 glVertex $w, 0;
460 glEnd;
461
462 glDisable GL_BLEND; 661 glDisable GL_BLEND;
662 }
463} 663}
464 664
465############################################################################# 665#############################################################################
466 666
467package CFClient::UI::Empty; 667package CFPlus::UI::Empty;
468 668
469our @ISA = CFClient::UI::Base::; 669our @ISA = CFPlus::UI::Base::;
470 670
471sub new { 671sub new {
472 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg); 673 $class->SUPER::new (can_events => 0, %arg);
474} 674}
475 675
476sub size_request { 676sub size_request {
477 (0, 0) 677 my ($self) = @_;
678
679 ($self->{w} + 0, $self->{h} + 0)
478} 680}
479 681
480sub draw { } 682sub draw { }
481 683
482############################################################################# 684#############################################################################
483 685
484package CFClient::UI::Container; 686package CFPlus::UI::Container;
485 687
486our @ISA = CFClient::UI::Base::; 688our @ISA = CFPlus::UI::Base::;
487 689
488sub new { 690sub new {
489 my ($class, %arg) = @_; 691 my ($class, %arg) = @_;
490 692
491 my $children = delete $arg{children} || []; 693 my $children = delete $arg{children};
492 694
493 my $self = $class->SUPER::new ( 695 my $self = $class->SUPER::new (
494 children => [], 696 children => [],
495 can_events => 0, 697 can_events => 0,
496 %arg, 698 %arg,
497 ); 699 );
700
498 $self->add ($_) for @$children; 701 $self->add (@$children)
702 if $children && @$children;
499 703
500 $self 704 $self
705}
706
707sub realloc {
708 my ($self) = @_;
709
710 $self->{force_realloc} = 1;
711 $self->{force_size_alloc} = 1;
712 $self->SUPER::realloc;
501} 713}
502 714
503sub add { 715sub add {
504 my ($self, @widgets) = @_; 716 my ($self, @widgets) = @_;
505 717
506 $_->set_parent ($self) 718 $_->set_parent ($self)
507 for @widgets; 719 for @widgets;
508 720
721 # TODO: only do this in widgets that need it, e.g. root, fixed
509 use sort 'stable'; 722 use sort 'stable';
510 723
511 $self->{children} = [ 724 $self->{children} = [
512 sort { $a->{z} <=> $b->{z} } 725 sort { $a->{z} <=> $b->{z} }
513 @{$self->{children}}, @widgets 726 @{$self->{children}}, @widgets
514 ]; 727 ];
515 728
516 $self->check_size (1); 729 $self->realloc;
517 $self->update; 730
731 $self->emit (c_add => \@widgets);
732
733 map $_+0, @widgets
518} 734}
519 735
520sub children { 736sub children {
521 @{ $_[0]{children} } 737 @{ $_[0]{children} }
522} 738}
523 739
524sub remove { 740sub remove {
525 my ($self, $child) = @_; 741 my ($self, @widgets) = @_;
526 742
743 $self->emit (c_remove => \@widgets);
744
745 for my $child (@widgets) {
527 delete $child->{parent}; 746 delete $child->{parent};
528 $child->hide; 747 $child->hide;
529
530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 748 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
749 }
531 750
532 $self->check_size; 751 $self->realloc;
533 $self->update;
534} 752}
535 753
536sub clear { 754sub clear {
537 my ($self) = @_; 755 my ($self) = @_;
538 756
539 my $children = delete $self->{children}; 757 my $children = $self->{children};
540 $self->{children} = []; 758 $self->{children} = [];
541 759
542 for (@$children) { 760 for (@$children) {
543 delete $_->{parent}; 761 delete $_->{parent};
544 $_->hide; 762 $_->hide;
545 } 763 }
546 764
547 $self->check_size; 765 $self->realloc;
548 $self->update;
549} 766}
550 767
551sub find_widget { 768sub find_widget {
552 my ($self, $x, $y) = @_; 769 my ($self, $x, $y) = @_;
553 770
554 $x -= $self->{x}; 771 $x -= $self->{x};
555 $y -= $self->{y}; 772 $y -= $self->{y};
556 773
557 my $res; 774 my $res;
558 775
559 for (reverse @{ $self->{children} }) { 776 for (reverse $self->visible_children) {
560 $res = $_->find_widget ($x, $y) 777 $res = $_->find_widget ($x, $y)
561 and return $res; 778 and return $res;
562 } 779 }
563 780
564 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 781 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
565} 782}
566 783
567sub _draw { 784sub _draw {
568 my ($self) = @_; 785 my ($self) = @_;
569 786
570 $_->draw for @{$self->{children}}; 787 $_->draw for $self->visible_children;
571} 788}
572 789
573############################################################################# 790#############################################################################
574 791
575package CFClient::UI::Bin; 792package CFPlus::UI::Bin;
576 793
577our @ISA = CFClient::UI::Container::; 794our @ISA = CFPlus::UI::Container::;
578 795
579sub new { 796sub new {
580 my ($class, %arg) = @_; 797 my ($class, %arg) = @_;
581 798
582 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 799 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
583 800
584 $class->SUPER::new (children => [$child], %arg) 801 $class->SUPER::new (children => [$child], %arg)
585} 802}
586 803
587sub add { 804sub add {
588 my ($self, $child) = @_; 805 my ($self, $child) = @_;
589 806
590 $self->{children} = []; 807 $self->clear;
591
592 $self->SUPER::add ($child); 808 $self->SUPER::add ($child);
593} 809}
594 810
595sub remove { 811sub remove {
596 my ($self, $widget) = @_; 812 my ($self, $widget) = @_;
597 813
598 $self->SUPER::remove ($widget); 814 $self->SUPER::remove ($widget);
599 815
600 $self->{children} = [new CFClient::UI::Empty] 816 $self->{children} = [new CFPlus::UI::Empty]
601 unless @{$self->{children}}; 817 unless @{$self->{children}};
602} 818}
603 819
604sub child { $_[0]->{children}[0] } 820sub child { $_[0]->{children}[0] }
605 821
606sub size_request { 822sub size_request {
607 $_[0]{children}[0]->size_request 823 $_[0]{children}[0]->size_request
608} 824}
609 825
610sub size_allocate { 826sub invoke_size_allocate {
611 my ($self, $w, $h) = @_; 827 my ($self, $w, $h) = @_;
612 828
613 $self->{children}[0]->configure (0, 0, $w, $h); 829 $self->{children}[0]->configure (0, 0, $w, $h);
830
831 1
614} 832}
615 833
616############################################################################# 834#############################################################################
835# back-buffered drawing area
617 836
618package CFClient::UI::Window; 837package CFPlus::UI::Window;
619 838
620our @ISA = CFClient::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
621 840
622use CFClient::OpenGL; 841use CFPlus::OpenGL;
623 842
624sub new { 843sub new {
625 my ($class, %arg) = @_; 844 my ($class, %arg) = @_;
626 845
627 my $self = $class->SUPER::new (%arg); 846 my $self = $class->SUPER::new (%arg);
… …
632 851
633 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 852 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 853 $self->SUPER::update;
635} 854}
636 855
637sub size_allocate { 856sub invoke_size_allocate {
638 my ($self, $w, $h) = @_; 857 my ($self, $w, $h) = @_;
639 858
640 $self->SUPER::size_allocate ($w, $h);
641 $self->update; 859 $self->update;
860
861 $self->SUPER::invoke_size_allocate ($w, $h)
642} 862}
643 863
644sub _render { 864sub _render {
865 my ($self) = @_;
866
645 $_[0]{children}[0]->draw; 867 $self->{children}[0]->draw;
646} 868}
647 869
648sub render_child { 870sub render_child {
649 my ($self) = @_; 871 my ($self) = @_;
650 872
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 873 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0; 874 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 875 glClear GL_COLOR_BUFFER_BIT;
654 876
877 {
878 package CFPlus::UI::Base;
879
880 local ($draw_x, $draw_y, $draw_w, $draw_h) =
881 (0, 0, $self->{w}, $self->{h});
882
655 $self->_render; 883 $self->_render;
656# glColorMask 1, 1, 1, 0; 884 }
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 885 };
664} 886}
665 887
666sub _draw { 888sub _draw {
667 my ($self) = @_; 889 my ($self) = @_;
668
669 my ($w, $h) = ($self->w, $self->h);
670 890
671 my $tex = $self->{texture} 891 my $tex = $self->{texture}
672 or return; 892 or return;
673 893
674 glEnable GL_TEXTURE_2D; 894 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 896 glColor 0, 0, 0, 1;
677 897
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 898 $tex->draw_quad_alpha_premultiplied (0, 0);
679 899
680 glDisable GL_TEXTURE_2D; 900 glDisable GL_TEXTURE_2D;
681} 901}
682 902
683############################################################################# 903#############################################################################
684 904
685package CFClient::UI::ViewPort; 905package CFPlus::UI::ViewPort;
686 906
907use List::Util qw(min max);
908
687our @ISA = CFClient::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
910
911sub new {
912 my $class = shift;
913
914 $class->SUPER::new (
915 scroll_x => 0,
916 scroll_y => 1,
917 @_,
918 )
919}
688 920
689sub size_request { 921sub size_request {
690 my ($self) = @_; 922 my ($self) = @_;
691 923
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 925
695 @$self{qw(child_w child_h)} 926 $w = 1 if $self->{scroll_x};
696} 927 $h = 1 if $self->{scroll_y};
697 928
929 ($w, $h)
930}
931
698sub size_allocate { 932sub invoke_size_allocate {
699 my ($self, $w, $h) = @_; 933 my ($self, $w, $h) = @_;
700 934
935 my $child = $self->child;
936
937 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
938 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
939
940 $self->child->configure (0, 0, $w, $h);
701 $self->update; 941 $self->update;
942
943 1
702} 944}
703 945
704sub set_offset { 946sub set_offset {
705 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
706 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
707 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
708 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
709 955
956 $self->emit (changed => $x, $y);
710 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
976 }
711} 977}
712 978
713# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local { 980sub coord2local {
715 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
730 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
731 997
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) { 1000 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else { 1002 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
738 } 1004 }
739} 1005}
740 1006
741sub _render { 1007sub _render {
742 my ($self) = @_; 1008 my ($self) = @_;
743 1009
1010 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1011 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1012
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745 1014
746 $self->SUPER::_render; 1015 $self->SUPER::_render;
747} 1016}
748 1017
749############################################################################# 1018#############################################################################
750 1019
751package CFClient::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
752 1021
753our @ISA = CFClient::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
754 1023
755sub new { 1024sub new {
756 my $class = shift; 1025 my ($class, %arg) = @_;
1026
1027 my $child = delete $arg{child};
757 1028
758 my $self; 1029 my $self;
759 1030
760 my $slider = new CFClient::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 c_col => 0,
1033 c_row => 1,
761 vertical => 1, 1034 vertical => 0,
762 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 1036 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
765 }, 1039 },
766 ; 1040 ;
767 1041
1042 my $vslider = new CFPlus::UI::Slider
1043 c_col => 1,
1044 c_row => 0,
1045 vertical => 1,
1046 range => [0, 0, 1, 0.01], # HACK fix
1047 on_changed => sub {
1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1050 },
1051 ;
1052
768 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 1054 scroll_x => 0,
1055 scroll_y => 1,
1056 can_events => 1,
770 slider => $slider, 1057 hslider => $hslider,
771 @_, 1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
1061 %arg,
772 ); 1062 );
773 1063
774 $self->{vp}->add ($self->{scrolled}); 1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 c_col => 0,
1066 c_row => 0,
1067 expand => 1,
1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_;
1072
1073 $vp->{parent}{hslider}->set_value ($x);
1074 $vp->{parent}{vslider}->set_value ($y);
1075
1076 0
1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1083 ;
1084
775 $self->add ($self->{vp}); 1085 $self->SUPER::add ($self->{vp});
776 $self->add ($self->{slider}); 1086
1087 $self->add ($child) if $child;
777 1088
778 $self 1089 $self
779} 1090}
780 1091
781#TODO# update range on size_allocate depending on child 1092sub add {
782# update viewport offset on scroll 1093 my ($self, $widget) = @_;
1094
1095 $self->{vp}->add ($self->{child} = $widget);
1096}
1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 if ($self->{scroll_x}) {
1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1110
1111 my $visible = $w1 > $w2;
1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1117 }
1118
1119 if ($self->{scroll_y}) {
1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1122
1123 my $visible = $h1 > $h2;
1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
1133 my ($self, $ev) = @_;
1134
1135 $self->grab_focus;
1136
1137 my $ox = $self->{vp}{view_x};
1138 my $oy = $self->{vp}{view_y};
1139
1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1147 };
1148}
1149
1150sub invoke_mouse_wheel {
1151 my ($self, $ev) = @_;
1152
1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1155
1156 1
1157}
1158
1159sub invoke_button_down {
1160 my ($self, $ev, $x, $y) = @_;
1161
1162 if ($ev->{button} == 2) {
1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1189}
1190
1191sub invoke_size_allocate {
1192 my ($self, $w, $h) = @_;
1193
1194 $self->update_slider;
1195 $self->SUPER::invoke_size_allocate ($w, $h)
1196}
783 1197
784############################################################################# 1198#############################################################################
785 1199
786package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
787 1201
788our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
789 1203
790use CFClient::OpenGL; 1204use CFPlus::OpenGL;
791 1205
792sub new { 1206sub new {
793 my $class = shift; 1207 my $class = shift;
794 1208
795 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
803 1217
804 if ($self->{bg}) { 1218 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
806 1220
807 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
809 glColor @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
810
811 glBegin GL_QUADS;
812 glVertex 0 , 0;
813 glVertex 0 , $h;
814 glVertex $w, $h; 1224 glRect 0, 0, $w, $h;
815 glVertex $w, 0;
816 glEnd;
817
818 glDisable GL_BLEND; 1225 glDisable GL_BLEND;
819 } 1226 }
820 1227
821 $self->SUPER::_draw; 1228 $self->SUPER::_draw;
822} 1229}
823 1230
824############################################################################# 1231#############################################################################
825 1232
826package CFClient::UI::FancyFrame; 1233package CFPlus::UI::FancyFrame;
827 1234
828our @ISA = CFClient::UI::Bin::; 1235our @ISA = CFPlus::UI::Bin::;
829 1236
830use CFClient::OpenGL; 1237use CFPlus::OpenGL;
831
832my @tex =
833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
834 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
835 1238
836sub new { 1239sub new {
837 my $class = shift; 1240 my ($class, %arg) = @_;
838 1241
839 # TODO: user_x, user_y, overwrite moveto? 1242 if ((exists $arg{label}) && !ref $arg{label}) {
1243 $arg{label} = new CFPlus::UI::Label
1244 align => 1,
1245 valign => 0,
1246 text => $arg{label},
1247 fontsize => ($arg{border} || 0.8) * 0.75;
1248 }
840 1249
841 my $self = $class->SUPER::new ( 1250 my $self = $class->SUPER::new (
1251 # label => "",
842 bg => [1, 1, 1, 1], 1252 fg => [0.6, 0.3, 0.1],
843 border_bg => [1, 1, 1, 1],
844 border => 0.6, 1253 border => 0.8,
845 can_events => 1, 1254 style => 'single',
846 @_ 1255 %arg,
847 ); 1256 );
848 1257
849 $self->{title} &&= new CFClient::UI::Label
850 align => 0,
851 valign => 1,
852 text => $self->{title},
853 fontsize => $self->{border};
854
855 $self 1258 $self
1259}
1260
1261sub add {
1262 my ($self, @widgets) = @_;
1263
1264 $self->SUPER::add (@widgets);
1265 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
856} 1266}
857 1267
858sub border { 1268sub border {
859 int $_[0]{border} * $::FONTSIZE 1269 int $_[0]{border} * $::FONTSIZE
860} 1270}
861 1271
862sub size_request { 1272sub size_request {
863 my ($self) = @_; 1273 my ($self) = @_;
1274
1275 ($self->{label_w}, undef) = $self->{label}->size_request
1276 if $self->{label};
864 1277
865 my ($w, $h) = $self->SUPER::size_request; 1278 my ($w, $h) = $self->SUPER::size_request;
866 1279
867 ( 1280 (
868 $w + $self->border * 2, 1281 $w + $self->border * 2,
869 $h + $self->border * 2, 1282 $h + $self->border * 2,
870 ) 1283 )
871} 1284}
872 1285
873sub size_allocate { 1286sub invoke_size_allocate {
874 my ($self, $w, $h) = @_; 1287 my ($self, $w, $h) = @_;
875 1288
876 $h -= List::Util::max 0, $self->border * 2; 1289 my $border = $self->border;
1290
877 $w -= List::Util::max 0, $self->border * 2; 1291 $w -= List::Util::max 0, $border * 2;
1292 $h -= List::Util::max 0, $border * 2;
878 1293
879 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1294 if (my $label = $self->{label}) {
880 if $self->{title}; 1295 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1296 $label->{h} = List::Util::min $h, $border;
1297 $label->invoke_size_allocate ($label->{w}, $label->{h});
1298 }
881 1299
882 $self->child->configure ($self->border, $self->border, $w, $h); 1300 $self->child->configure ($border, $border, $w, $h);
883}
884 1301
1302 1
1303}
1304
1305sub _draw {
1306 my ($self) = @_;
1307
1308 my $child = $self->{children}[0];
1309
1310 my $border = $self->border;
1311 my ($w, $h) = ($self->{w}, $self->{h});
1312
1313 $child->draw;
1314
1315 glColor @{$self->{fg}};
1316 glBegin GL_LINE_STRIP;
1317 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1318 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1319 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1320 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1321 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1322 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1323 glEnd;
1324
1325 if ($self->{label}) {
1326 glTranslate $border * 2, 0;
1327 $self->{label}->_draw;
1328 }
1329}
1330
1331#############################################################################
1332
1333package CFPlus::UI::Toplevel;
1334
1335our @ISA = CFPlus::UI::Bin::;
1336
1337use CFPlus::OpenGL;
1338
1339my $bg =
1340 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1341 mipmap => 1, wrap => 1;
1342
1343my @border =
1344 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1345 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1346
1347my @icon =
1348 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1349 qw(x1_move.png x1_resize.png);
1350
1351sub new {
1352 my ($class, %arg) = @_;
1353
1354 my $self = $class->SUPER::new (
1355 bg => [1, 1, 1, 1],
1356 border_bg => [1, 1, 1, 1],
1357 border => 0.6,
1358 can_events => 1,
1359 min_w => 64,
1360 min_h => 32,
1361 %arg,
1362 );
1363
1364 $self->{title_widget} = new CFPlus::UI::Label
1365 align => 0,
1366 valign => 1,
1367 text => $self->{title},
1368 fontsize => $self->{border},
1369 if exists $self->{title};
1370
1371 if ($self->{has_close_button}) {
1372 $self->{close_button} =
1373 new CFPlus::UI::ImageButton
1374 path => 'x1_close.png',
1375 on_activate => sub { $self->emit ("delete") };
1376
1377 $self->CFPlus::UI::Container::add ($self->{close_button});
1378 }
1379
1380 $self
1381}
1382
1383sub add {
1384 my ($self, @widgets) = @_;
1385
1386 $self->SUPER::add (@widgets);
1387 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1388 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1389}
1390
1391sub border {
1392 int $_[0]{border} * $::FONTSIZE
1393}
1394
1395sub size_request {
1396 my ($self) = @_;
1397
1398 $self->{title_widget}->size_request
1399 if $self->{title_widget};
1400
1401 $self->{close_button}->size_request
1402 if $self->{close_button};
1403
1404 my ($w, $h) = $self->SUPER::size_request;
1405
1406 (
1407 $w + $self->border * 2,
1408 $h + $self->border * 2,
1409 )
1410}
1411
1412sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_;
1414
1415 if ($self->{title_widget}) {
1416 $self->{title_widget}{w} = $w;
1417 $self->{title_widget}{h} = $h;
1418 $self->{title_widget}->invoke_size_allocate ($w, $h);
1419 }
1420
1421 my $border = $self->border;
1422
1423 $h -= List::Util::max 0, $border * 2;
1424 $w -= List::Util::max 0, $border * 2;
1425
1426 $self->child->configure ($border, $border, $w, $h);
1427
1428 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1429 if $self->{close_button};
1430
1431 1
1432}
1433
1434sub invoke_delete {
1435 my ($self) = @_;
1436
1437 $self->hide;
1438
1439 1
1440}
1441
885sub button_down { 1442sub invoke_button_down {
886 my ($self, $ev, $x, $y) = @_; 1443 my ($self, $ev, $x, $y) = @_;
887 1444
888 my ($w, $h) = @$self{qw(w h)}; 1445 my ($w, $h) = @$self{qw(w h)};
889 my $border = $self->border; 1446 my $border = $self->border;
890 1447
… …
903 my ($ev, $x, $y) = @_; 1460 my ($ev, $x, $y) = @_;
904 1461
905 my $dx = $ev->{x} - $ox; 1462 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy; 1463 my $dy = $ev->{y} - $oy;
907 1464
908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1465 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1466 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1467
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1468 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
911 $self->check_size; 1469 $self->realloc;
912 }; 1470 };
913 1471
914 } elsif ($lr ^ $td) { 1472 } elsif ($lr ^ $td) {
915 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1473 my ($ox, $oy) = ($ev->{x}, $ev->{y});
916 my ($bx, $by) = ($self->{x}, $self->{y}); 1474 my ($bx, $by) = ($self->{x}, $self->{y});
… …
918 $self->{motion} = sub { 1476 $self->{motion} = sub {
919 my ($ev, $x, $y) = @_; 1477 my ($ev, $x, $y) = @_;
920 1478
921 ($x, $y) = ($ev->{x}, $ev->{y}); 1479 ($x, $y) = ($ev->{x}, $ev->{y});
922 1480
923 $self->move ($bx + $x - $ox, $by + $y - $oy); 1481 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
924 $self->update; 1482 # HACK: the next line is required to enforce placement
1483 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
925 }; 1484 };
1485 } else {
1486 return 0;
1487 }
1488
926 } 1489 1
927} 1490}
928 1491
929sub button_up { 1492sub invoke_button_up {
930 my ($self, $ev, $x, $y) = @_; 1493 my ($self, $ev, $x, $y) = @_;
931 1494
932 delete $self->{motion}; 1495 ! ! delete $self->{motion}
933} 1496}
934 1497
935sub mouse_motion { 1498sub invoke_mouse_motion {
936 my ($self, $ev, $x, $y) = @_; 1499 my ($self, $ev, $x, $y) = @_;
937 1500
938 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1501 $self->{motion}->($ev, $x, $y) if $self->{motion};
1502
1503 ! ! $self->{motion}
1504}
1505
1506sub invoke_visibility_change {
1507 my ($self, $visible) = @_;
1508
1509 delete $self->{motion} unless $visible;
1510
1511 0
939} 1512}
940 1513
941sub _draw { 1514sub _draw {
942 my ($self) = @_; 1515 my ($self) = @_;
943 1516
1517 my $child = $self->{children}[0];
1518
944 my ($w, $h ) = ($self->{w}, $self->{h}); 1519 my ($w, $h ) = ($self->{w}, $self->{h});
945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1520 my ($cw, $ch) = ($child->{w}, $child->{h});
946 1521
947 glEnable GL_TEXTURE_2D; 1522 glEnable GL_TEXTURE_2D;
948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1523 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
949 1524
950 my $border = $self->border; 1525 my $border = $self->border;
951 1526
952 glColor @{ $self->{border_bg} }; 1527 glColor @{ $self->{border_bg} };
953 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1528 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1529 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1530 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1531 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1532
1533 # move
1534 my $w2 = ($w - $border) * .5;
1535 my $h2 = ($h - $border) * .5;
1536 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1537 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1538 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1539
1540 # resize
1541 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1542 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1543 unless $self->{has_close_button};
1544 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1545 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
957 1546
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1547 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
959 my $bg = $tex[0]; 1548 glColor @{ $self->{bg} };
960 1549
961 # TODO: repeat texture not scale 1550 # TODO: repeat texture not scale
1551 # solve this better(?)
962 my $rep_x = $cw / $bg->{w}; 1552 $bg->{s} = $cw / $bg->{w};
963 my $rep_y = $ch / $bg->{h}; 1553 $bg->{t} = $ch / $bg->{h};
964
965 glColor @{ $self->{bg} };
966
967 $bg->{s} = $rep_x;
968 $bg->{t} = $rep_y;
969 $bg->{wrap_mode} = 1;
970 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1554 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 } 1555 }
972 1556
973 glDisable GL_TEXTURE_2D; 1557 glDisable GL_TEXTURE_2D;
974 1558
975 $self->{title}->draw if $self->{title};
976
977 $self->child->draw; 1559 $child->draw;
1560
1561 if ($self->{title_widget}) {
1562 glTranslate 0, $border - $self->{h};
1563 $self->{title_widget}->_draw;
1564
1565 glTranslate 0, - ($border - $self->{h});
1566 }
1567
1568 $self->{close_button}->draw
1569 if $self->{close_button};
978} 1570}
979 1571
980############################################################################# 1572#############################################################################
981 1573
982package CFClient::UI::Table; 1574package CFPlus::UI::Table;
983 1575
984our @ISA = CFClient::UI::Base::; 1576our @ISA = CFPlus::UI::Container::;
985 1577
986use List::Util qw(max sum); 1578use List::Util qw(max sum);
987 1579
988use CFClient::OpenGL; 1580use CFPlus::OpenGL;
989 1581
990sub new { 1582sub new {
991 my $class = shift; 1583 my $class = shift;
992 1584
993 $class->SUPER::new ( 1585 $class->SUPER::new (
994 col_expand => [], 1586 col_expand => [],
1587 row_expand => [],
995 @_ 1588 @_,
996 ) 1589 )
997} 1590}
998 1591
999sub add { 1592sub add {
1000 my ($self, $x, $y, $child) = @_;
1001
1002 $child->set_parent ($self);
1003 $self->{children}[$y][$x] = $child;
1004
1005 $child->check_size;
1006}
1007
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010}
1011
1012# TODO: move to container class maybe? send childs a signal on removal?
1013sub clear {
1014 my ($self) = @_; 1593 my ($self, @widgets) = @_;
1594
1595 for my $child (@widgets) {
1596 $child->{c_rowspan} ||= 1;
1597 $child->{c_colspan} ||= 1;
1598 }
1599
1600 $self->SUPER::add (@widgets);
1601}
1602
1603sub add_at {
1604 my $self = shift;
1605
1606 my @widgets;
1607
1608 while (@_) {
1609 my ($col, $row, $child) = splice @_, 0, 3, ();
1610
1611 $child->{c_row} = $row;
1612 $child->{c_col} = $col;
1613
1614 push @widgets, $child;
1615 }
1616
1617 $self->add (@widgets);
1618}
1619
1620sub get_wh {
1621 my ($self) = @_;
1622
1623 my (@w, @h);
1015 1624
1016 my @children = $self->children; 1625 my @children = $self->children;
1017 delete $self->{children}; 1626
1627 # first pass, columns
1628 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1629 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1630
1631 my $sw = sum @w[$c .. $c + $cs - 1];
1632
1633 if ($w > $sw) {
1634 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1635 }
1018 1636 }
1019 for (@children) {
1020 delete $_->{parent};
1021 $_->hide;
1022 }
1023 1637
1024 $self->update; 1638 # second pass, rows
1025} 1639 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1026
1027sub get_wh {
1028 my ($self) = @_;
1029
1030 my (@w, @h);
1031
1032 for my $y (0 .. $#{$self->{children}}) {
1033 my $row = $self->{children}[$y]
1034 or next;
1035
1036 for my $x (0 .. $#$row) {
1037 my $widget = $row->[$x]
1038 or next;
1039 my ($w, $h) = @$widget{qw(req_w req_h)}; 1640 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1040 1641
1041 $w[$x] = max $w[$x], $w; 1642 my $sh = sum @h[$r .. $r + $rs - 1];
1042 $h[$y] = max $h[$y], $h; 1643
1644 if ($h > $sh) {
1645 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1043 } 1646 }
1044 } 1647 }
1045 1648
1046 (\@w, \@h) 1649 (\@w, \@h)
1047} 1650}
… …
1055 (sum @$ws), 1658 (sum @$ws),
1056 (sum @$hs), 1659 (sum @$hs),
1057 ) 1660 )
1058} 1661}
1059 1662
1060sub size_allocate { 1663sub invoke_size_allocate {
1061 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1062 1665
1063 my ($ws, $hs) = $self->get_wh; 1666 my ($ws, $hs) = $self->get_wh;
1064 1667
1065 my $req_w = sum @$ws; 1668 my $req_w = (sum @$ws) || 1;
1066 my $req_h = sum @$hs; 1669 my $req_h = (sum @$hs) || 1;
1067 1670
1068 # TODO: nicer code && do row_expand 1671 # now linearly scale the rows/columns to the allocated size
1069 my @col_expand = @{$self->{col_expand}}; 1672 my @col_expand = @{$self->{col_expand}};
1070 @col_expand = (1) x @$ws unless @col_expand; 1673 @col_expand = (1) x @$ws unless @col_expand;
1071 my $col_expand = (sum @col_expand) || 1; 1674 my $col_expand = (sum @col_expand) || 1;
1072 1675
1073 # linearly scale sizes
1074 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1676 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1075 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1076 1677
1077 CFClient::UI::harmonize $ws; 1678 CFPlus::UI::harmonize $ws;
1679
1680 my @row_expand = @{$self->{row_expand}};
1681 @row_expand = (1) x @$ws unless @row_expand;
1682 my $row_expand = (sum @row_expand) || 1;
1683
1684 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1685
1078 CFClient::UI::harmonize $hs; 1686 CFPlus::UI::harmonize $hs;
1079 1687
1080 my $y; 1688 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1689 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1081 1690
1082 for my $r (0 .. $#{$self->{children}}) { 1691 for my $widget ($self->children) {
1083 my $row = $self->{children}[$r] 1692 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1084 or next;
1085 1693
1086 my $x = 0; 1694 $widget->configure (
1087 my $row_h = $hs->[$r]; 1695 $x[$c], $y[$r],
1696 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1088 1697 );
1089 for my $c (0 .. $#$row) { 1698 }
1090 my $col_w = $ws->[$c];
1091 1699
1092 if (my $widget = $row->[$c]) { 1700 1
1093 $widget->configure ($x, $y, $col_w, $row_h); 1701}
1094 }
1095 1702
1096 $x += $col_w; 1703#############################################################################
1704
1705package CFPlus::UI::Fixed;
1706
1707use List::Util qw(min max);
1708
1709our @ISA = CFPlus::UI::Container::;
1710
1711sub _scale($$$) {
1712 my ($rel, $val, $max) = @_;
1713
1714 $rel ? $val * $max : $val
1715}
1716
1717sub size_request {
1718 my ($self) = @_;
1719
1720 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1721
1722 # determine overall size by querying abs widgets
1723 for my $child ($self->visible_children) {
1724 unless ($child->{c_rel}) {
1725 my $x = $child->{c_x};
1726 my $y = $child->{c_y};
1727
1728 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1729 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1097 } 1730 }
1098
1099 $y += $row_h;
1100 } 1731 }
1101 1732
1102} 1733 my $W = $x2 - $x1;
1734 my $H = $y2 - $y1;
1103 1735
1104sub find_widget { 1736 # now layout remaining widgets
1737 for my $child ($self->visible_children) {
1738 if ($child->{c_rel}) {
1739 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1740 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1741
1742 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1743 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1744 }
1745 }
1746
1747 my $W = $x2 - $x1;
1748 my $H = $y2 - $y1;
1749
1750 ($W, $H)
1751}
1752
1753sub invoke_size_allocate {
1105 my ($self, $x, $y) = @_; 1754 my ($self, $W, $H) = @_;
1106 1755
1107 $x -= $self->{x}; 1756 for my $child ($self->visible_children) {
1108 $y -= $self->{y}; 1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1109 1759
1110 my $res; 1760 $x += $child->{c_halign} * $child->{req_w};
1761 $y += $child->{c_valign} * $child->{req_h};
1111 1762
1112 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1763 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1113 $res = $_->find_widget ($x, $y) 1764 }
1114 and return $res; 1765
1115 } 1766 1
1116
1117 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1118}
1119
1120sub _draw {
1121 my ($self) = @_;
1122
1123 for (grep $_, @{$self->{children}}) {
1124 $_->draw for grep $_, @$_;
1125 }
1126} 1767}
1127 1768
1128############################################################################# 1769#############################################################################
1129 1770
1130package CFClient::UI::HBox; 1771package CFPlus::UI::Box;
1131 1772
1132# TODO: wrap into common Box base class
1133
1134our @ISA = CFClient::UI::Container::; 1773our @ISA = CFPlus::UI::Container::;
1135 1774
1136sub size_request { 1775sub size_request {
1137 my ($self) = @_; 1776 my ($self) = @_;
1138 1777
1139 my @alloc = map [$_->size_request], @{$self->{children}}; 1778 my @children = $self->visible_children;
1140 1779
1780 $self->{vertical}
1781 ? (
1782 (List::Util::max map $_->{req_w}, @children),
1783 (List::Util::sum map $_->{req_h}, @children),
1784 )
1785 : (
1786 (List::Util::sum map $_->{req_w}, @children),
1787 (List::Util::max map $_->{req_h}, @children),
1788 )
1789}
1790
1791sub invoke_size_allocate {
1792 my ($self, $w, $h) = @_;
1793
1794 my $space = $self->{vertical} ? $h : $w;
1795 my @children = $self->visible_children;
1796
1797 my @req;
1798
1799 if ($self->{homogeneous}) {
1800 @req = ($space / (@children || 1)) x @children;
1801 } else {
1802 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1803 my $req = List::Util::sum @req;
1804
1805 if ($req > $space) {
1806 # ah well, not enough space
1807 $_ *= $space / $req for @req;
1808 } else {
1809 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1810
1811 $space = ($space - $req) / $expand; # remaining space to give away
1812
1813 $req[$_] += $space * $children[$_]{expand}
1814 for 0 .. $#children;
1815 }
1141 ( 1816 }
1142 (List::Util::sum map $_->[0], @alloc), 1817
1143 (List::Util::max map $_->[1], @alloc), 1818 CFPlus::UI::harmonize \@req;
1819
1820 my $pos = 0;
1821 for (0 .. $#children) {
1822 my $alloc = $req[$_];
1823 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1824
1825 $pos += $alloc;
1826 }
1827
1828 1
1829}
1830
1831#############################################################################
1832
1833package CFPlus::UI::HBox;
1834
1835our @ISA = CFPlus::UI::Box::;
1836
1837sub new {
1838 my $class = shift;
1839
1840 $class->SUPER::new (
1841 vertical => 0,
1842 @_,
1144 ) 1843 )
1145} 1844}
1146 1845
1147sub size_allocate {
1148 my ($self, $w, $h) = @_;
1149
1150 ($h, $w) = ($w, $h);
1151
1152 my $children = $self->{children};
1153
1154 my @h = map $_->{req_w}, @$children;
1155
1156 my $req_h = List::Util::sum @h;
1157
1158 if ($req_h > $h) {
1159 # ah well, not enough space
1160 $_ *= $h / $req_h for @h;
1161 } else {
1162 my $exp = List::Util::sum map $_->{expand}, @$children;
1163 $exp ||= 1;
1164
1165 for (0 .. $#$children) {
1166 my $child = $children->[$_];
1167
1168 my $alloc_h = $h[$_];
1169 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1170 $h[$_] = $alloc_h;
1171 }
1172 }
1173
1174 CFClient::UI::harmonize \@h;
1175
1176 my $y = 0;
1177 for (0 .. $#$children) {
1178 my $child = $children->[$_];
1179 my $h = $h[$_];
1180 $child->configure ($y, 0, $h, $w);
1181
1182 $y += $h;
1183 }
1184
1185 1
1186}
1187
1188############################################################################# 1846#############################################################################
1189 1847
1190package CFClient::UI::VBox; 1848package CFPlus::UI::VBox;
1191 1849
1192# TODO: wrap into common Box base class 1850our @ISA = CFPlus::UI::Box::;
1193 1851
1194our @ISA = CFClient::UI::Container::; 1852sub new {
1853 my $class = shift;
1195 1854
1196sub size_request { 1855 $class->SUPER::new (
1197 my ($self) = @_; 1856 vertical => 1,
1198 1857 @_,
1199 my @alloc = map [$_->size_request], @{$self->{children}};
1200
1201 (
1202 (List::Util::max map $_->[0], @alloc),
1203 (List::Util::sum map $_->[1], @alloc),
1204 ) 1858 )
1205} 1859}
1206 1860
1207sub size_allocate {
1208 my ($self, $w, $h) = @_;
1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1212 my $children = $self->{children};
1213
1214 my @h = map $_->{req_h}, @$children;
1215
1216 my $req_h = List::Util::sum @h;
1217
1218 if ($req_h > $h) {
1219 # ah well, not enough space
1220 $_ *= $h / $req_h for @h;
1221 } else {
1222 my $exp = List::Util::sum map $_->{expand}, @$children;
1223 $exp ||= 1;
1224
1225 for (0 .. $#$children) {
1226 my $child = $children->[$_];
1227
1228 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1229 }
1230 }
1231
1232 CFClient::UI::harmonize \@h;
1233
1234 my $y = 0;
1235 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_];
1238 $child->configure (0, $y, $w, $h);
1239
1240 $y += $h;
1241 }
1242
1243 1
1244}
1245
1246############################################################################# 1861#############################################################################
1247 1862
1248package CFClient::UI::Label; 1863package CFPlus::UI::Label;
1249 1864
1250our @ISA = CFClient::UI::Base::; 1865our @ISA = CFPlus::UI::DrawBG::;
1251 1866
1252use CFClient::OpenGL; 1867use CFPlus::OpenGL;
1253 1868
1254sub new { 1869sub new {
1255 my ($class, %arg) = @_; 1870 my ($class, %arg) = @_;
1256 1871
1257 my $self = $class->SUPER::new ( 1872 my $self = $class->SUPER::new (
1258 fg => [1, 1, 1], 1873 fg => [1, 1, 1],
1874 #bg => none
1875 #active_bg => none
1259 #font => default_font 1876 #font => default_font
1260 #text => initial text 1877 #text => initial text
1261 #markup => initial narkup 1878 #markup => initial narkup
1879 #max_w => maximum pixel width
1880 #style => 0, # render flags
1881 ellipsise => 3, # end
1262 layout => (new CFClient::Layout), 1882 layout => (new CFPlus::Layout),
1263 fontsize => 1, 1883 fontsize => 1,
1264 align => -1, 1884 align => -1,
1265 valign => -1, 1885 valign => -1,
1266 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1267 can_events => 0, 1888 can_events => 0,
1268 %arg 1889 %arg
1269 ); 1890 );
1270 1891
1271 if (exists $self->{template}) { 1892 if (exists $self->{template}) {
1272 my $layout = new CFClient::Layout; 1893 my $layout = new CFPlus::Layout;
1273 $layout->set_text (delete $self->{template}); 1894 $layout->set_text (delete $self->{template});
1274 $self->{template} = $layout; 1895 $self->{template} = $layout;
1275 } 1896 }
1276 1897
1277 if (exists $self->{markup}) { 1898 if (exists $self->{markup}) {
… …
1281 } 1902 }
1282 1903
1283 $self 1904 $self
1284} 1905}
1285 1906
1286sub escape {
1287 local $_ = $_[1];
1288
1289 s/&/&amp;/g;
1290 s/>/&gt;/g;
1291 s/</&lt;/g;
1292
1293 $_[1]
1294}
1295
1296sub update { 1907sub update {
1297 my ($self) = @_; 1908 my ($self) = @_;
1298 1909
1299 delete $self->{texture}; 1910 delete $self->{texture};
1300 $self->SUPER::update; 1911 $self->SUPER::update;
1301} 1912}
1302 1913
1914sub realloc {
1915 my ($self) = @_;
1916
1917 delete $self->{ox};
1918 $self->SUPER::realloc;
1919}
1920
1921sub clear {
1922 my ($self) = @_;
1923
1924 $self->set_text ("");
1925}
1926
1303sub set_text { 1927sub set_text {
1304 my ($self, $text) = @_; 1928 my ($self, $text) = @_;
1305 1929
1306 return if $self->{text} eq "T$text"; 1930 return if $self->{text} eq "T$text";
1307 $self->{text} = "T$text"; 1931 $self->{text} = "T$text";
1308 1932
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1310 $self->{layout}->set_text ($text); 1933 $self->{layout}->set_text ($text);
1311 1934
1935 delete $self->{size_req};
1936 $self->realloc;
1312 $self->update; 1937 $self->update;
1313 $self->check_size;
1314} 1938}
1315 1939
1316sub set_markup { 1940sub set_markup {
1317 my ($self, $markup) = @_; 1941 my ($self, $markup) = @_;
1318 1942
1319 return if $self->{text} eq "M$markup"; 1943 return if $self->{text} eq "M$markup";
1320 $self->{text} = "M$markup"; 1944 $self->{text} = "M$markup";
1321 1945
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1946 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323 1947
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325 $self->{layout}->set_markup ($markup); 1948 $self->{layout}->set_markup ($markup);
1326 1949
1950 delete $self->{size_req};
1951 $self->realloc;
1327 $self->update; 1952 $self->update;
1328 $self->check_size;
1329} 1953}
1330 1954
1331sub size_request { 1955sub size_request {
1332 my ($self) = @_; 1956 my ($self) = @_;
1333 1957
1958 $self->{size_req} ||= do {
1959 my ($max_w, $max_h) = $self->get_max_wh;
1960
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1961 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1962 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1963 $self->{layout}->set_ellipsise ($self->{ellipsise});
1964 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1965 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1966
1338 my ($w, $h) = $self->{layout}->size; 1967 my ($w, $h) = $self->{layout}->size;
1339 1968
1340 if (exists $self->{template}) { 1969 if (exists $self->{template}) {
1341 $self->{template}->set_font ($self->{font}) if $self->{font}; 1970 $self->{template}->set_font ($self->{font}) if $self->{font};
1971 $self->{template}->set_width ($self->{max_w} || -1);
1342 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1973
1344 my ($w2, $h2) = $self->{template}->size; 1974 my ($w2, $h2) = $self->{template}->size;
1345 1975
1346 $w = List::Util::max $w, $w2; 1976 $w = List::Util::max $w, $w2;
1347 $h = List::Util::max $h, $h2; 1977 $h = List::Util::max $h, $h2;
1978 }
1979
1980 [$w, $h]
1348 } 1981 };
1349 1982
1350 ( 1983 @{ $self->{size_req} }
1351 $w + $self->{padding} * 2,
1352 $h + $self->{padding} * 2,
1353 )
1354} 1984}
1355 1985
1986sub baseline_shift {
1987 $_[0]{layout}->descent
1988}
1989
1356sub size_allocate { 1990sub invoke_size_allocate {
1357 my ($self, $w, $h) = @_; 1991 my ($self, $w, $h) = @_;
1358 1992
1993 delete $self->{ox};
1994
1359 delete $self->{texture}; 1995 delete $self->{texture}
1996 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1997
1998 1
1360} 1999}
1361 2000
1362sub set_fontsize { 2001sub set_fontsize {
1363 my ($self, $fontsize) = @_; 2002 my ($self, $fontsize) = @_;
1364 2003
1365 $self->{fontsize} = $fontsize; 2004 $self->{fontsize} = $fontsize;
2005 delete $self->{size_req};
1366 delete $self->{texture}; 2006 delete $self->{texture};
1367 2007
1368 $self->update; 2008 $self->realloc;
1369 $self->check_size; 2009}
2010
2011sub reconfigure {
2012 my ($self) = @_;
2013
2014 delete $self->{size_req};
2015 delete $self->{texture};
2016
2017 $self->SUPER::reconfigure;
1370} 2018}
1371 2019
1372sub _draw { 2020sub _draw {
1373 my ($self) = @_; 2021 my ($self) = @_;
1374 2022
2023 $self->SUPER::_draw; # draw background, if applicable
2024
1375 my $tex = $self->{texture} ||= do { 2025 my $size = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}}); 2026 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2027 $self->{layout}->set_font ($self->{font}) if $self->{font};
1378 $self->{layout}->set_width ($self->{w}); 2028 $self->{layout}->set_width ($self->{w});
2029 $self->{layout}->set_ellipsise ($self->{ellipsise});
2030 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 2031 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380 2032
1381 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2033 [$self->{layout}->size]
1382
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5;
1386
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5;
1390
1391 $tex
1392 }; 2034 };
1393 2035
1394 glEnable GL_TEXTURE_2D; 2036 unless (exists $self->{ox}) {
1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2037 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
2038 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2039 : ($self->{w} - $size->[0]) * 0.5);
1396 2040
1397 if ($tex->{format} == GL_ALPHA) { 2041 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1398 glColor @{$self->{fg}}; 2042 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2043 : ($self->{h} - $size->[1]) * 0.5);
1400 } else { 2044
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 2045 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1402 } 2046 };
1403 2047
1404 glDisable GL_TEXTURE_2D; 2048# unless ($self->{list}) {
2049# $self->{list} = CFPlus::OpenGL::glGenList;
2050# CFPlus::OpenGL::glNewList $self->{list};
2051# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2052# CFPlus::OpenGL::glEndList;
2053# }
2054#
2055# CFPlus::OpenGL::glCallList $self->{list};
2056
2057 $self->{layout}->draw;
1405} 2058}
2059
2060#sub destroy {
2061# my ($self) = @_;
2062#
2063# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2064#
2065# $self->SUPER::destroy;
2066#}
1406 2067
1407############################################################################# 2068#############################################################################
1408 2069
1409package CFClient::UI::EntryBase; 2070package CFPlus::UI::EntryBase;
1410 2071
1411our @ISA = CFClient::UI::Label::; 2072our @ISA = CFPlus::UI::Label::;
1412 2073
1413use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1414 2075
1415sub new { 2076sub new {
1416 my $class = shift; 2077 my $class = shift;
1417 2078
1418 $class->SUPER::new ( 2079 $class->SUPER::new (
1419 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
1420 bg => [0, 0, 0, 0.2], 2081 bg => [0, 0, 0, 0.2],
2082 outline => [0.6, 0.3, 0.1],
1421 active_bg => [1, 1, 1, 0.5], 2083 active_bg => [0, 0, 1, .2],
1422 active_fg => [0, 0, 0], 2084 active_fg => [1, 1, 1],
2085 active_outline => [1, 1, 0],
1423 can_hover => 1, 2086 can_hover => 1,
1424 can_focus => 1, 2087 can_focus => 1,
1425 valign => 0, 2088 valign => 0,
1426 can_events => 1, 2089 can_events => 1,
2090 ellipsise => 0,
2091 #text => ...
2092 #hidden => "*",
1427 @_ 2093 @_
1428 ) 2094 )
1429} 2095}
1430 2096
1431sub _set_text { 2097sub _set_text {
… …
1433 2099
1434 delete $self->{cur_h}; 2100 delete $self->{cur_h};
1435 2101
1436 return if $self->{text} eq $text; 2102 return if $self->{text} eq $text;
1437 2103
1438 delete $self->{texture};
1439
1440 $self->{last_activity} = $::NOW; 2104 $self->{last_activity} = $::NOW;
1441 $self->{text} = $text; 2105 $self->{text} = $text;
1442 2106
1443 $text =~ s/./*/g if $self->{hidden}; 2107 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 2108 $self->{layout}->set_text ("$text ");
2109 delete $self->{size_req};
1445 2110
1446 $self->emit (changed => $self->{text}); 2111 $self->emit (changed => $self->{text});
2112
2113 $self->realloc;
2114 $self->update;
1447} 2115}
1448 2116
1449sub set_text { 2117sub set_text {
1450 my ($self, $text) = @_; 2118 my ($self, $text) = @_;
1451 2119
1452 $self->{cursor} = length $text; 2120 $self->{cursor} = length $text;
1453 $self->_set_text ($text); 2121 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456} 2122}
1457 2123
1458sub get_text { 2124sub get_text {
1459 $_[0]{text} 2125 $_[0]{text}
1460} 2126}
… …
1465 my ($w, $h) = $self->SUPER::size_request; 2131 my ($w, $h) = $self->SUPER::size_request;
1466 2132
1467 ($w + 1, $h) # add 1 for cursor 2133 ($w + 1, $h) # add 1 for cursor
1468} 2134}
1469 2135
1470sub size_allocate {
1471 my ($self, $w, $h) = @_;
1472
1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474}
1475
1476sub key_down { 2136sub invoke_key_down {
1477 my ($self, $ev) = @_; 2137 my ($self, $ev) = @_;
1478 2138
1479 my $mod = $ev->{mod}; 2139 my $mod = $ev->{mod};
1480 my $sym = $ev->{sym}; 2140 my $sym = $ev->{sym};
1481 my $uni = $ev->{unicode}; 2141 my $uni = $ev->{unicode};
1482 2142
1483 my $text = $self->get_text; 2143 my $text = $self->get_text;
1484 2144
2145 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2146
1485 if ($sym == 8) { 2147 if ($uni == 8) {
1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2148 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1487 } elsif ($sym == 127) { 2149 } elsif ($uni == 127) {
1488 substr $text, $self->{cursor}, 1, ""; 2150 substr $text, $self->{cursor}, 1, "";
1489 } elsif ($sym == CFClient::SDLK_LEFT) { 2151 } elsif ($sym == CFPlus::SDLK_LEFT) {
1490 --$self->{cursor} if $self->{cursor}; 2152 --$self->{cursor} if $self->{cursor};
1491 } elsif ($sym == CFClient::SDLK_RIGHT) { 2153 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1492 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2154 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1493 } elsif ($sym == CFClient::SDLK_HOME) { 2155 } elsif ($sym == CFPlus::SDLK_HOME) {
2156 # what a hack
2157 $self->{cursor} =
2158 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2159 ? length $1
2160 : 0;
2161 } elsif ($sym == CFPlus::SDLK_END) {
2162 # uh, again
2163 $self->{cursor} =
2164 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2165 ? $self->{cursor} + length $1
2166 : length $self->{text};
2167 } elsif ($uni == 21) { # ctrl-u
2168 $text = "";
1494 $self->{cursor} = 0; 2169 $self->{cursor} = 0;
1495 } elsif ($sym == CFClient::SDLK_END) {
1496 $self->{cursor} = length $text;
1497 } elsif ($sym == 27) { 2170 } elsif ($uni == 27) {
1498 $self->emit ('escape'); 2171 $self->emit ('escape');
1499 } elsif ($uni) { 2172 } elsif ($uni == 0x0d) {
2173 substr $text, $self->{cursor}++, 0, "\012";
2174 } elsif ($uni >= 0x20) {
1500 substr $text, $self->{cursor}++, 0, chr $uni; 2175 substr $text, $self->{cursor}++, 0, chr $uni;
2176 } else {
2177 return 0;
1501 } 2178 }
1502 2179
1503 $self->_set_text ($text); 2180 $self->_set_text ($text);
2181
2182 $self->realloc;
1504 $self->update; 2183 $self->update;
1505}
1506 2184
2185 1
2186}
2187
1507sub focus_in { 2188sub invoke_focus_in {
1508 my ($self) = @_; 2189 my ($self) = @_;
1509 2190
1510 $self->{last_activity} = $::NOW; 2191 $self->{last_activity} = $::NOW;
1511 2192
1512 $self->SUPER::focus_in; 2193 $self->SUPER::invoke_focus_in
1513} 2194}
1514 2195
1515sub button_down { 2196sub invoke_button_down {
1516 my ($self, $ev, $x, $y) = @_; 2197 my ($self, $ev, $x, $y) = @_;
1517 2198
1518 $self->SUPER::button_down ($ev, $x, $y); 2199 $self->SUPER::invoke_button_down ($ev, $x, $y);
1519 2200
1520 my $idx = $self->{layout}->xy_to_index ($x, $y); 2201 my $idx = $self->{layout}->xy_to_index ($x, $y);
1521 2202
1522 # byte-index to char-index 2203 # byte-index to char-index
1523 my $text = $self->{text}; 2204 my $text = $self->{text};
1524 utf8::encode $text; 2205 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1525 $self->{cursor} = length substr $text, 0, $idx; 2206 $self->{cursor} = length $text;
1526 2207
1527 $self->_set_text ($self->{text}); 2208 $self->_set_text ($self->{text});
1528 $self->update; 2209 $self->update;
2210
2211 1
1529} 2212}
1530 2213
1531sub mouse_motion { 2214sub invoke_mouse_motion {
1532 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1533# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2216# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2217
2218 1
1534} 2219}
1535 2220
1536sub _draw { 2221sub _draw {
1537 my ($self) = @_; 2222 my ($self) = @_;
1538 2223
1539 local $self->{fg} = $self->{fg}; 2224 local $self->{fg} = $self->{fg};
1540 2225
1541 if ($FOCUS == $self) { 2226 if ($FOCUS == $self) {
1542 glColor @{$self->{active_bg}}; 2227 glColor_premultiply @{$self->{active_bg}};
1543 $self->{fg} = $self->{active_fg}; 2228 $self->{fg} = $self->{active_fg};
1544 } else { 2229 } else {
1545 glColor @{$self->{bg}}; 2230 glColor_premultiply @{$self->{bg}};
1546 } 2231 }
1547 2232
1548 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
1549 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1550 glBegin GL_QUADS;
1551 glVertex 0 , 0;
1552 glVertex 0 , $self->{h};
1553 glVertex $self->{w}, $self->{h}; 2235 glRect 0, 0, $self->{w}, $self->{h};
1554 glVertex $self->{w}, 0;
1555 glEnd;
1556 glDisable GL_BLEND; 2236 glDisable GL_BLEND;
1557 2237
1558 $self->SUPER::_draw; 2238 $self->SUPER::_draw;
1559 2239
1560 #TODO: force update every cursor change :( 2240 #TODO: force update every cursor change :(
… …
1562 2242
1563 unless (exists $self->{cur_h}) { 2243 unless (exists $self->{cur_h}) {
1564 my $text = substr $self->{text}, 0, $self->{cursor}; 2244 my $text = substr $self->{text}, 0, $self->{cursor};
1565 utf8::encode $text; 2245 utf8::encode $text;
1566 2246
1567 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2247 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1568 } 2248 }
1569 2249
1570 glColor @{$self->{fg}}; 2250 glColor_premultiply @{$self->{active_fg}};
1571 glBegin GL_LINES; 2251 glBegin GL_LINES;
1572 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2252 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1573 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2253 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1574 glEnd; 2254 glEnd;
1575 }
1576}
1577 2255
2256 glLineWidth 3;
2257 glColor @{$self->{active_outline}};
2258 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2259 glLineWidth 1;
2260
2261 } else {
2262 glColor @{$self->{outline}};
2263 glBegin GL_LINE_STRIP;
2264 glVertex .5, $self->{h} * .5;
2265 glVertex .5, $self->{h} - 2.5;
2266 glVertex $self->{w} - .5, $self->{h} - 2.5;
2267 glVertex $self->{w} - .5, $self->{h} * .5;
2268 glEnd;
2269 }
2270}
2271
2272#############################################################################
2273
1578package CFClient::UI::Entry; 2274package CFPlus::UI::Entry;
1579 2275
1580our @ISA = CFClient::UI::EntryBase::; 2276our @ISA = CFPlus::UI::EntryBase::;
1581 2277
1582use CFClient::OpenGL; 2278use CFPlus::OpenGL;
1583 2279
1584sub key_down { 2280sub invoke_key_down {
1585 my ($self, $ev) = @_; 2281 my ($self, $ev) = @_;
1586 2282
1587 my $sym = $ev->{sym}; 2283 my $sym = $ev->{sym};
1588 2284
1589 if ($sym == 13) { 2285 if ($ev->{uni} == 0x0d || $sym == 13) {
1590 unshift @{$self->{history}}, 2286 unshift @{$self->{history}},
1591 my $txt = $self->get_text; 2287 my $txt = $self->get_text;
2288
1592 $self->{history_pointer} = -1; 2289 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = ''; 2290 $self->{history_saveback} = '';
1594 $self->emit (activate => $txt); 2291 $self->emit (activate => $txt);
1595 $self->update; 2292 $self->update;
1596 2293
1597 } elsif ($sym == CFClient::SDLK_UP) { 2294 } elsif ($sym == CFPlus::SDLK_UP) {
1598 if ($self->{history_pointer} < 0) { 2295 if ($self->{history_pointer} < 0) {
1599 $self->{history_saveback} = $self->get_text; 2296 $self->{history_saveback} = $self->get_text;
1600 } 2297 }
1601 if (@{$self->{history} || []} > 0) { 2298 if (@{$self->{history} || []} > 0) {
1602 $self->{history_pointer}++; 2299 $self->{history_pointer}++;
… …
1604 $self->{history_pointer} = @{$self->{history} || []} - 1; 2301 $self->{history_pointer} = @{$self->{history} || []} - 1;
1605 } 2302 }
1606 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2303 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1607 } 2304 }
1608 2305
1609 } elsif ($sym == CFClient::SDLK_DOWN) { 2306 } elsif ($sym == CFPlus::SDLK_DOWN) {
1610 $self->{history_pointer}--; 2307 $self->{history_pointer}--;
1611 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2308 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1612 2309
1613 if ($self->{history_pointer} >= 0) { 2310 if ($self->{history_pointer} >= 0) {
1614 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1615 } else { 2312 } else {
1616 $self->set_text ($self->{history_saveback}); 2313 $self->set_text ($self->{history_saveback});
1617 } 2314 }
1618 2315
1619 } else { 2316 } else {
1620 $self->SUPER::key_down ($ev); 2317 return $self->SUPER::invoke_key_down ($ev)
2318 }
2319
1621 } 2320 1
1622
1623} 2321}
1624 2322
1625############################################################################# 2323#############################################################################
1626 2324
2325package CFPlus::UI::TextEdit;
2326
2327our @ISA = CFPlus::UI::EntryBase::;
2328
2329use CFPlus::OpenGL;
2330
2331sub move_cursor_ver {
2332 my ($self, $dy) = @_;
2333
2334 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2335
2336 $y += $dy;
2337
2338 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2339 $self->{cursor} = $index;
2340 delete $self->{cur_h};
2341 $self->update;
2342 return;
2343 }
2344}
2345
2346sub invoke_key_down {
2347 my ($self, $ev) = @_;
2348
2349 my $sym = $ev->{sym};
2350
2351 if ($sym == CFPlus::SDLK_UP) {
2352 $self->move_cursor_ver (-1);
2353 } elsif ($sym == CFPlus::SDLK_DOWN) {
2354 $self->move_cursor_ver (+1);
2355 } else {
2356 return $self->SUPER::invoke_key_down ($ev)
2357 }
2358
2359 1
2360}
2361
2362#############################################################################
2363
1627package CFClient::UI::Button; 2364package CFPlus::UI::ButtonBin;
1628 2365
1629our @ISA = CFClient::UI::Label::; 2366our @ISA = CFPlus::UI::Bin::;
1630 2367
1631use CFClient::OpenGL; 2368use CFPlus::OpenGL;
1632 2369
1633my @tex = 2370my @tex =
1634 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1635 qw(b1_button_active.png); 2372 qw(b1_button_inactive.png b1_button_active.png);
1636 2373
1637sub new { 2374sub new {
1638 my $class = shift; 2375 my $class = shift;
1639 2376
1640 $class->SUPER::new ( 2377 $class->SUPER::new (
2378 can_hover => 1,
2379 align => 0,
2380 valign => 0,
2381 can_events => 1,
2382 @_
2383 )
2384}
2385
2386sub invoke_button_up {
2387 my ($self, $ev, $x, $y) = @_;
2388
2389 $self->emit ("activate")
2390 if $x >= 0 && $x < $self->{w}
2391 && $y >= 0 && $y < $self->{h};
2392
2393 1
2394}
2395
2396sub _draw {
2397 my ($self) = @_;
2398
2399 glEnable GL_TEXTURE_2D;
2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2401 glColor 0, 0, 0, 1;
2402
2403 my $tex = $tex[$GRAB == $self];
2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2405
2406 glDisable GL_TEXTURE_2D;
2407
2408 $self->SUPER::_draw;
2409}
2410
2411#############################################################################
2412
2413package CFPlus::UI::Button;
2414
2415our @ISA = CFPlus::UI::Label::;
2416
2417use CFPlus::OpenGL;
2418
2419my @tex =
2420 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2421 qw(b1_button_inactive.png b1_button_active.png);
2422
2423sub new {
2424 my $class = shift;
2425
2426 $class->SUPER::new (
1641 padding => 4, 2427 padding_x => 4,
2428 padding_y => 4,
2429 fg => [1.0, 1.0, 1.0],
2430 active_fg => [0.8, 0.8, 0.8],
2431 can_hover => 1,
2432 align => 0,
2433 valign => 0,
2434 can_events => 1,
2435 @_
2436 )
2437}
2438
2439sub invoke_button_up {
2440 my ($self, $ev, $x, $y) = @_;
2441
2442 $self->emit ("activate")
2443 if $x >= 0 && $x < $self->{w}
2444 && $y >= 0 && $y < $self->{h};
2445
2446 1
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2453
2454 glEnable GL_TEXTURE_2D;
2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2456 glColor 0, 0, 0, 1;
2457
2458 my $tex = $tex[$GRAB == $self];
2459 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2460
2461 glDisable GL_TEXTURE_2D;
2462
2463 $self->SUPER::_draw;
2464}
2465
2466#############################################################################
2467
2468package CFPlus::UI::CheckBox;
2469
2470our @ISA = CFPlus::UI::DrawBG::;
2471
2472my @tex =
2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2474 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2475
2476use CFPlus::OpenGL;
2477
2478sub new {
2479 my $class = shift;
2480
2481 $class->SUPER::new (
2482 padding_x => 2,
2483 padding_y => 2,
2484 fg => [1, 1, 1],
2485 active_fg => [1, 1, 0],
2486 bg => [0, 0, 0, 0.2],
2487 active_bg => [1, 1, 1, 0.5],
2488 state => 0,
2489 can_hover => 1,
2490 @_
2491 )
2492}
2493
2494sub size_request {
2495 my ($self) = @_;
2496
2497 (6) x 2
2498}
2499
2500sub toggle {
2501 my ($self) = @_;
2502
2503 $self->{state} = !$self->{state};
2504 $self->emit (changed => $self->{state});
2505 $self->update;
2506}
2507
2508sub invoke_button_down {
2509 my ($self, $ev, $x, $y) = @_;
2510
2511 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2512 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2513 $self->toggle;
2514 } else {
2515 return 0
2516 }
2517
2518 1
2519}
2520
2521sub _draw {
2522 my ($self) = @_;
2523
2524 $self->SUPER::_draw;
2525
2526 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2527
2528 my ($w, $h) = @$self{qw(w h)};
2529
2530 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2531
2532 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2533
2534 my $tex = $self->{state} ? $tex[1] : $tex[0];
2535
2536 glEnable GL_TEXTURE_2D;
2537 $tex->draw_quad_alpha (0, 0, $s, $s);
2538 glDisable GL_TEXTURE_2D;
2539}
2540
2541#############################################################################
2542
2543package CFPlus::UI::Image;
2544
2545our @ISA = CFPlus::UI::Base::;
2546
2547use CFPlus::OpenGL;
2548
2549our %texture_cache;
2550
2551sub new {
2552 my $class = shift;
2553
2554 my $self = $class->SUPER::new (
2555 can_events => 0,
2556 scale => 1,
2557 @_,
2558 );
2559
2560 $self->{path} || $self->{tex}
2561 or Carp::croak "'path' or 'tex' attributes required";
2562
2563 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2564 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2565
2566 CFPlus::weaken $texture_cache{$self->{path}};
2567
2568 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2569
2570 $self
2571}
2572
2573sub STORABLE_freeze {
2574 my ($self, $cloning) = @_;
2575
2576 $self->{path}
2577 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2578
2579 $self->{path}
2580}
2581
2582sub STORABLE_attach {
2583 my ($self, $cloning, $path) = @_;
2584
2585 $self->new (path => $path)
2586}
2587
2588sub size_request {
2589 my ($self) = @_;
2590
2591 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2592}
2593
2594sub _draw {
2595 my ($self) = @_;
2596
2597 my $tex = $self->{tex};
2598
2599 my ($w, $h) = ($self->{w}, $self->{h});
2600
2601 if ($self->{rot90}) {
2602 glRotate 90, 0, 0, 1;
2603 glTranslate 0, -$self->{w}, 0;
2604
2605 ($w, $h) = ($h, $w);
2606 }
2607
2608 glEnable GL_TEXTURE_2D;
2609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2610
2611 $tex->draw_quad_alpha (0, 0, $w, $h);
2612
2613 glDisable GL_TEXTURE_2D;
2614}
2615
2616#############################################################################
2617
2618package CFPlus::UI::ImageButton;
2619
2620our @ISA = CFPlus::UI::Image::;
2621
2622use CFPlus::OpenGL;
2623
2624my %textures;
2625
2626sub new {
2627 my $class = shift;
2628
2629 my $self = $class->SUPER::new (
2630 padding_x => 4,
2631 padding_y => 4,
1642 fg => [1, 1, 1], 2632 fg => [1, 1, 1],
1643 bg => [1, 1, 1, 0.2],
1644 active_fg => [0, 0, 1], 2633 active_fg => [0, 0, 1],
1645 can_hover => 1, 2634 can_hover => 1,
1646 align => 0, 2635 align => 0,
1647 valign => 0, 2636 valign => 0,
1648 can_events => 1, 2637 can_events => 1,
1649 @_ 2638 @_
1650 ) 2639 );
1651} 2640}
1652 2641
1653sub button_up { 2642sub invoke_button_down {
1654 my ($self, $ev, $x, $y) = @_; 2643 my ($self, $ev, $x, $y) = @_;
1655 2644
2645 1
2646}
2647
2648sub invoke_button_up {
2649 my ($self, $ev, $x, $y) = @_;
2650
2651 $self->emit ("activate")
1656 if ($x >= 0 && $x < $self->{w} 2652 if $x >= 0 && $x < $self->{w}
1657 && $y >= 0 && $y < $self->{h}) { 2653 && $y >= 0 && $y < $self->{h};
1658 $self->emit ("activate"); 2654
1659 } 2655 1
1660}
1661
1662sub _draw {
1663 my ($self) = @_;
1664
1665 local $self->{fg} = $self->{fg};
1666
1667 if ($GRAB == $self) {
1668 $self->{fg} = $self->{active_fg};
1669 }
1670
1671 glEnable GL_TEXTURE_2D;
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1673 glColor 0, 0, 0, 1;
1674
1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1676
1677 glDisable GL_TEXTURE_2D;
1678
1679 $self->SUPER::_draw;
1680} 2656}
1681 2657
1682############################################################################# 2658#############################################################################
1683 2659
1684package CFClient::UI::CheckBox;
1685
1686our @ISA = CFClient::UI::DrawBG::;
1687
1688my @tex =
1689 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1690 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1691
1692use CFClient::OpenGL;
1693
1694sub new {
1695 my $class = shift;
1696
1697 $class->SUPER::new (
1698 padding => 2,
1699 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0],
1701 state => 0,
1702 can_hover => 1,
1703 @_
1704 )
1705}
1706
1707sub size_request {
1708 my ($self) = @_;
1709
1710 ($self->{padding} * 2 + 6) x 2
1711}
1712
1713sub button_down {
1714 my ($self, $ev, $x, $y) = @_;
1715
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state});
1720 }
1721}
1722
1723sub _draw {
1724 my ($self) = @_;
1725
1726 $self->SUPER::_draw;
1727
1728 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1729
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733
1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1736 glEnable GL_TEXTURE_2D;
1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1738 glDisable GL_TEXTURE_2D;
1739}
1740
1741#############################################################################
1742
1743package CFClient::UI::Image; 2660package CFPlus::UI::VGauge;
1744 2661
1745our @ISA = CFClient::UI::Base::; 2662our @ISA = CFPlus::UI::Base::;
1746
1747use CFClient::OpenGL;
1748use Carp qw/confess/;
1749
1750our %loaded_images;
1751
1752sub new {
1753 my $class = shift;
1754
1755 my $self = $class->SUPER::new (can_events => 0, @_);
1756
1757 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1758
1759 $loaded_images{$self->{image}} ||=
1760 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1761
1762 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1763
1764 Scalar::Util::weaken $loaded_images{$self->{image}};
1765
1766 $self->{aspect} = $tex->{w} / $tex->{h};
1767
1768 $self
1769}
1770
1771sub size_request {
1772 my ($self) = @_;
1773
1774 ($self->{tex}->{w}, $self->{tex}->{h})
1775}
1776
1777sub _draw {
1778 my ($self) = @_;
1779
1780 my $tex = $self->{tex};
1781
1782 my ($w, $h) = ($self->{w}, $self->{h});
1783
1784 if ($self->{rot90}) {
1785 glRotate 90, 0, 0, 1;
1786 glTranslate 0, -$self->{w}, 0;
1787
1788 ($w, $h) = ($h, $w);
1789 }
1790
1791 glEnable GL_TEXTURE_2D;
1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1793
1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1795
1796 glDisable GL_TEXTURE_2D;
1797}
1798
1799#############################################################################
1800
1801package CFClient::UI::VGauge;
1802
1803our @ISA = CFClient::UI::Base::;
1804 2663
1805use List::Util qw(min max); 2664use List::Util qw(min max);
1806 2665
1807use CFClient::OpenGL; 2666use CFPlus::OpenGL;
1808 2667
1809my %tex = ( 2668my %tex = (
1810 food => [ 2669 food => [
1811 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2670 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1812 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2671 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1813 ], 2672 ],
1814 grace => [ 2673 grace => [
1815 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2674 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1816 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2675 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1817 ], 2676 ],
1818 hp => [ 2677 hp => [
1819 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2678 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1820 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2679 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1821 ], 2680 ],
1822 mana => [ 2681 mana => [
1823 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2682 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1824 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2683 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1825 ], 2684 ],
1826); 2685);
1827 2686
1828# eg. VGauge->new (gauge => 'food'), default gauge: food 2687# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1888 my $ycut1 = max 0, min 1, $ycut; 2747 my $ycut1 = max 0, min 1, $ycut;
1889 my $ycut2 = max 0, min 1, $ycut - 1; 2748 my $ycut2 = max 0, min 1, $ycut - 1;
1890 2749
1891 my $h1 = $self->{h} * (1 - $ycut1); 2750 my $h1 = $self->{h} * (1 - $ycut1);
1892 my $h2 = $self->{h} * (1 - $ycut2); 2751 my $h2 = $self->{h} * (1 - $ycut2);
2752 my $h3 = $self->{h};
2753
2754 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1893 2755
1894 glEnable GL_BLEND; 2756 glEnable GL_BLEND;
1895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2757 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2758 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1896 glEnable GL_TEXTURE_2D; 2759 glEnable GL_TEXTURE_2D;
1897 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1898 2761
1899 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2762 glBindTexture GL_TEXTURE_2D, $t1->{name};
1900 glBegin GL_QUADS; 2763 glBegin GL_QUADS;
… …
1915 2778
1916 if ($t3) { 2779 if ($t3) {
1917 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2780 glBindTexture GL_TEXTURE_2D, $t3->{name};
1918 glBegin GL_QUADS; 2781 glBegin GL_QUADS;
1919 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2782 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1920 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2783 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1921 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2784 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1922 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2785 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1923 glEnd; 2786 glEnd;
1924 } 2787 }
1925 2788
1926 glDisable GL_BLEND; 2789 glDisable GL_BLEND;
1927 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
1928} 2791}
1929 2792
1930############################################################################# 2793#############################################################################
1931 2794
2795package CFPlus::UI::Progress;
2796
2797our @ISA = CFPlus::UI::Label::;
2798
2799use CFPlus::OpenGL;
2800
2801sub new {
2802 my ($class, %arg) = @_;
2803
2804 my $self = $class->SUPER::new (
2805 fg => [1, 1, 1],
2806 bg => [0, 0, 1, 0.2],
2807 bar => [0.7, 0.5, 0.1, 0.8],
2808 outline => [0.4, 0.3, 0],
2809 fontsize => 0.9,
2810 valign => 0,
2811 align => 0,
2812 can_events => 1,
2813 ellipsise => 1,
2814 label => "%d%%",
2815 %arg,
2816 );
2817
2818 $self->set_value ($arg{value} || -1);
2819
2820 $self
2821}
2822
2823sub set_label {
2824 my ($self, $label) = @_;
2825
2826 return if $self->{label} eq $label;
2827 $self->{label} = $label;
2828
2829 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2830}
2831
2832sub set_value {
2833 my ($self, $value) = @_;
2834
2835 if ($self->{value} ne $value) {
2836 $self->{value} = $value;
2837
2838 if ($value < 0) {
2839 $self->set_text ("-");
2840 } else {
2841 $self->set_text (sprintf $self->{label}, $value * 100);
2842 }
2843
2844 $self->update;
2845 }
2846}
2847
2848sub _draw {
2849 my ($self) = @_;
2850
2851 glEnable GL_BLEND;
2852 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2853
2854 if ($self->{value} >= 0) {
2855 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2856
2857 glColor_premultiply @{$self->{bar}};
2858 glRect 2, 2, $s, $self->{h} - 2;
2859 glColor_premultiply @{$self->{bg}};
2860 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2861 }
2862
2863 glColor_premultiply @{$self->{outline}};
2864 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2865
2866 glDisable GL_BLEND;
2867
2868 {
2869 local $self->{bg}; # do not draw background
2870 $self->SUPER::_draw;
2871 }
2872}
2873
2874#############################################################################
2875
2876package CFPlus::UI::ExperienceProgress;
2877
2878our @ISA = CFPlus::UI::Progress::;
2879
2880sub new {
2881 my ($class, %arg) = @_;
2882
2883 my $self = $class->SUPER::new (
2884 tooltip => sub {
2885 my ($self) = @_;
2886
2887 sprintf "level %d\n%s points\n%s next level\n%s to go",
2888 $self->{lvl},
2889 ::formsep ($self->{exp}),
2890 ::formsep ($self->{nxt}),
2891 ::formsep ($self->{nxt} - $self->{exp}),
2892 },
2893 %arg
2894 );
2895
2896 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2897 if $::CONN;
2898
2899 $self
2900}
2901
2902sub DESTROY {
2903 my ($self) = @_;
2904
2905 delete $::CONN->{on_exp_update}{$self+0}
2906 if $::CONN;
2907
2908 $self->SUPER::DESTROY;
2909}
2910
2911sub set_value {
2912 my ($self, $lvl, $exp) = @_;
2913
2914 $self->{lvl} = $lvl;
2915 $self->{exp} = $exp;
2916
2917 my $v = -1;
2918
2919 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2920 my $l0 = $table->[$lvl - 1];
2921 my $l1 = $table->[$lvl];
2922
2923 $self->{nxt} = $l1;
2924
2925 $v = ($exp - $l0) / ($l1 - $l0);
2926 }
2927
2928 $self->SUPER::set_value ($v);
2929}
2930
2931#############################################################################
2932
1932package CFClient::UI::Gauge; 2933package CFPlus::UI::Gauge;
1933 2934
1934our @ISA = CFClient::UI::VBox::; 2935our @ISA = CFPlus::UI::VBox::;
1935 2936
1936sub new { 2937sub new {
1937 my ($class, %arg) = @_; 2938 my ($class, %arg) = @_;
1938 2939
1939 my $self = $class->SUPER::new ( 2940 my $self = $class->SUPER::new (
… …
1941 can_hover => 1, 2942 can_hover => 1,
1942 can_events => 1, 2943 can_events => 1,
1943 %arg, 2944 %arg,
1944 ); 2945 );
1945 2946
1946 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2947 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
1947 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2948 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1948 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2949 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1949 2950
1950 $self 2951 $self
1951} 2952}
1952 2953
1953sub set_fontsize { 2954sub set_fontsize {
… …
1974 $self->{value}->set_text ($val); 2975 $self->{value}->set_text ($val);
1975} 2976}
1976 2977
1977############################################################################# 2978#############################################################################
1978 2979
1979package CFClient::UI::Slider; 2980package CFPlus::UI::Slider;
1980 2981
1981use strict; 2982use strict;
1982 2983
1983use CFClient::OpenGL; 2984use CFPlus::OpenGL;
1984 2985
1985our @ISA = CFClient::UI::DrawBG::; 2986our @ISA = CFPlus::UI::DrawBG::;
1986 2987
1987my @tex = 2988my @tex =
1988 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2989 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
1989 qw(s1_slider.png s1_slider_bg.png); 2990 qw(s1_slider.png s1_slider_bg.png);
1990 2991
1991sub new { 2992sub new {
1992 my $class = shift; 2993 my $class = shift;
1993 2994
1994 # range [value, low, high, page] 2995 # range [value, low, high, page, unit]
1995 2996
1996 # TODO: 0-width page 2997 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2998 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2999 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 3000 my $self = $class->SUPER::new (
2000 fg => [1, 1, 1], 3001 fg => [1, 1, 1],
2001 active_fg => [0, 0, 0], 3002 active_fg => [0, 0, 0],
3003 bg => [0, 0, 0, 0.2],
3004 active_bg => [1, 1, 1, 0.5],
2002 range => [0, 0, 100, 10], 3005 range => [0, 0, 100, 10, 0],
2003 req_w => $::WIDTH / 80, 3006 min_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 3007 min_h => $::WIDTH / 80,
2005 vertical => 0, 3008 vertical => 0,
2006 can_hover => 1, 3009 can_hover => 1,
2007 inner_pad => 5, 3010 inner_pad => 0.02,
2008 @_ 3011 @_
2009 ); 3012 );
2010 3013
3014 $self->set_value ($self->{range}[0]);
3015 $self->update;
3016
2011 $self 3017 $self
2012} 3018}
2013 3019
3020sub set_range {
3021 my ($self, $range) = @_;
3022
3023 ($range, $self->{range}) = ($self->{range}, $range);
3024
3025 if ("@$range" ne "@{$self->{range}}") {
3026 $self->update;
3027 $self->set_value ($self->{range}[0]);
3028 }
3029}
3030
3031sub set_value {
3032 my ($self, $value) = @_;
3033
3034 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
3035
3036 $hi = $lo + 1 if $hi <= $lo;
3037
3038 $page = $hi - $lo if $page > $hi - $lo;
3039
3040 $value = $lo if $value < $lo;
3041 $value = $hi - $page if $value > $hi - $page;
3042
3043 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
3044 if $unit;
3045
3046 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
3047
3048 if ($value != $old_value) {
3049 $self->emit (changed => $value);
3050 $self->update;
3051 }
3052}
3053
2014sub size_request { 3054sub size_request {
2015 my ($self) = @_; 3055 my ($self) = @_;
2016 3056
2017 my $w = $self->{req_w}; 3057 ($self->{req_w}, $self->{req_h})
2018 my $h = $self->{req_h};
2019
2020 $self->{vertical} ? ($h, $w) : ($w, $h)
2021} 3058}
2022 3059
2023sub button_down { 3060sub invoke_button_down {
2024 my ($self, $ev, $x, $y) = @_; 3061 my ($self, $ev, $x, $y) = @_;
2025 3062
2026 $self->SUPER::button_down ($ev, $x, $y); 3063 $self->SUPER::invoke_button_down ($ev, $x, $y);
3064
3065 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
3066
2027 $self->mouse_motion ($ev, $x, $y); 3067 $self->invoke_mouse_motion ($ev, $x, $y);
2028}
2029 3068
3069 1
3070}
3071
2030sub mouse_motion { 3072sub invoke_mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 3073 my ($self, $ev, $x, $y) = @_;
2032 3074
2033 if ($GRAB == $self) { 3075 if ($GRAB == $self) {
3076 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
3077
3078 my (undef, $lo, $hi, $page) = @{$self->{range}};
3079
3080 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
3081
3082 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
3083 } else {
3084 return 0;
3085 }
3086
3087 1
3088}
3089
3090sub invoke_mouse_wheel {
3091 my ($self, $ev) = @_;
3092
3093 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3094
3095 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3096
3097 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3098
3099 1
3100}
3101
3102sub update {
3103 my ($self) = @_;
3104
3105 delete $self->{knob_w};
3106 $self->SUPER::update;
3107}
3108
3109sub _draw {
3110 my ($self) = @_;
3111
3112 unless ($self->{knob_w}) {
3113 $self->set_value ($self->{range}[0]);
3114
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3115 my ($value, $lo, $hi, $page) = @{$self->{range}};
3116 my $range = ($hi - $page - $lo) || 1e-100;
2035 3117
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3118 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037 3119
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 3120 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 3121 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040 3122
2041 $x -= $inner_pad_px; # substract the padding 3123 $value = ($value - $lo) / $range;
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 3124 $value = $value * $self->{scale} + $self->{offset};
2043 $x = $lo if $x < $lo;
2044 $x = $hi - $page if $x > $hi - $page;
2045 $self->{range}[0] = $x;
2046 3125
2047 $self->emit (changed => $x); 3126 $self->{knob_x} = $value - $knob_w * 0.5;
2048 $self->update; 3127 $self->{knob_w} = $knob_w;
2049 } 3128 }
2050}
2051
2052# the inner_* stuff is for generating a padding for the slider handle,
2053# so that the handle doesn't leave the texture. This calculation isn't 100%
2054# correct propably, but it does the job for now
2055sub _calc_inner_pad_px {
2056 my ($self, $w) = @_;
2057 ($w / 100) * $self->{inner_pad} # % to pixels
2058}
2059
2060sub _draw {
2061 my ($self) = @_;
2062 3129
2063 $self->SUPER::_draw (); 3130 $self->SUPER::_draw ();
2064 3131
2065 my ($w, $h) = @$self{qw(w h)}; 3132 glScale $self->{w}, $self->{h};
2066 3133
2067 if ($self->{vertical}) { 3134 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 3135 # draw a vertical slider like a rotated horizontal slider
2069 3136
3137 glTranslate 1, 0, 0;
2070 glRotate 90, 0, 0, 1; 3138 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 3139 }
2075 3140
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 3141 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 3142 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 3143
2079 my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081 $hi = $value + 1 if $lo == $hi;
2082
2083 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086 $page = int $page * $inner_w / ($hi - $lo);
2087 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089 $w -= $page;
2090 $page &= ~1;
2091 glTranslate $page * 0.5, 0, 0;
2092 $page ||= 2;
2093
2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097 glEnable GL_TEXTURE_2D; 3144 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 3146
2100 # draw background 3147 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 3148 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 3149
2103 # draw handle 3150 # draw handle
2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 3151 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2105 3152
2106 glDisable GL_TEXTURE_2D; 3153 glDisable GL_TEXTURE_2D;
2107} 3154}
2108 3155
2109############################################################################# 3156#############################################################################
2110 3157
2111package CFClient::UI::TextView; 3158package CFPlus::UI::ValSlider;
2112 3159
2113our @ISA = CFClient::UI::HBox::; 3160our @ISA = CFPlus::UI::HBox::;
2114 3161
3162sub new {
3163 my ($class, %arg) = @_;
3164
3165 my $range = delete $arg{range};
3166
3167 my $self = $class->SUPER::new (
3168 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
3169 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
3170 to_value => sub { shift },
3171 from_value => sub { shift },
3172 %arg,
3173 );
3174
3175 $self->{slider}->connect (changed => sub {
3176 my ($self, $value) = @_;
3177 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
3178 $self->{parent}->emit (changed => $value);
3179 });
3180
3181# $self->{entry}->connect (changed => sub {
3182# my ($self, $value) = @_;
3183# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
3184# $self->{parent}->emit (changed => $value);
3185# });
3186
3187 $self->add ($self->{slider}, $self->{entry});
3188
3189 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
3190
3191 $self
3192}
3193
3194sub set_range { shift->{slider}->set_range (@_) }
3195sub set_value { shift->{slider}->set_value (@_) }
3196
3197#############################################################################
3198
3199package CFPlus::UI::TextScroller;
3200
3201our @ISA = CFPlus::UI::HBox::;
3202
2115use CFClient::OpenGL; 3203use CFPlus::OpenGL;
2116 3204
2117sub new { 3205sub new {
2118 my $class = shift; 3206 my $class = shift;
2119 3207
2120 my $self = $class->SUPER::new ( 3208 my $self = $class->SUPER::new (
2121 fontsize => 1, 3209 fontsize => 1,
2122 can_events => 0, 3210 can_events => 1,
3211 indent => 0,
2123 #font => default_font 3212 #font => default_font
2124 @_, 3213 @_,
2125 3214
2126 layout => (new CFClient::Layout 1), 3215 layout => (new CFPlus::Layout),
2127 par => [], 3216 par => [],
3217 max_par => 0,
2128 height => 0, 3218 height => 0,
2129 children => [ 3219 children => [
2130 (new CFClient::UI::Empty expand => 1), 3220 (new CFPlus::UI::Empty expand => 1),
2131 (new CFClient::UI::Slider vertical => 1), 3221 (new CFPlus::UI::Slider vertical => 1),
2132 ], 3222 ],
2133 ); 3223 );
2134 3224
2135 $self->{children}[1]->connect (changed => sub { $self->update }); 3225 $self->{children}[1]->connect (changed => sub { $self->update });
2136 3226
… …
2142 3232
2143 $self->{fontsize} = $fontsize; 3233 $self->{fontsize} = $fontsize;
2144 $self->reflow; 3234 $self->reflow;
2145} 3235}
2146 3236
2147sub text_height { 3237sub size_request {
3238 my ($self) = @_;
3239
3240 my ($empty, $slider) = $self->visible_children;
3241
3242 local $self->{children} = [$empty, $slider];
3243 $self->SUPER::size_request
3244}
3245
3246sub invoke_size_allocate {
3247 my ($self, $w, $h) = @_;
3248
3249 my ($empty, $slider, @other) = @{ $self->{children} };
3250 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3251
3252 $self->{layout}->set_font ($self->{font}) if $self->{font};
3253 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
3254 $self->{layout}->set_width ($empty->{w});
3255 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3256
3257 $self->reflow;
3258
3259 local $self->{children} = [$empty, $slider];
3260 $self->SUPER::invoke_size_allocate ($w, $h)
3261}
3262
3263sub invoke_mouse_wheel {
2148 my ($self, $text) = @_; 3264 my ($self, $ev) = @_;
3265
3266 return 0 unless $ev->{dy}; # only vertical movements
3267
3268 $self->{children}[1]->emit (mouse_wheel => $ev);
3269
3270 1
3271}
3272
3273sub get_layout {
3274 my ($self, $para) = @_;
2149 3275
2150 my $layout = $self->{layout}; 3276 my $layout = $self->{layout};
2151 3277
3278 $layout->set_font ($self->{font}) if $self->{font};
3279 $layout->set_foreground (@{$para->{fg}});
2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3280 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153 $layout->set_width ($self->{children}[0]{w}); 3281 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3282 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2154 $layout->set_markup ($text); 3283 $layout->set_markup ($para->{markup});
3284
3285 $layout->set_shapes (
3286 map
3287 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3288 @{$para->{widget}}
2155 3289 );
2156 ($layout->size)[1] 3290
3291 $layout
2157} 3292}
2158 3293
2159sub reflow { 3294sub reflow {
2160 my ($self) = @_; 3295 my ($self) = @_;
2161 3296
2162 $self->{need_reflow}++; 3297 $self->{need_reflow}++;
2163 $self->update; 3298 $self->update;
2164} 3299}
2165 3300
2166sub size_allocate { 3301sub set_offset {
3302 my ($self, $offset) = @_;
3303
3304 # todo: base offset on lines or so, not on pixels
3305 $self->{children}[1]->set_value ($offset);
3306}
3307
3308sub current_paragraph {
3309 my ($self) = @_;
3310
3311 $self->{top_paragraph} - 1
3312}
3313
3314sub scroll_to {
2167 my ($self, $w, $h) = @_; 3315 my ($self, $para) = @_;
2168 3316
2169 $self->SUPER::size_allocate ($w, $h); 3317 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2170 3318
2171 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3319 $self->{scroll_to} = $para;
2172 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3320 $self->update;
2173 $self->{layout}->set_width ($self->{children}[0]{w}); 3321}
2174 3322
2175 $self->reflow; 3323sub clear {
3324 my ($self) = @_;
3325
3326 my (undef, undef, @other) = @{ $self->{children} };
3327 $self->remove ($_) for @other;
3328
3329 $self->{par} = [];
3330 $self->{height} = 0;
3331 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2176} 3332}
2177 3333
2178sub add_paragraph { 3334sub add_paragraph {
2179 my ($self, $color, $text) = @_; 3335 my $self = shift;
2180 3336
2181 #TODO: intelligently "reformat" paragraph 3337 for my $para (@_) {
3338 $para = {
3339 fg => [1, 1, 1, 1],
3340 indent => 0,
3341 markup => "",
3342 widget => [],
3343 ref $para ? %$para : (markup => $para),
3344 w => 1e10,
3345 wrapped => 1,
3346 };
2182 3347
2183 my $height = $self->text_height ($text); 3348 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3349 push @{$self->{par}}, $para;
3350 }
2184 3351
3352 if (my $max = $self->{max_par}) {
3353 shift @{$self->{par}} while @{$self->{par}} > $max;
3354 }
3355
3356 $self->{need_reflow}++;
3357 $self->update;
3358}
3359
3360sub scroll_to_bottom {
3361 my ($self) = @_;
3362
3363 $self->{scroll_to} = $#{$self->{par}};
3364 $self->update;
3365}
3366
3367sub force_uptodate {
3368 my ($self) = @_;
3369
3370 if (delete $self->{need_reflow}) {
3371 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3372
3373 my $height = 0;
3374
3375 for my $para (@{$self->{par}}) {
3376 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3377 my $layout = $self->get_layout ($para);
3378 my ($w, $h) = $layout->size;
3379
3380 $para->{w} = $w + $para->{indent};
3381 $para->{h} = $h;
3382 $para->{wrapped} = $layout->has_wrapped;
3383 }
3384
3385 $para->{y} = $height;
3386 $height += $para->{h};
3387 }
3388
2185 $self->{height} += $height; 3389 $self->{height} = $height;
3390 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2186 3391
2187 push @{$self->{par}}, [$height, $color, $text]; 3392 delete $self->{texture};
3393 }
2188 3394
2189 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3395 if (my $paridx = delete $self->{scroll_to}) {
2190 $self->{children}[1]->update; 3396 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3397 }
2191} 3398}
2192 3399
2193sub update { 3400sub update {
2194 my ($self) = @_; 3401 my ($self) = @_;
2195 3402
… …
2197 3404
2198 return unless $self->{h} > 0; 3405 return unless $self->{h} > 0;
2199 3406
2200 delete $self->{texture}; 3407 delete $self->{texture};
2201 3408
2202 $ROOT->on_post_alloc ($self, sub { 3409 $ROOT->on_post_alloc ($self => sub {
2203 if (delete $self->{need_reflow}) { 3410 $self->force_uptodate;
2204 my $height = 0;
2205 3411
2206 $height += $_->[0] = $self->text_height ($_->[2]) 3412 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2207 for @{$self->{par}};
2208 3413
2209 $self->{height} = $height; 3414 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2210
2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2212
2213 delete $self->{texture};
2214 }
2215
2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2217 glClearColor 0, 0, 0, 0; 3415 glClearColor 0, 0, 0, 0;
2218 glClear GL_COLOR_BUFFER_BIT; 3416 glClear GL_COLOR_BUFFER_BIT;
2219 3417
2220 glEnable GL_TEXTURE_2D; 3418 package CFPlus::UI::Base;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3419 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3420 (0, 0, $self->{w}, $self->{h});
2222 3421
2223 my $top = int $self->{children}[1]{range}[0]; 3422 my $top = int $self->{children}[1]{range}[0];
2224 3423
3424 my $paridx = 0;
3425 my $top_paragraph;
3426 my $top = int $self->{children}[1]{range}[0];
3427
2225 my $y0 = $top; 3428 my $y0 = $top;
2226 my $y1 = $top + $self->{h}; 3429 my $y1 = $top + $H;
2227 3430
2228 my $y = 0;
2229
2230 my $layout = $self->{layout};
2231
2232 $layout->set_font ($self->{font}) if $self->{font};
2233
2234 for my $par (@{$self->{par}}) { 3431 for my $para (@{$self->{par}}) {
2235 my $h = $par->[0]; 3432 my $h = $para->{h};
3433 my $y = $para->{y};
2236 3434
2237 if ($y0 < $y + $h && $y < $y1) { 3435 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] }); 3436 my $layout = $self->get_layout ($para);
2239 $layout->set_markup ($par->[2]);
2240 3437
2241 my ($W, $H) = $layout->size; 3438 $layout->render ($para->{indent}, $y - $y0);
2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 3439 $layout->draw;
3440
3441 if (my @w = @{ $para->{widget} }) {
3442 my @s = $layout->get_shapes;
3443
3444 for (@w) {
3445 my ($dx, $dy) = splice @s, 0, 2, ();
3446
3447 $_->{x} = $dx + $para->{indent};
3448 $_->{y} = $dy + $y - $y0;
3449
3450 $_->draw;
3451 }
3452 }
2243 } 3453 }
2244 3454
2245 $y += $h; 3455 $paridx++;
3456 $top_paragraph ||= $paridx if $y >= $top;
2246 } 3457 }
2247 3458
2248 glDisable GL_TEXTURE_2D; 3459 $self->{top_paragraph} = $top_paragraph;
2249 }; 3460 };
2250 }); 3461 });
2251} 3462}
2252 3463
3464sub reconfigure {
3465 my ($self) = @_;
3466
3467 $self->SUPER::reconfigure;
3468
3469 $_->{w} = 1e10 for @{ $self->{par} };
3470 $self->reflow;
3471}
3472
2253sub _draw { 3473sub _draw {
2254 my ($self) = @_; 3474 my ($self) = @_;
2255 3475
2256 glEnable GL_TEXTURE_2D; 3476 glEnable GL_TEXTURE_2D;
2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258 glColor 1, 1, 1, 1; 3478 glColor 0, 0, 0, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3479 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2260 glDisable GL_TEXTURE_2D; 3480 glDisable GL_TEXTURE_2D;
2261 3481
2262 $self->{children}[1]->draw; 3482 $self->{children}[1]->draw;
2263
2264} 3483}
2265 3484
2266############################################################################# 3485#############################################################################
2267 3486
2268package CFClient::UI::Animator; 3487package CFPlus::UI::Animator;
2269 3488
2270use CFClient::OpenGL; 3489use CFPlus::OpenGL;
2271 3490
2272our @ISA = CFClient::UI::Bin::; 3491our @ISA = CFPlus::UI::Bin::;
2273 3492
2274sub moveto { 3493sub moveto {
2275 my ($self, $x, $y) = @_; 3494 my ($self, $x, $y) = @_;
2276 3495
2277 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3496 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2305 glPopMatrix; 3524 glPopMatrix;
2306} 3525}
2307 3526
2308############################################################################# 3527#############################################################################
2309 3528
2310package CFClient::UI::Flopper; 3529package CFPlus::UI::Flopper;
2311 3530
2312our @ISA = CFClient::UI::Button::; 3531our @ISA = CFPlus::UI::Button::;
2313 3532
2314sub new { 3533sub new {
2315 my $class = shift; 3534 my $class = shift;
2316 3535
2317 my $self = $class->SUPER::new ( 3536 my $self = $class->SUPER::new (
2318 state => 0, 3537 state => 0,
2319 connect_activate => \&toggle_flopper, 3538 on_activate => \&toggle_flopper,
2320 @_ 3539 @_
2321 ); 3540 );
2322 3541
2323 if ($self->{state}) {
2324 $self->{state} = 0;
2325 $self->toggle_flopper;
2326 }
2327
2328 $self 3542 $self
2329} 3543}
2330 3544
2331sub toggle_flopper { 3545sub toggle_flopper {
2332 my ($self) = @_; 3546 my ($self) = @_;
2333 3547
2334 # TODO: use animation 3548 $self->{other}->toggle_visibility;
2335 if ($self->{state} = !$self->{state}) {
2336 $CFClient::UI::ROOT->add ($self->{other});
2337 $self->{other}->move ($self->coord2global (0, $self->{h}));
2338 $self->emit ("open");
2339 } else {
2340 $CFClient::UI::ROOT->remove ($self->{other});
2341 $self->emit ("close");
2342 }
2343
2344 $self->emit (changed => $self->{state});
2345} 3549}
2346 3550
2347############################################################################# 3551#############################################################################
2348 3552
2349package CFClient::UI::Tooltip; 3553package CFPlus::UI::Tooltip;
2350 3554
2351our @ISA = CFClient::UI::Bin::; 3555our @ISA = CFPlus::UI::Bin::;
2352 3556
2353use CFClient::OpenGL; 3557use CFPlus::OpenGL;
2354 3558
2355sub new { 3559sub new {
2356 my $class = shift; 3560 my $class = shift;
2357 3561
2358 $class->SUPER::new ( 3562 $class->SUPER::new (
… …
2362} 3566}
2363 3567
2364sub set_tooltip_from { 3568sub set_tooltip_from {
2365 my ($self, $widget) = @_; 3569 my ($self, $widget) = @_;
2366 3570
3571 my $tip = $widget->{tooltip};
3572 $tip = $tip->($widget) if "CODE" eq ref $tip;
3573
3574 $tip = CFPlus::Pod::section_label tooltip => $1
3575 if $tip =~ /^#(.*)$/;
3576
3577 if ($ENV{CFPLUS_DEBUG} & 2) {
3578 $tip .= "\n\n" . (ref $widget) . "\n"
3579 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3580 . "req $widget->{req_w} $widget->{req_h}\n"
3581 . "visible $widget->{visible}";
3582 }
3583
3584 $tip =~ s/^\n+//;
3585 $tip =~ s/\n+$//;
3586
2367 $self->add (new CFClient::UI::Label 3587 $self->add (new CFPlus::UI::Label
2368 markup => $widget->{tooltip}, 3588 markup => $tip,
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3589 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8, 3590 fontsize => 0.8,
2371 fg => [0, 0, 0, 1], 3591 style => 1, # FLAG_INVERSE
3592 ellipsise => 0,
2372 font => ($widget->{tooltip_font} || $::FONT_PROP), 3593 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 ); 3594 );
2374} 3595}
2375 3596
2376sub size_request { 3597sub size_request {
2377 my ($self) = @_; 3598 my ($self) = @_;
… …
2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3600 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2380 3601
2381 ($w + 4, $h + 4) 3602 ($w + 4, $h + 4)
2382} 3603}
2383 3604
2384sub size_allocate { 3605sub invoke_size_allocate {
2385 my ($self, $w, $h) = @_; 3606 my ($self, $w, $h) = @_;
2386 3607
2387 $self->SUPER::size_allocate ($w - 4, $h - 4); 3608 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3609}
3610
3611sub invoke_visibility_change {
3612 my ($self, $visible) = @_;
3613
3614 return unless $visible;
3615
3616 $self->{root}->on_post_alloc ("move_$self" => sub {
3617 my $widget = $self->{owner}
3618 or return;
3619
3620 if ($widget->{visible}) {
3621 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3622
3623 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3624 if $x + $self->{w} > $self->{root}{w};
3625
3626 $self->move_abs ($x, $y);
3627 } else {
3628 $self->hide;
3629 }
3630 });
2388} 3631}
2389 3632
2390sub _draw { 3633sub _draw {
2391 my ($self) = @_; 3634 my ($self) = @_;
2392 3635
2393 glTranslate 0.375, 0.375;
2394
2395 my ($w, $h) = @$self{qw(w h)}; 3636 my ($w, $h) = @$self{qw(w h)};
2396 3637
2397 glColor 1, 0.8, 0.4; 3638 glColor 1, 0.8, 0.4;
2398 glBegin GL_QUADS; 3639 glRect 0, 0, $w, $h;
2399 glVertex 0 , 0;
2400 glVertex 0 , $h;
2401 glVertex $w, $h;
2402 glVertex $w, 0;
2403 glEnd;
2404 3640
2405 glColor 0, 0, 0; 3641 glColor 0, 0, 0;
2406 glBegin GL_LINE_LOOP; 3642 glRect_lineloop .5, .5, $w + .5, $h + .5;
2407 glVertex 0 , 0;
2408 glVertex 0 , $h;
2409 glVertex $w, $h;
2410 glVertex $w, 0;
2411 glEnd;
2412 3643
2413 glTranslate 2 - 0.375, 2 - 0.375; 3644 glTranslate 2, 2;
3645
2414 $self->SUPER::_draw; 3646 $self->SUPER::_draw;
2415} 3647}
2416 3648
2417############################################################################# 3649#############################################################################
2418 3650
2419package CFClient::UI::Face; 3651package CFPlus::UI::Face;
2420 3652
2421our @ISA = CFClient::UI::Base::; 3653our @ISA = CFPlus::UI::DrawBG::;
2422 3654
2423use CFClient::OpenGL; 3655use CFPlus::OpenGL;
2424 3656
2425sub new { 3657sub new {
2426 my $class = shift; 3658 my $class = shift;
2427 3659
2428 $class->SUPER::new ( 3660 my $self = $class->SUPER::new (
3661 size_w => 32,
3662 size_h => 8,
2429 aspect => 1, 3663 aspect => 1,
3664 can_events => 0,
2430 @_, 3665 @_,
2431 ) 3666 );
3667
3668 if ($self->{anim} && $self->{animspeed}) {
3669 CFPlus::weaken (my $widget = $self);
3670
3671 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3672 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3673 $self->{timer} = Event->timer (
3674 parked => 1,
3675 cb => sub {
3676 return unless $::CONN;
3677
3678 my $w = $widget
3679 or return;
3680
3681 ++$w->{frame};
3682 $w->update_face;
3683
3684 # somehow, $widget can go away
3685 $w->update;
3686 $w->update_timer;
3687 },
3688 );
3689
3690 $self->update_face;
3691 $self->update_timer;
3692 }
3693
3694 $self
3695}
3696
3697sub update_timer {
3698 my ($self) = @_;
3699
3700 return unless $self->{timer};
3701
3702 if ($self->{visible}) {
3703 $self->{timer}->at (
3704 $self->{anim_start}
3705 + $self->{animspeed}
3706 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3707 );
3708 $self->{timer}->start;
3709 } else {
3710 $self->{timer}->stop;
3711 }
3712}
3713
3714sub update_face {
3715 my ($self) = @_;
3716
3717 if ($::CONN) {
3718 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3719 if ($anim && @$anim) {
3720 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3721 delete $self->{face_change_cb};
3722
3723 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3724 unless ($tex->{name} || $tex->{loading}) {
3725 $tex->upload (sub { $self->reconfigure });
3726 }
3727 }
3728 }
3729 }
3730 }
2432} 3731}
2433 3732
2434sub size_request { 3733sub size_request {
2435 (32, 8) 3734 my ($self) = @_;
3735
3736 if ($::CONN) {
3737 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3738 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3739 if ($tex->{name}) {
3740 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3741 } elsif (!$tex->{loading}) {
3742 $tex->upload (sub { $self->reconfigure });
3743 }
3744 }
3745
3746 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3747 }
3748 }
3749
3750 ($self->{size_w} || 8, $self->{size_h} || 8)
3751}
3752
3753sub update {
3754 my ($self) = @_;
3755
3756 return unless $self->{visible};
3757
3758 $self->SUPER::update;
3759}
3760
3761sub invoke_visibility_change {
3762 my ($self) = @_;
3763
3764 $self->update_timer;
3765
3766 0
2436} 3767}
2437 3768
2438sub _draw { 3769sub _draw {
2439 my ($self) = @_; 3770 my ($self) = @_;
2440 3771
2441 return unless $::CONN;#d# manage and cache textures differently 3772 $self->SUPER::_draw;
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2443 3773
2444 # TODO animation 3774 if (my $tex = $self->{tex}) {
2445 if ($tex) {
2446 glEnable GL_TEXTURE_2D; 3775 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1; 3777 glColor 0, 0, 0, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3778 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D; 3779 glDisable GL_TEXTURE_2D;
2451 } 3780 }
2452} 3781}
2453 3782
3783sub destroy {
3784 my ($self) = @_;
3785
3786 (delete $self->{timer})->cancel
3787 if $self->{timer};
3788
3789 $self->SUPER::destroy;
3790}
3791
2454############################################################################# 3792#############################################################################
2455 3793
2456package CFClient::UI::InventoryItem; 3794package CFPlus::UI::Buttonbar;
2457 3795
2458our @ISA = CFClient::UI::HBox::; 3796our @ISA = CFPlus::UI::HBox::;
2459 3797
2460sub new { 3798# TODO: should actually wrap buttons and other goodies.
2461 my $class = shift;
2462
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new (
2473 can_hover => 1,
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519 3799
2520############################################################################# 3800#############################################################################
2521 3801
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_,
2532 );
2533
2534 $self
2535}
2536
2537sub set_items {
2538 my ($self, $items) = @_;
2539
2540 $self->{scrolled}->clear;
2541 return unless $items;
2542
2543 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2544
2545 $self->{real_items} = \@items;
2546
2547 for my $item (@items) {
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2553 }
2554
2555# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556}
2557
2558sub size_request {
2559 my ($self) = @_;
2560 ($self->{req_w}, $self->{req_h});
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Menu; 3802package CFPlus::UI::Menu;
2566 3803
2567our @ISA = CFClient::UI::FancyFrame::; 3804our @ISA = CFPlus::UI::Toplevel::;
2568 3805
2569use CFClient::OpenGL; 3806use CFPlus::OpenGL;
2570 3807
2571sub new { 3808sub new {
2572 my $class = shift; 3809 my $class = shift;
2573 3810
2574 my $self = $class->SUPER::new ( 3811 my $self = $class->SUPER::new (
2575 items => [], 3812 items => [],
2576 z => 100, 3813 z => 100,
2577 @_, 3814 @_,
2578 ); 3815 );
2579 3816
2580 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3817 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2581 3818
2582 for my $item (@{ $self->{items} }) { 3819 for my $item (@{ $self->{items} }) {
2583 my ($widget, $cb) = @$item; 3820 my ($widget, $cb, $tooltip) = @$item;
2584 3821
2585 # handle various types of items, only text for now 3822 # handle various types of items, only text for now
2586 if (!ref $widget) { 3823 if (!ref $widget) {
3824 if ($widget =~ /\t/) {
3825 my ($left, $right) = split /\t/, $widget, 2;
3826
2587 $widget = new CFClient::UI::Label 3827 $widget = new CFPlus::UI::HBox
2588 can_hover => 1, 3828 can_hover => 1,
2589 can_events => 1, 3829 can_events => 1,
3830 tooltip => $tooltip,
3831 children => [
3832 (new CFPlus::UI::Label markup => $left, expand => 1),
3833 (new CFPlus::UI::Label markup => $right, align => +1),
3834 ],
3835 ;
3836
3837 } else {
3838 $widget = new CFPlus::UI::Label
3839 can_hover => 1,
3840 can_events => 1,
2590 text => $widget; 3841 markup => $widget,
3842 tooltip => $tooltip;
3843 }
2591 } 3844 }
2592 3845
2593 $self->{item}{$widget} = $item; 3846 $self->{item}{$widget} = $item;
2594 3847
2595 $self->{vbox}->add ($widget); 3848 $self->{vbox}->add ($widget);
… …
2607 # maybe save $GRAB? must be careful about events... 3860 # maybe save $GRAB? must be careful about events...
2608 $GRAB = $self; 3861 $GRAB = $self;
2609 $self->{button} = $ev->{button}; 3862 $self->{button} = $ev->{button};
2610 3863
2611 $self->show; 3864 $self->show;
2612 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3865 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2613} 3866}
2614 3867
2615sub mouse_motion { 3868sub invoke_mouse_motion {
2616 my ($self, $ev, $x, $y) = @_; 3869 my ($self, $ev, $x, $y) = @_;
2617 3870
2618 # TODO: should use vbox->find_widget or so 3871 # TODO: should use vbox->find_widget or so
2619 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3872 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2620 $self->{hover} = $self->{item}{$HOVER}; 3873 $self->{hover} = $self->{item}{$HOVER};
2621}
2622 3874
3875 0
3876}
3877
2623sub button_up { 3878sub invoke_button_up {
2624 my ($self, $ev, $x, $y) = @_; 3879 my ($self, $ev, $x, $y) = @_;
2625 3880
2626 if ($ev->{button} == $self->{button}) { 3881 if ($ev->{button} == $self->{button}) {
2627 undef $GRAB; 3882 undef $GRAB;
2628 $self->hide; 3883 $self->hide;
2629 3884
2630 $self->emit ("popdown"); 3885 $self->emit ("popdown");
2631 $self->{hover}[1]->() if $self->{hover}; 3886 $self->{hover}[1]->() if $self->{hover};
3887 } else {
3888 return 0
3889 }
3890
2632 } 3891 1
2633} 3892}
2634 3893
2635############################################################################# 3894#############################################################################
2636 3895
2637package CFClient::UI::Statusbox; 3896package CFPlus::UI::Multiplexer;
2638 3897
3898our @ISA = CFPlus::UI::Container::;
3899
3900sub new {
3901 my $class = shift;
3902
3903 my $self = $class->SUPER::new (
3904 @_,
3905 );
3906
3907 $self->{current} = $self->{children}[0]
3908 if @{ $self->{children} };
3909
3910 $self
3911}
3912
3913sub add {
3914 my ($self, @widgets) = @_;
3915
3916 $self->SUPER::add (@widgets);
3917
3918 $self->{current} = $self->{children}[0]
3919 if @{ $self->{children} };
3920}
3921
3922sub get_current_page {
3923 my ($self) = @_;
3924
3925 $self->{current}
3926}
3927
3928sub set_current_page {
3929 my ($self, $page_or_widget) = @_;
3930
3931 my $widget = ref $page_or_widget
3932 ? $page_or_widget
3933 : $self->{children}[$page_or_widget];
3934
3935 $self->{current} = $widget;
3936 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3937
3938 $self->emit (page_changed => $self->{current});
3939
3940 $self->realloc;
3941}
3942
3943sub visible_children {
3944 $_[0]{current}
3945}
3946
3947sub size_request {
3948 my ($self) = @_;
3949
3950 $self->{current}->size_request
3951}
3952
3953sub invoke_size_allocate {
3954 my ($self, $w, $h) = @_;
3955
3956 $self->{current}->configure (0, 0, $w, $h);
3957
3958 1
3959}
3960
3961sub _draw {
3962 my ($self) = @_;
3963
3964 $self->{current}->draw;
3965}
3966
3967#############################################################################
3968
3969package CFPlus::UI::Notebook;
3970
3971use CFPlus::OpenGL;
3972
2639our @ISA = CFClient::UI::VBox::; 3973our @ISA = CFPlus::UI::VBox::;
3974
3975sub new {
3976 my $class = shift;
3977
3978 my $self = $class->SUPER::new (
3979 buttonbar => (new CFPlus::UI::Buttonbar),
3980 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3981 active_outline => [.7, .7, 0.2],
3982 # filter => # will be put between multiplexer and $self
3983 @_,
3984 );
3985
3986 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3987 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3988
3989 {
3990 Scalar::Util::weaken (my $wself = $self);
3991
3992 $self->{multiplexer}->connect (c_add => sub {
3993 my ($mplex, $widgets) = @_;
3994
3995 for my $child (@$widgets) {
3996 Scalar::Util::weaken $child;
3997 $child->{c_tab_} ||= do {
3998 my $tab =
3999 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4000 ? $child->{c_tab}
4001 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4002
4003 $tab->connect (activate => sub {
4004 $wself->set_current_page ($child);
4005 });
4006
4007 $tab
4008 };
4009
4010 $self->{buttonbar}->add ($child->{c_tab_});
4011 }
4012 });
4013
4014 $self->{multiplexer}->connect (c_remove => sub {
4015 my ($mplex, $widgets) = @_;
4016
4017 for my $child (@$widgets) {
4018 $wself->{buttonbar}->remove ($child->{c_tab_});
4019 }
4020 });
4021 }
4022
4023 $self
4024}
4025
4026sub add {
4027 my ($self, @widgets) = @_;
4028
4029 $self->{multiplexer}->add (@widgets)
4030}
4031
4032sub remove {
4033 my ($self, @widgets) = @_;
4034
4035 $self->{multiplexer}->remove (@widgets)
4036}
4037
4038sub pages {
4039 my ($self) = @_;
4040 $self->{multiplexer}->children
4041}
4042
4043sub add_tab {
4044 my ($self, $title, $widget, $tooltip) = @_;
4045
4046 $title = [$title, $tooltip] unless ref $title;
4047 $widget->{c_tab} = $title;
4048
4049 $self->add ($widget);
4050}
4051
4052sub get_current_page {
4053 my ($self) = @_;
4054
4055 $self->{multiplexer}->get_current_page
4056}
4057
4058sub set_current_page {
4059 my ($self, $page) = @_;
4060
4061 $self->{multiplexer}->set_current_page ($page);
4062 $self->emit (page_changed => $self->{multiplexer}{current});
4063}
4064
4065sub _draw {
4066 my ($self) = @_;
4067
4068 $self->SUPER::_draw ();
4069
4070 if (my $cur = $self->{multiplexer}{current}) {
4071 if ($cur = $cur->{c_tab_}) {
4072 glTranslate $self->{buttonbar}{x} + $cur->{x},
4073 $self->{buttonbar}{y} + $cur->{y};
4074 glLineWidth 3;
4075 #glEnable GL_BLEND;
4076 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4077 glColor @{$self->{active_outline}};
4078 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4079 glLineWidth 1;
4080 #glDisable GL_BLEND;
4081 }
4082 }
4083}
4084
4085#############################################################################
4086
4087package CFPlus::UI::Selector;
4088
4089use utf8;
4090
4091our @ISA = CFPlus::UI::Button::;
4092
4093sub new {
4094 my $class = shift;
4095
4096 my $self = $class->SUPER::new (
4097 options => [], # [value, title, longdesc], ...
4098 value => undef,
4099 @_,
4100 );
4101
4102 $self->_set_value ($self->{value});
4103
4104 $self
4105}
4106
4107sub invoke_button_down {
4108 my ($self, $ev) = @_;
4109
4110 my @menu_items;
4111
4112 for (@{ $self->{options} }) {
4113 my ($value, $title, $tooltip) = @$_;
4114
4115 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4116 }
4117
4118 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
4119}
4120
4121sub _set_value {
4122 my ($self, $value) = @_;
4123
4124 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
4125 or return;
4126
4127 $self->{value} = $item->[0];
4128 $self->set_markup ("$item->[1] ⇓");
4129 $self->set_tooltip ($item->[2]);
4130}
4131
4132sub set_value {
4133 my ($self, $value) = @_;
4134
4135 return unless $self->{value} ne $value;
4136
4137 $self->_set_value ($value);
4138 $self->emit (changed => $value);
4139}
4140
4141#############################################################################
4142
4143package CFPlus::UI::Statusbox;
4144
4145our @ISA = CFPlus::UI::VBox::;
4146
4147sub new {
4148 my $class = shift;
4149
4150 my $self = $class->SUPER::new (
4151 fontsize => 0.8,
4152 @_,
4153 );
4154
4155 CFPlus::weaken (my $this = $self);
4156
4157 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
4158
4159 $self
4160}
2640 4161
2641sub reorder { 4162sub reorder {
2642 my ($self) = @_; 4163 my ($self) = @_;
2643 my $NOW = time; 4164 my $NOW = Time::HiRes::time;
4165
4166 # freeze display when hovering over any label
4167 return if $CFPlus::UI::TOOLTIP->{owner}
4168 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
4169 values %{ $self->{item} };
2644 4170
2645 while (my ($k, $v) = each %{ $self->{item} }) { 4171 while (my ($k, $v) = each %{ $self->{item} }) {
2646 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4172 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2647 } 4173 }
2648 4174
… …
2651 my @items = sort { 4177 my @items = sort {
2652 $a->{pri} <=> $b->{pri} 4178 $a->{pri} <=> $b->{pri}
2653 or $b->{id} <=> $a->{id} 4179 or $b->{id} <=> $a->{id}
2654 } values %{ $self->{item} }; 4180 } values %{ $self->{item} };
2655 4181
4182 $self->{timer}->interval (1);
4183
2656 my $count = 10 + 1; 4184 my $count = 10 + 1;
2657 for my $item (@items) { 4185 for my $item (@items) {
2658 last unless --$count; 4186 last unless --$count;
2659 4187
2660 push @widgets, $item->{label} ||= do { 4188 my $label = $item->{label} ||= do {
2661 # TODO: doesn't handle markup well (read as: at all) 4189 # TODO: doesn't handle markup well (read as: at all)
2662 my $short = $item->{count} > 1 4190 my $short = $item->{count} > 1
2663 ? "<b>$item->{count} ×</b> $item->{text}" 4191 ? "<b>$item->{count} ×</b> $item->{text}"
2664 : $item->{text}; 4192 : $item->{text};
2665 4193
2666 for ($short) { 4194 for ($short) {
2667 s/^\s+//; 4195 s/^\s+//;
2668 s/\012.*/…/s; 4196 s/\s+/ /g;
2669 my $len = int 40 / $item->{fontsize};
2670 substr $_, $len, length, "…" if $len < length;
2671 } 4197 }
2672 4198
2673 new CFClient::UI::Label 4199 new CFPlus::UI::Label
2674 markup => $short, 4200 markup => $short,
2675 tooltip => $item->{tooltip}, 4201 tooltip => $item->{tooltip},
2676 tooltip_font => $::FONT_PROP, 4202 tooltip_font => $::FONT_PROP,
2677 tooltip_width => 0.67, 4203 tooltip_width => 0.67,
2678 fontsize => $item->{fontsize}, 4204 fontsize => $item->{fontsize} || $self->{fontsize},
2679 color => $item->{color}, 4205 max_w => $::WIDTH * 0.44,
4206 fg => [@{ $item->{fg} }],
2680 can_events => 1, 4207 can_events => 1,
2681 can_hover => 1 4208 can_hover => 1
2682 }; 4209 };
4210
4211 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4212 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4213 $label->update;
4214 $label->set_max_size (undef, $label->{req_h} * $diff)
4215 if $diff < 1;
4216 $self->{timer}->interval (1/30);
4217 } else {
4218 $label->{fg}[3] = $item->{fg}[3] || 1;
4219 }
4220
4221 push @widgets, $label;
2683 } 4222 }
2684 4223
2685 $self->clear; 4224 $self->clear;
2686 $self->SUPER::add (reverse @widgets); 4225 $self->SUPER::add (reverse @widgets);
2687} 4226}
… …
2690 my ($self, $text, %arg) = @_; 4229 my ($self, $text, %arg) = @_;
2691 4230
2692 $text =~ s/^\s+//; 4231 $text =~ s/^\s+//;
2693 $text =~ s/\s+$//; 4232 $text =~ s/\s+$//;
2694 4233
4234 return unless $text;
4235
2695 my $timeout = time + ((delete $arg{timeout}) || 60); 4236 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2696 4237
2697 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4238 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2698 4239
2699 if (my $item = $self->{item}{$group}) { 4240 if (my $item = $self->{item}{$group}) {
2700 if ($item->{text} eq $text) { 4241 if ($item->{text} eq $text) {
2701 $item->{count}++; 4242 $item->{count}++;
2702 } else { 4243 } else {
2703 $item->{count} = 1; 4244 $item->{count} = 1;
2704 $item->{text} = $item->{tooltip} = $text; 4245 $item->{text} = $item->{tooltip} = $text;
2705 } 4246 }
2706 $item->{id} = ++$self->{id}; 4247 $item->{id} += 0.2;#d#
2707 $item->{timeout} = $timeout; 4248 $item->{timeout} = $timeout;
2708 delete $item->{label}; 4249 delete $item->{label};
2709 } else { 4250 } else {
2710 $self->{item}{$group} = { 4251 $self->{item}{$group} = {
2711 id => ++$self->{id}, 4252 id => ++$self->{id},
2712 text => $text, 4253 text => $text,
2713 timeout => $timeout, 4254 timeout => $timeout,
2714 tooltip => $text, 4255 tooltip => $text,
2715 fontsize => 0.8,
2716 color => [0.8, 0.8, 0.8, 0.8], 4256 fg => [0.8, 0.8, 0.8, 0.8],
2717 pri => 0, 4257 pri => 0,
2718 count => 1, 4258 count => 1,
2719 %arg, 4259 %arg,
2720 }; 4260 };
2721 } 4261 }
2722 4262
4263 $ROOT->on_refresh (reorder => sub {
4264 $self->reorder;
4265 });
4266}
4267
4268sub reconfigure {
4269 my ($self) = @_;
4270
4271 delete $_->{label}
4272 for values %{ $self->{item} || {} };
4273
2723 $self->reorder; 4274 $self->reorder;
4275 $self->SUPER::reconfigure;
4276}
4277
4278sub destroy {
4279 my ($self) = @_;
4280
4281 $self->{timer}->cancel;
4282
4283 $self->SUPER::destroy;
2724} 4284}
2725 4285
2726############################################################################# 4286#############################################################################
2727 4287
2728package CFClient::UI::Root; 4288package CFPlus::UI::Root;
2729 4289
2730our @ISA = CFClient::UI::Container::; 4290our @ISA = CFPlus::UI::Container::;
2731 4291
4292use List::Util qw(min max);
4293
2732use CFClient::OpenGL; 4294use CFPlus::OpenGL;
2733 4295
2734sub new { 4296sub new {
2735 my $class = shift; 4297 my $class = shift;
2736 4298
2737 $class->SUPER::new ( 4299 my $self = $class->SUPER::new (
4300 visible => 1,
2738 @_, 4301 @_,
2739 ) 4302 );
2740}
2741 4303
2742sub configure { 4304 CFPlus::weaken ($self->{root} = $self);
2743 my ($self, $x, $y, $w, $h) = @_;
2744 4305
2745 $self->{w} = $w; 4306 $self
2746 $self->{h} = $h;
2747}
2748
2749sub check_size {
2750 my ($self) = @_;
2751
2752 $self->size_allocate ($self->{w}, $self->{h})
2753 if $self->{w};
2754} 4307}
2755 4308
2756sub size_request { 4309sub size_request {
2757 my ($self) = @_; 4310 my ($self) = @_;
2758 4311
2759 ($self->{w}, $self->{h}) 4312 ($self->{w}, $self->{h})
2760} 4313}
2761 4314
4315sub _to_pixel {
4316 my ($coord, $size, $max) = @_;
4317
4318 $coord =
4319 $coord eq "center" ? ($max - $size) * 0.5
4320 : $coord eq "max" ? $max
4321 : $coord;
4322
4323 $coord = 0 if $coord < 0;
4324 $coord = $max - $size if $coord > $max - $size;
4325
4326 int $coord + 0.5
4327}
4328
2762sub size_allocate { 4329sub invoke_size_allocate {
2763 my ($self, $w, $h) = @_; 4330 my ($self, $w, $h) = @_;
2764
2765 my $old_w = $self->{old_w};
2766 my $old_h = $self->{old_h};
2767
2768 if ($old_w && $old_h) {
2769 for my $child ($self->children) {
2770 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778 }
2779 }
2780 4331
2781 for my $child ($self->children) { 4332 for my $child ($self->children) {
2782 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4333 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2783 4334
2784 $X = List::Util::max 0, List::Util::min $w - $W, $X; 4335 $X = $child->{force_x} if exists $child->{force_x};
2785 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 4336 $Y = $child->{force_y} if exists $child->{force_y};
4337
4338 $X = _to_pixel $X, $W, $self->{w};
4339 $Y = _to_pixel $Y, $H, $self->{h};
4340
2786 $child->configure ($X, $Y, $W, $H); 4341 $child->configure ($X, $Y, $W, $H);
2787 } 4342 }
2788 4343
2789 $self->{old_w} = $w; 4344 1
2790 $self->{old_h} = $h;
2791} 4345}
2792 4346
2793sub coord2local { 4347sub coord2local {
2794 my ($self, $x, $y) = @_; 4348 my ($self, $x, $y) = @_;
2795 4349
… …
2803} 4357}
2804 4358
2805sub update { 4359sub update {
2806 my ($self) = @_; 4360 my ($self) = @_;
2807 4361
2808 $self->check_size;
2809 $::WANT_REFRESH++; 4362 $::WANT_REFRESH->start;
2810} 4363}
2811 4364
2812sub add { 4365sub add {
2813 my ($self, $child) = @_; 4366 my ($self, @children) = @_;
2814 4367
2815 # integerise window positions 4368 $_->{is_toplevel} = 1
2816 $child->{x} = int $child->{x}; 4369 for @children;
2817 $child->{y} = int $child->{y};
2818 4370
2819 $self->SUPER::add ($child); 4371 $self->SUPER::add (@children);
4372}
4373
4374sub remove {
4375 my ($self, @children) = @_;
4376
4377 $self->SUPER::remove (@children);
4378
4379 delete $self->{is_toplevel}
4380 for @children;
4381
4382 while (@children) {
4383 my $w = pop @children;
4384 push @children, $w->children;
4385 $w->set_invisible;
4386 }
2820} 4387}
2821 4388
2822sub on_refresh { 4389sub on_refresh {
2823 my ($self, $id, $cb) = @_; 4390 my ($self, $id, $cb) = @_;
2824 4391
… …
2837 while ($self->{refresh_hook}) { 4404 while ($self->{refresh_hook}) {
2838 $_->() 4405 $_->()
2839 for values %{delete $self->{refresh_hook}}; 4406 for values %{delete $self->{refresh_hook}};
2840 } 4407 }
2841 4408
2842 if ($self->{check_size}) { 4409 while ($self->{realloc}) {
2843 my @queue = ([], []); 4410 my %queue;
4411 my @queue;
4412 my $widget;
2844 4413
2845 for (;;) { 4414 outer:
2846 if ($self->{check_size}) { 4415 while () {
2847 # heuristic: check containers last 4416 if (my $realloc = delete $self->{realloc}) {
2848 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4417 for $widget (values %$realloc) {
2849 for values %{delete $self->{check_size}} 4418 $widget->{visible} or next; # do not resize invisible widgets
4419
4420 $queue{$widget+0}++ and next; # duplicates are common
4421
4422 push @{ $queue[$widget->{visible}] }, $widget;
4423 }
2850 } 4424 }
2851 4425
2852 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4426 while () {
4427 @queue or last outer;
2853 4428
2854 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4429 $widget = pop @{ $queue[-1] || [] }
2855 ? @$widget{qw(user_w user_h)} 4430 and last;
2856 : $widget->size_request;
2857
2858 if (delete $widget->{force_alloc}
2859 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2860 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2861 4431
4432 pop @queue;
4433 }
4434
4435 delete $queue{$widget+0};
4436
4437 my ($w, $h) = $widget->size_request;
4438
4439 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4440 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4441
4442 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4443 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4444
4445 $w = $widget->{force_w} if exists $widget->{force_w};
4446 $h = $widget->{force_h} if exists $widget->{force_h};
4447
4448 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4449 || delete $widget->{force_realloc}) {
2862 $widget->{req_w} = $w; 4450 $widget->{req_w} = $w;
2863 $widget->{req_h} = $h; 4451 $widget->{req_h} = $h;
2864 4452
2865 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4453 $self->{size_alloc}{$widget+0} = $widget;
2866 4454
2867 $widget->{parent}->check_size
2868 if $widget->{parent}; 4455 if (my $parent = $widget->{parent}) {
4456 $self->{realloc}{$parent+0} = $parent
4457 unless $queue{$parent+0};
4458
4459 $parent->{force_size_alloc} = 1;
4460 $self->{size_alloc}{$parent+0} = $parent;
4461 }
2869 } 4462 }
4463
4464 delete $self->{realloc}{$widget+0};
2870 } 4465 }
2871 }
2872 4466
2873 while ($self->{size_alloc}) { 4467 while (my $size_alloc = delete $self->{size_alloc}) {
2874 for (values %{delete $self->{size_alloc}}) { 4468 my @queue = sort { $a->{visible} <=> $b->{visible} }
2875 my ($widget, $w, $h) = @$_; 4469 values %$size_alloc;
2876 4470
4471 while () {
4472 my $widget = pop @queue || last;
4473
4474 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4475
4476 $w = max $widget->{min_w}, $w;
4477 $h = max $widget->{min_h}, $h;
4478
4479# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4480# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4481
4482 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4483 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4484
2877 $w = 0 if $w < 0; 4485 $w = int $w + 0.5;
2878 $h = 0 if $h < 0; 4486 $h = int $h + 0.5;
2879 4487
4488 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4489 $widget->{old_w} = $widget->{w};
4490 $widget->{old_h} = $widget->{h};
4491
2880 $widget->{w} = $w; 4492 $widget->{w} = $w;
2881 $widget->{h} = $h; 4493 $widget->{h} = $h;
2882 $widget->size_allocate ($w, $h); 4494
2883 $widget->emit (size_allocate => $w, $h); 4495 $widget->emit (size_allocate => $w, $h);
4496 }
4497 }
2884 } 4498 }
2885 } 4499 }
2886 4500
2887 while ($self->{post_alloc_hook}) { 4501 while ($self->{post_alloc_hook}) {
2888 $_->() 4502 $_->()
… …
2893 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4507 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2894 glClear GL_COLOR_BUFFER_BIT; 4508 glClear GL_COLOR_BUFFER_BIT;
2895 4509
2896 glMatrixMode GL_PROJECTION; 4510 glMatrixMode GL_PROJECTION;
2897 glLoadIdentity; 4511 glLoadIdentity;
2898 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4512 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2899 glMatrixMode GL_MODELVIEW; 4513 glMatrixMode GL_MODELVIEW;
2900 glLoadIdentity; 4514 glLoadIdentity;
2901 4515
4516 {
4517 package CFPlus::UI::Base;
4518
4519 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4520 (0, 0, $self->{w}, $self->{h});
4521
2902 $self->_draw; 4522 $self->_draw;
4523 }
2903} 4524}
2904 4525
2905############################################################################# 4526#############################################################################
2906 4527
2907package CFClient::UI; 4528package CFPlus::UI;
2908 4529
2909$ROOT = new CFClient::UI::Root; 4530$ROOT = new CFPlus::UI::Root;
2910$TOOLTIP = new CFClient::UI::Tooltip; 4531$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2911 4532
29121 45331
2913 4534

Diff Legend

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