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

Diff Legend

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