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.238 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 2007 UTC

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

Diff Legend

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