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.235 by root, Thu May 25 16:35:42 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 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub DESTROY { 657sub DESTROY {
504 my ($self) = @_; 658 my ($self) = @_;
505 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
506 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
507 #$self->deactivate;
508} 666}
509 667
510############################################################################# 668#############################################################################
511 669
512package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
513 671
514our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
515 673
516use strict; 674use strict;
517use CFClient::OpenGL; 675use CFPlus::OpenGL;
518 676
519sub new { 677sub new {
520 my $class = shift; 678 my $class = shift;
521 679
522 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
537 695
538 if ($color && (@$color < 4 || $color->[3])) { 696 if ($color && (@$color < 4 || $color->[3])) {
539 my ($w, $h) = @$self{qw(w h)}; 697 my ($w, $h) = @$self{qw(w h)};
540 698
541 glEnable GL_BLEND; 699 glEnable GL_BLEND;
542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
543 glColor @$color; 701 glColor_premultiply @$color;
544 702
545 glBegin GL_QUADS; 703 glBegin GL_QUADS;
546 glVertex 0 , 0; 704 glVertex 0 , 0;
547 glVertex 0 , $h; 705 glVertex 0 , $h;
548 glVertex $w, $h; 706 glVertex $w, $h;
… …
553 } 711 }
554} 712}
555 713
556############################################################################# 714#############################################################################
557 715
558package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
559 717
560our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
561 719
562sub new { 720sub new {
563 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
565} 723}
566 724
567sub size_request { 725sub size_request {
568 (0, 0) 726 my ($self) = @_;
727
728 ($self->{w} + 0, $self->{h} + 0)
569} 729}
570 730
571sub draw { } 731sub draw { }
572 732
573############################################################################# 733#############################################################################
574 734
575package CFClient::UI::Container; 735package CFPlus::UI::Container;
576 736
577our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
578 738
579sub new { 739sub new {
580 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
581 741
582 my $children = delete $arg{children} || []; 742 my $children = delete $arg{children};
583 743
584 my $self = $class->SUPER::new ( 744 my $self = $class->SUPER::new (
585 children => [], 745 children => [],
586 can_events => 0, 746 can_events => 0,
587 %arg, 747 %arg,
588 ); 748 );
749
589 $self->add ($_) for @$children; 750 $self->add (@$children)
751 if $children;
590 752
591 $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;
592} 762}
593 763
594sub add { 764sub add {
595 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
596 766
… …
602 $self->{children} = [ 772 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 773 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 774 @{$self->{children}}, @widgets
605 ]; 775 ];
606 776
607 $self->check_size (1); 777 $self->realloc;
608 $self->update;
609} 778}
610 779
611sub children { 780sub children {
612 @{ $_[0]{children} } 781 @{ $_[0]{children} }
613} 782}
… …
618 delete $child->{parent}; 787 delete $child->{parent};
619 $child->hide; 788 $child->hide;
620 789
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 791
623 $self->check_size; 792 $self->realloc;
624 $self->update;
625} 793}
626 794
627sub clear { 795sub clear {
628 my ($self) = @_; 796 my ($self) = @_;
629 797
… …
633 for (@$children) { 801 for (@$children) {
634 delete $_->{parent}; 802 delete $_->{parent};
635 $_->hide; 803 $_->hide;
636 } 804 }
637 805
638 $self->check_size; 806 $self->realloc;
639 $self->update;
640} 807}
641 808
642sub find_widget { 809sub find_widget {
643 my ($self, $x, $y) = @_; 810 my ($self, $x, $y) = @_;
644 811
645 $x -= $self->{x}; 812 $x -= $self->{x};
646 $y -= $self->{y}; 813 $y -= $self->{y};
647 814
648 my $res; 815 my $res;
649 816
650 for (reverse @{ $self->{children} }) { 817 for (reverse $self->visible_children) {
651 $res = $_->find_widget ($x, $y) 818 $res = $_->find_widget ($x, $y)
652 and return $res; 819 and return $res;
653 } 820 }
654 821
655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 822 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
661 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
662} 829}
663 830
664############################################################################# 831#############################################################################
665 832
666package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
667 834
668our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
669 836
670sub new { 837sub new {
671 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
672 839
673 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
674 841
675 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
676} 843}
677 844
678sub add { 845sub add {
679 my ($self, $child) = @_; 846 my ($self, $child) = @_;
680 847
681 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
682
683 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
684} 850}
685 851
686sub remove { 852sub remove {
687 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
688 854
689 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
690 856
691 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
692 unless @{$self->{children}}; 858 unless @{$self->{children}};
693} 859}
694 860
695sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
696 862
697sub size_request { 863sub size_request {
698 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
699} 865}
700 866
701sub size_allocate { 867sub invoke_size_allocate {
702 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
703 869
704 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
705} 873}
706 874
707############################################################################# 875#############################################################################
708 876
877# back-buffered drawing area
878
709package CFClient::UI::Window; 879package CFPlus::UI::Window;
710 880
711our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
712 882
713use CFClient::OpenGL; 883use CFPlus::OpenGL;
714 884
715sub new { 885sub new {
716 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
717 887
718 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
723 893
724 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
725 $self->SUPER::update; 895 $self->SUPER::update;
726} 896}
727 897
728sub size_allocate { 898sub invoke_size_allocate {
729 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
730 900
731 $self->SUPER::size_allocate ($w, $h);
732 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
733} 904}
734 905
735sub _render { 906sub _render {
907 my ($self) = @_;
908
736 $_[0]{children}[0]->draw; 909 $self->{children}[0]->draw;
737} 910}
738 911
739sub render_child { 912sub render_child {
740 my ($self) = @_; 913 my ($self) = @_;
741 914
742 $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 {
743 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
744 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
745 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
746 $self->_render; 925 $self->_render;
926 }
747 }; 927 };
748} 928}
749 929
750sub _draw { 930sub _draw {
751 my ($self) = @_; 931 my ($self) = @_;
752
753 my ($w, $h) = ($self->w, $self->h);
754 932
755 my $tex = $self->{texture} 933 my $tex = $self->{texture}
756 or return; 934 or return;
757 935
758 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 glColor 1, 1, 1, 1; 938 glColor 0, 0, 0, 1;
761 939
762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
763 941
764 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
765} 943}
766 944
767############################################################################# 945#############################################################################
768 946
769package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
770 948
949use List::Util qw(min max);
950
771our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
772 952
773sub new { 953sub new {
774 my $class = shift; 954 my $class = shift;
775 955
776 $class->SUPER::new ( 956 $class->SUPER::new (
… …
781} 961}
782 962
783sub size_request { 963sub size_request {
784 my ($self) = @_; 964 my ($self) = @_;
785 965
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 966 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 967
788 @$self{qw(child_w child_h)} 968 $w = 10 if $self->{scroll_x};
789} 969 $h = 10 if $self->{scroll_y};
790 970
971 ($w, $h)
972}
973
791sub size_allocate { 974sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 975 my ($self, $w, $h) = @_;
793 976
977 my $child = $self->child;
978
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 979 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 980 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 981
797 $self->child->configure (0, 0, $w, $h); 982 $self->child->configure (0, 0, $w, $h);
798 $self->update; 983 $self->update;
984
985 1
799} 986}
800 987
801sub set_offset { 988sub set_offset {
802 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
803 990
804 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
805 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
806 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
807 $self->update; 995 $self->update;
808} 996}
809 997
810# 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
811sub coord2local { 999sub coord2local {
… …
829 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
830 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
831 ) { 1019 ) {
832 $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})
833 } else { 1021 } else {
834 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
835 } 1023 }
836} 1024}
837 1025
838sub _render { 1026sub _render {
839 my ($self) = @_; 1027 my ($self) = @_;
840 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
841 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842 1033
843 $self->SUPER::_render; 1034 $self->SUPER::_render;
844} 1035}
845 1036
846############################################################################# 1037#############################################################################
847 1038
848package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
849 1040
850our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
851 1042
852sub new { 1043sub new {
853 my $class = shift; 1044 my ($class, %arg) = @_;
1045
1046 my $child = delete $arg{child};
854 1047
855 my $self; 1048 my $self;
856 1049
857 my $slider = new CFClient::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
858 vertical => 1, 1051 vertical => 0,
859 range => [0, 0, 1, 0.01], # HACK fix 1052 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 1053 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
862 }, 1056 },
863 ; 1057 ;
864 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
865 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
866 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1071 can_events => 1,
867 slider => $slider, 1072 hslider => $hslider,
868 @_, 1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
1076 %arg,
869 ); 1077 );
870 1078
871 $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
872 $self->add ($self->{vp}); 1092 $self->SUPER::add (0, 0, $self->{vp});
873 $self->add ($self->{slider}); 1093
1094 $self->add ($child) if $child;
874 1095
875 $self 1096 $self
876} 1097}
877 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
878sub size_allocate { 1191sub invoke_size_allocate {
879 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
880 1193
1194 $self->update_slider;
881 $self->SUPER::size_allocate ($w, $h); 1195 $self->SUPER::invoke_size_allocate ($w, $h)
882
883 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
885} 1196}
886
887#TODO# update range on size_allocate depending on child
888# update viewport offset on scroll
889 1197
890############################################################################# 1198#############################################################################
891 1199
892package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
893 1201
894our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
895 1203
896use CFClient::OpenGL; 1204use CFPlus::OpenGL;
897 1205
898sub new { 1206sub new {
899 my $class = shift; 1207 my $class = shift;
900 1208
901 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
909 1217
910 if ($self->{bg}) { 1218 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
912 1220
913 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
915 glColor @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
916 1224
917 glBegin GL_QUADS; 1225 glBegin GL_QUADS;
918 glVertex 0 , 0; 1226 glVertex 0 , 0;
919 glVertex 0 , $h; 1227 glVertex 0 , $h;
920 glVertex $w, $h; 1228 glVertex $w, $h;
… …
927 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
928} 1236}
929 1237
930############################################################################# 1238#############################################################################
931 1239
932package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
933 1241
934our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
935 1243
936use CFClient::OpenGL; 1244use CFPlus::OpenGL;
937
938my @tex =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1245
942sub new { 1246sub new {
943 my $class = shift; 1247 my ($class, %arg) = @_;
944 1248
945 # 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) = @_;
946 1356
947 my $self = $class->SUPER::new ( 1357 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1358 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1359 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1360 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1, 1361 can_events => 1,
953 @_ 1362 min_w => 64,
1363 min_h => 32,
1364 %arg,
954 ); 1365 );
955 1366
956 $self->{title} &&= new CFClient::UI::Label 1367 $self->{title_widget} = new CFPlus::UI::Label
957 align => 0, 1368 align => 0,
958 valign => 1, 1369 valign => 1,
959 text => $self->{title}, 1370 text => $self->{title},
960 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 }
961 1382
962 $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};
963} 1392}
964 1393
965sub border { 1394sub border {
966 int $_[0]{border} * $::FONTSIZE 1395 int $_[0]{border} * $::FONTSIZE
967} 1396}
968 1397
969sub size_request { 1398sub size_request {
970 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};
971 1406
972 my ($w, $h) = $self->SUPER::size_request; 1407 my ($w, $h) = $self->SUPER::size_request;
973 1408
974 ( 1409 (
975 $w + $self->border * 2, 1410 $w + $self->border * 2,
976 $h + $self->border * 2, 1411 $h + $self->border * 2,
977 ) 1412 )
978} 1413}
979 1414
980sub size_allocate { 1415sub invoke_size_allocate {
981 my ($self, $w, $h) = @_; 1416 my ($self, $w, $h) = @_;
982 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
983 $h -= List::Util::max 0, $self->border * 2; 1426 $h -= List::Util::max 0, $border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1427 $w -= List::Util::max 0, $border * 2;
985 1428
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987 if $self->{title};
988
989 $self->child->configure ($self->border, $self->border, $w, $h); 1429 $self->child->configure ($border, $border, $w, $h);
990}
991 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
992sub button_down { 1445sub invoke_button_down {
993 my ($self, $ev, $x, $y) = @_; 1446 my ($self, $ev, $x, $y) = @_;
994 1447
995 my ($w, $h) = @$self{qw(w h)}; 1448 my ($w, $h) = @$self{qw(w h)};
996 my $border = $self->border; 1449 my $border = $self->border;
997 1450
… …
1010 my ($ev, $x, $y) = @_; 1463 my ($ev, $x, $y) = @_;
1011 1464
1012 my $dx = $ev->{x} - $ox; 1465 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1466 my $dy = $ev->{y} - $oy;
1014 1467
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1468 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1469 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1470
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1471 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size; 1472 $self->realloc;
1019 }; 1473 };
1020 1474
1021 } elsif ($lr ^ $td) { 1475 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1476 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1477 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1479 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1480 my ($ev, $x, $y) = @_;
1027 1481
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1482 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1483
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1484 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update; 1485 # HACK: the next line is required to enforce placement
1486 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1032 }; 1487 };
1488 } else {
1489 return 0;
1490 }
1491
1033 } 1492 1
1034} 1493}
1035 1494
1036sub button_up { 1495sub invoke_button_up {
1037 my ($self, $ev, $x, $y) = @_; 1496 my ($self, $ev, $x, $y) = @_;
1038 1497
1039 delete $self->{motion}; 1498 ! ! delete $self->{motion}
1040} 1499}
1041 1500
1042sub mouse_motion { 1501sub invoke_mouse_motion {
1043 my ($self, $ev, $x, $y) = @_; 1502 my ($self, $ev, $x, $y) = @_;
1044 1503
1045 $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
1046} 1515}
1047 1516
1048sub _draw { 1517sub _draw {
1049 my ($self) = @_; 1518 my ($self) = @_;
1050 1519
1520 my $child = $self->{children}[0];
1521
1051 my ($w, $h ) = ($self->{w}, $self->{h}); 1522 my ($w, $h ) = ($self->{w}, $self->{h});
1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1523 my ($cw, $ch) = ($child->{w}, $child->{h});
1053 1524
1054 glEnable GL_TEXTURE_2D; 1525 glEnable GL_TEXTURE_2D;
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1527
1057 my $border = $self->border; 1528 my $border = $self->border;
1058 1529
1059 glColor @{ $self->{border_bg} }; 1530 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1531 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1532 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1533 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1534 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1535
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1536 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1537 glColor @{ $self->{bg} };
1067 1538
1068 # TODO: repeat texture not scale 1539 # TODO: repeat texture not scale
1540 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1541 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1542 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1543 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1544 }
1079 1545
1080 glDisable GL_TEXTURE_2D; 1546 glDisable GL_TEXTURE_2D;
1081 1547
1082 $self->{title}->draw if $self->{title};
1083
1084 $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};
1085} 1559}
1086 1560
1087############################################################################# 1561#############################################################################
1088 1562
1089package CFClient::UI::Table; 1563package CFPlus::UI::Table;
1090 1564
1091our @ISA = CFClient::UI::Base::; 1565our @ISA = CFPlus::UI::Base::;
1092 1566
1093use List::Util qw(max sum); 1567use List::Util qw(max sum);
1094 1568
1095use CFClient::OpenGL; 1569use CFPlus::OpenGL;
1096 1570
1097sub new { 1571sub new {
1098 my $class = shift; 1572 my $class = shift;
1099 1573
1100 $class->SUPER::new ( 1574 $class->SUPER::new (
1575 children => [],
1101 col_expand => [], 1576 col_expand => [],
1577 row_expand => [],
1102 @_, 1578 @_,
1103 ) 1579 )
1104} 1580}
1105 1581
1106sub add {
1107 my ($self, $x, $y, $child) = @_;
1108
1109 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child;
1111
1112 $child->check_size;
1113}
1114
1115sub children { 1582sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117} 1584}
1118 1585
1586# TODO: store row/col info in child widget and use standard add/del
1587sub add {
1588 my ($self) = shift;
1589
1590 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, ();
1592 $child->set_parent ($self);
1593 $self->{children}[$y][$x] = $child;
1594 }
1595
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 }
1609}
1610
1119# TODO: move to container class maybe? send childs a signal on removal? 1611# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1612sub clear {
1121 my ($self) = @_; 1613 my ($self) = @_;
1122 1614
1123 my @children = $self->children; 1615 my @children = $self->children;
1124 delete $self->{children}; 1616 delete $self->{children};
… …
1126 for (@children) { 1618 for (@children) {
1127 delete $_->{parent}; 1619 delete $_->{parent};
1128 $_->hide; 1620 $_->hide;
1129 } 1621 }
1130 1622
1131 $self->update; 1623 $self->realloc;
1132} 1624}
1133 1625
1134sub get_wh { 1626sub get_wh {
1135 my ($self) = @_; 1627 my ($self) = @_;
1136 1628
… …
1162 (sum @$ws), 1654 (sum @$ws),
1163 (sum @$hs), 1655 (sum @$hs),
1164 ) 1656 )
1165} 1657}
1166 1658
1167sub size_allocate { 1659sub invoke_size_allocate {
1168 my ($self, $w, $h) = @_; 1660 my ($self, $w, $h) = @_;
1169 1661
1170 my ($ws, $hs) = $self->get_wh; 1662 my ($ws, $hs) = $self->get_wh;
1171 1663
1172 my $req_w = sum @$ws; 1664 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1665 my $req_h = (sum @$hs) || 1;
1174 1666
1175 # TODO: nicer code && do row_expand 1667 # TODO: nicer code
1176 my @col_expand = @{$self->{col_expand}}; 1668 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1669 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1670 my $col_expand = (sum @col_expand) || 1;
1179 1671
1180 # linearly scale sizes
1181 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1182 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1183 1673
1184 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
1185 CFClient::UI::harmonize $hs; 1682 CFPlus::UI::harmonize $hs;
1186 1683
1187 my $y; 1684 my $y;
1188 1685
1189 for my $r (0 .. $#{$self->{children}}) { 1686 for my $r (0 .. $#{$self->{children}}) {
1190 my $row = $self->{children}[$r] 1687 my $row = $self->{children}[$r]
… …
1204 } 1701 }
1205 1702
1206 $y += $row_h; 1703 $y += $row_h;
1207 } 1704 }
1208 1705
1706 1
1209} 1707}
1210 1708
1211sub find_widget { 1709sub find_widget {
1212 my ($self, $x, $y) = @_; 1710 my ($self, $x, $y) = @_;
1213 1711
… …
1232 } 1730 }
1233} 1731}
1234 1732
1235############################################################################# 1733#############################################################################
1236 1734
1237package CFClient::UI::HBox; 1735package CFPlus::UI::Fixed;
1238 1736
1239# TODO: wrap into common Box base class 1737use List::Util qw(min max);
1240 1738
1241our @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}
1242 1755
1243sub size_request { 1756sub size_request {
1244 my ($self) = @_; 1757 my ($self) = @_;
1245 1758
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1247 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 }
1248 ( 1772 }
1249 (List::Util::sum map $_->[0], @alloc), 1773
1250 (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 @_,
1251 ) 1887 )
1252} 1888}
1253 1889
1254sub size_allocate {
1255 my ($self, $w, $h) = @_;
1256
1257 ($h, $w) = ($w, $h);
1258
1259 my $children = $self->{children};
1260
1261 my @h = map $_->{req_w}, @$children;
1262
1263 my $req_h = List::Util::sum @h;
1264
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } else {
1269 my $exp = List::Util::sum map $_->{expand}, @$children;
1270 $exp ||= 1;
1271
1272 for (0 .. $#$children) {
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 }
1279 }
1280
1281 CFClient::UI::harmonize \@h;
1282
1283 my $y = 0;
1284 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_];
1287 $child->configure ($y, 0, $h, $w);
1288
1289 $y += $h;
1290 }
1291
1292 1
1293}
1294
1295############################################################################# 1890#############################################################################
1296 1891
1297package CFClient::UI::VBox; 1892package CFPlus::UI::VBox;
1298 1893
1299# TODO: wrap into common Box base class 1894our @ISA = CFPlus::UI::Box::;
1300 1895
1301our @ISA = CFClient::UI::Container::; 1896sub new {
1897 my $class = shift;
1302 1898
1303sub size_request { 1899 $class->SUPER::new (
1304 my ($self) = @_; 1900 vertical => 1,
1305 1901 @_,
1306 my @alloc = map [$_->size_request], @{$self->{children}};
1307
1308 (
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1902 )
1312} 1903}
1313 1904
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351}
1352
1353############################################################################# 1905#############################################################################
1354 1906
1355package CFClient::UI::Label; 1907package CFPlus::UI::Label;
1356 1908
1357our @ISA = CFClient::UI::DrawBG::; 1909our @ISA = CFPlus::UI::DrawBG::;
1358 1910
1359use CFClient::OpenGL; 1911use CFPlus::OpenGL;
1360 1912
1361sub new { 1913sub new {
1362 my ($class, %arg) = @_; 1914 my ($class, %arg) = @_;
1363 1915
1364 my $self = $class->SUPER::new ( 1916 my $self = $class->SUPER::new (
… …
1367 #active_bg => none 1919 #active_bg => none
1368 #font => default_font 1920 #font => default_font
1369 #text => initial text 1921 #text => initial text
1370 #markup => initial narkup 1922 #markup => initial narkup
1371 #max_w => maximum pixel width 1923 #max_w => maximum pixel width
1924 #style => 0, # render flags
1372 ellipsise => 3, # end 1925 ellipsise => 3, # end
1373 layout => (new CFClient::Layout), 1926 layout => (new CFPlus::Layout),
1374 fontsize => 1, 1927 fontsize => 1,
1375 align => -1, 1928 align => -1,
1376 valign => -1, 1929 valign => -1,
1377 padding => 2, 1930 padding_x => 2,
1931 padding_y => 2,
1378 can_events => 0, 1932 can_events => 0,
1379 %arg 1933 %arg
1380 ); 1934 );
1381 1935
1382 if (exists $self->{template}) { 1936 if (exists $self->{template}) {
1383 my $layout = new CFClient::Layout; 1937 my $layout = new CFPlus::Layout;
1384 $layout->set_text (delete $self->{template}); 1938 $layout->set_text (delete $self->{template});
1385 $self->{template} = $layout; 1939 $self->{template} = $layout;
1386 } 1940 }
1387 1941
1388 if (exists $self->{markup}) { 1942 if (exists $self->{markup}) {
… …
1392 } 1946 }
1393 1947
1394 $self 1948 $self
1395} 1949}
1396 1950
1397sub escape($) {
1398 local $_ = $_[0];
1399
1400 s/&/&amp;/g;
1401 s/>/&gt;/g;
1402 s/</&lt;/g;
1403
1404 $_
1405}
1406
1407sub update { 1951sub update {
1408 my ($self) = @_; 1952 my ($self) = @_;
1409 1953
1410 delete $self->{texture}; 1954 delete $self->{texture};
1411 $self->SUPER::update; 1955 $self->SUPER::update;
1412} 1956}
1413 1957
1958sub realloc {
1959 my ($self) = @_;
1960
1961 delete $self->{ox};
1962 $self->SUPER::realloc;
1963}
1964
1414sub set_text { 1965sub set_text {
1415 my ($self, $text) = @_; 1966 my ($self, $text) = @_;
1416 1967
1417 return if $self->{text} eq "T$text"; 1968 return if $self->{text} eq "T$text";
1418 $self->{text} = "T$text"; 1969 $self->{text} = "T$text";
1419 1970
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1971 $self->{layout}->set_text ($text);
1422 1972
1973 delete $self->{size_req};
1974 $self->realloc;
1423 $self->update; 1975 $self->update;
1424 $self->check_size;
1425} 1976}
1426 1977
1427sub set_markup { 1978sub set_markup {
1428 my ($self, $markup) = @_; 1979 my ($self, $markup) = @_;
1429 1980
1430 return if $self->{text} eq "M$markup"; 1981 return if $self->{text} eq "M$markup";
1431 $self->{text} = "M$markup"; 1982 $self->{text} = "M$markup";
1432 1983
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1984 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1985
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436 $self->{layout}->set_markup ($markup); 1986 $self->{layout}->set_markup ($markup);
1437 1987
1988 delete $self->{size_req};
1989 $self->realloc;
1438 $self->update; 1990 $self->update;
1439 $self->check_size;
1440} 1991}
1441 1992
1442sub size_request { 1993sub size_request {
1443 my ($self) = @_; 1994 my ($self) = @_;
1444 1995
1996 $self->{size_req} ||= do {
1445 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1997 $self->{layout}->set_font ($self->{font}) if $self->{font};
1446 $self->{layout}->set_width ($self->{max_w} || -1); 1998 $self->{layout}->set_width ($self->{max_w} || -1);
1447 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1999 $self->{layout}->set_ellipsise ($self->{ellipsise});
1448 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1449 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1450 2002
1451 my ($w, $h) = $self->{layout}->size; 2003 my ($w, $h) = $self->{layout}->size;
1452 2004
1453 if (exists $self->{template}) { 2005 if (exists $self->{template}) {
1454 $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);
1455 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2008 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1456 2009
1457 my ($w2, $h2) = $self->{template}->size; 2010 my ($w2, $h2) = $self->{template}->size;
1458 2011
1459 $w = List::Util::max $w, $w2; 2012 $w = List::Util::max $w, $w2;
1460 $h = List::Util::max $h, $h2; 2013 $h = List::Util::max $h, $h2;
2014 }
2015
2016 [$w, $h]
1461 } 2017 };
1462 2018
1463 ( 2019 @{ $self->{size_req} }
1464 $w + $self->{padding} * 2,
1465 $h + $self->{padding} * 2,
1466 )
1467} 2020}
1468 2021
2022sub baseline_shift {
2023 $_[0]{layout}->descent
2024}
2025
1469sub size_allocate { 2026sub invoke_size_allocate {
1470 my ($self, $w, $h) = @_; 2027 my ($self, $w, $h) = @_;
1471 2028
2029 delete $self->{ox};
2030
1472 delete $self->{texture}; 2031 delete $self->{texture}
2032 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2033
2034 1
1473} 2035}
1474 2036
1475sub set_fontsize { 2037sub set_fontsize {
1476 my ($self, $fontsize) = @_; 2038 my ($self, $fontsize) = @_;
1477 2039
1478 $self->{fontsize} = $fontsize; 2040 $self->{fontsize} = $fontsize;
2041 delete $self->{size_req};
1479 delete $self->{texture}; 2042 delete $self->{texture};
1480 2043
1481 $self->update; 2044 $self->realloc;
1482 $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;
1483} 2054}
1484 2055
1485sub _draw { 2056sub _draw {
1486 my ($self) = @_; 2057 my ($self) = @_;
1487 2058
1488 $self->SUPER::_draw; # draw background, if applicable 2059 $self->SUPER::_draw; # draw background, if applicable
1489 2060
1490 my $tex = $self->{texture} ||= do { 2061 my $size = $self->{texture} ||= do {
1491 $self->{layout}->set_foreground (@{$self->{fg}}); 2062 $self->{layout}->set_foreground (@{$self->{fg}});
1492 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2063 $self->{layout}->set_font ($self->{font}) if $self->{font};
1493 $self->{layout}->set_width ($self->{w}); 2064 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2065 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2066 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2067 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 2068
1498 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2069 [$self->{layout}->size]
1499
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1502 : ($self->{w} - $tex->{w}) * 0.5);
1503
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1506 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1509 }; 2070 };
1510 2071
1511 glEnable GL_TEXTURE_2D; 2072 unless (exists $self->{ox}) {
1512 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);
1513 2076
1514 if ($tex->{format} == GL_ALPHA) { 2077 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1515 glColor @{$self->{fg}}; 2078 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2079 : ($self->{h} - $size->[1]) * 0.5);
1517 } else {
1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1519 } 2080 };
1520 2081
1521 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});
1522} 2086}
1523 2087
1524############################################################################# 2088#############################################################################
1525 2089
1526package CFClient::UI::EntryBase; 2090package CFPlus::UI::EntryBase;
1527 2091
1528our @ISA = CFClient::UI::Label::; 2092our @ISA = CFPlus::UI::Label::;
1529 2093
1530use CFClient::OpenGL; 2094use CFPlus::OpenGL;
1531 2095
1532sub new { 2096sub new {
1533 my $class = shift; 2097 my $class = shift;
1534 2098
1535 $class->SUPER::new ( 2099 $class->SUPER::new (
… …
1539 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
1540 can_hover => 1, 2104 can_hover => 1,
1541 can_focus => 1, 2105 can_focus => 1,
1542 valign => 0, 2106 valign => 0,
1543 can_events => 1, 2107 can_events => 1,
2108 ellipsise => 0,
1544 #text => ... 2109 #text => ...
2110 #hidden => "*",
1545 @_ 2111 @_
1546 ) 2112 )
1547} 2113}
1548 2114
1549sub _set_text { 2115sub _set_text {
… …
1551 2117
1552 delete $self->{cur_h}; 2118 delete $self->{cur_h};
1553 2119
1554 return if $self->{text} eq $text; 2120 return if $self->{text} eq $text;
1555 2121
1556 delete $self->{texture};
1557
1558 $self->{last_activity} = $::NOW; 2122 $self->{last_activity} = $::NOW;
1559 $self->{text} = $text; 2123 $self->{text} = $text;
1560 2124
1561 $text =~ s/./*/g if $self->{hidden}; 2125 $text =~ s/./*/g if $self->{hidden};
1562 $self->{layout}->set_text ("$text "); 2126 $self->{layout}->set_text ("$text ");
2127 delete $self->{size_req};
1563 2128
1564 $self->_emit (changed => $self->{text}); 2129 $self->emit (changed => $self->{text});
2130
2131 $self->realloc;
2132 $self->update;
1565} 2133}
1566 2134
1567sub set_text { 2135sub set_text {
1568 my ($self, $text) = @_; 2136 my ($self, $text) = @_;
1569 2137
1570 $self->{cursor} = length $text; 2138 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 2139 $self->_set_text ($text);
1572 $self->update;
1573 $self->check_size;
1574} 2140}
1575 2141
1576sub get_text { 2142sub get_text {
1577 $_[0]{text} 2143 $_[0]{text}
1578} 2144}
… …
1583 my ($w, $h) = $self->SUPER::size_request; 2149 my ($w, $h) = $self->SUPER::size_request;
1584 2150
1585 ($w + 1, $h) # add 1 for cursor 2151 ($w + 1, $h) # add 1 for cursor
1586} 2152}
1587 2153
1588sub key_down { 2154sub invoke_key_down {
1589 my ($self, $ev) = @_; 2155 my ($self, $ev) = @_;
1590 2156
1591 my $mod = $ev->{mod}; 2157 my $mod = $ev->{mod};
1592 my $sym = $ev->{sym}; 2158 my $sym = $ev->{sym};
1593 my $uni = $ev->{unicode}; 2159 my $uni = $ev->{unicode};
1594 2160
1595 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;
1596 2164
1597 if ($uni == 8) { 2165 if ($uni == 8) {
1598 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1599 } elsif ($uni == 127) { 2167 } elsif ($uni == 127) {
1600 substr $text, $self->{cursor}, 1, ""; 2168 substr $text, $self->{cursor}, 1, "";
1601 } elsif ($sym == CFClient::SDLK_LEFT) { 2169 } elsif ($sym == CFPlus::SDLK_LEFT) {
1602 --$self->{cursor} if $self->{cursor}; 2170 --$self->{cursor} if $self->{cursor};
1603 } elsif ($sym == CFClient::SDLK_RIGHT) { 2171 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1604 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2172 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1605 } 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 = "";
1606 $self->{cursor} = 0; 2187 $self->{cursor} = 0;
1607 } elsif ($sym == CFClient::SDLK_END) {
1608 $self->{cursor} = length $text;
1609 } elsif ($uni == 27) { 2188 } elsif ($uni == 27) {
1610 $self->_emit ('escape'); 2189 $self->emit ('escape');
1611 } elsif ($uni) { 2190 } elsif ($uni == 0x0d) {
2191 substr $text, $self->{cursor}++, 0, "\012";
2192 } elsif ($uni >= 0x20) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 2193 substr $text, $self->{cursor}++, 0, chr $uni;
2194 } else {
2195 return 0;
1613 } 2196 }
1614 2197
1615 $self->_set_text ($text); 2198 $self->_set_text ($text);
2199
2200 $self->realloc;
1616 $self->update; 2201 $self->update;
1617 $self->check_size;
1618}
1619 2202
2203 1
2204}
2205
1620sub focus_in { 2206sub invoke_focus_in {
1621 my ($self) = @_; 2207 my ($self) = @_;
1622 2208
1623 $self->{last_activity} = $::NOW; 2209 $self->{last_activity} = $::NOW;
1624 2210
1625 $self->SUPER::focus_in; 2211 $self->SUPER::invoke_focus_in
1626} 2212}
1627 2213
1628sub button_down { 2214sub invoke_button_down {
1629 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1630 2216
1631 $self->SUPER::button_down ($ev, $x, $y); 2217 $self->SUPER::invoke_button_down ($ev, $x, $y);
1632 2218
1633 my $idx = $self->{layout}->xy_to_index ($x, $y); 2219 my $idx = $self->{layout}->xy_to_index ($x, $y);
1634 2220
1635 # byte-index to char-index 2221 # byte-index to char-index
1636 my $text = $self->{text}; 2222 my $text = $self->{text};
1637 utf8::encode $text; 2223 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1638 $self->{cursor} = length substr $text, 0, $idx; 2224 $self->{cursor} = length $text;
1639 2225
1640 $self->_set_text ($self->{text}); 2226 $self->_set_text ($self->{text});
1641 $self->update; 2227 $self->update;
2228
2229 1
1642} 2230}
1643 2231
1644sub mouse_motion { 2232sub invoke_mouse_motion {
1645 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1646# 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
1647} 2237}
1648 2238
1649sub _draw { 2239sub _draw {
1650 my ($self) = @_; 2240 my ($self) = @_;
1651 2241
1652 local $self->{fg} = $self->{fg}; 2242 local $self->{fg} = $self->{fg};
1653 2243
1654 if ($FOCUS == $self) { 2244 if ($FOCUS == $self) {
1655 glColor @{$self->{active_bg}}; 2245 glColor_premultiply @{$self->{active_bg}};
1656 $self->{fg} = $self->{active_fg}; 2246 $self->{fg} = $self->{active_fg};
1657 } else { 2247 } else {
1658 glColor @{$self->{bg}}; 2248 glColor_premultiply @{$self->{bg}};
1659 } 2249 }
1660 2250
1661 glEnable GL_BLEND; 2251 glEnable GL_BLEND;
1662 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2252 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1663 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
1664 glVertex 0 , 0; 2254 glVertex 0 , 0;
1665 glVertex 0 , $self->{h}; 2255 glVertex 0 , $self->{h};
1666 glVertex $self->{w}, $self->{h}; 2256 glVertex $self->{w}, $self->{h};
1667 glVertex $self->{w}, 0; 2257 glVertex $self->{w}, 0;
… …
1678 utf8::encode $text; 2268 utf8::encode $text;
1679 2269
1680 @$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)
1681 } 2271 }
1682 2272
1683 glColor @{$self->{fg}};
1684 glBegin GL_LINES; 2273 glBegin GL_LINES;
1685 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};
1686 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};
1687 glEnd; 2276 glEnd;
1688 } 2277 }
1689} 2278}
1690 2279
2280#############################################################################
2281
1691package CFClient::UI::Entry; 2282package CFPlus::UI::Entry;
1692 2283
1693our @ISA = CFClient::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1694 2285
1695use CFClient::OpenGL; 2286use CFPlus::OpenGL;
1696 2287
1697sub key_down { 2288sub invoke_key_down {
1698 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1699 2290
1700 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1701 2292
1702 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1703 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1704 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
2296
1705 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1706 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
1707 $self->_emit (activate => $txt); 2299 $self->emit (activate => $txt);
1708 $self->update; 2300 $self->update;
1709 2301
1710 } elsif ($sym == CFClient::SDLK_UP) { 2302 } elsif ($sym == CFPlus::SDLK_UP) {
1711 if ($self->{history_pointer} < 0) { 2303 if ($self->{history_pointer} < 0) {
1712 $self->{history_saveback} = $self->get_text; 2304 $self->{history_saveback} = $self->get_text;
1713 } 2305 }
1714 if (@{$self->{history} || []} > 0) { 2306 if (@{$self->{history} || []} > 0) {
1715 $self->{history_pointer}++; 2307 $self->{history_pointer}++;
… …
1717 $self->{history_pointer} = @{$self->{history} || []} - 1; 2309 $self->{history_pointer} = @{$self->{history} || []} - 1;
1718 } 2310 }
1719 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1720 } 2312 }
1721 2313
1722 } elsif ($sym == CFClient::SDLK_DOWN) { 2314 } elsif ($sym == CFPlus::SDLK_DOWN) {
1723 $self->{history_pointer}--; 2315 $self->{history_pointer}--;
1724 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1725 2317
1726 if ($self->{history_pointer} >= 0) { 2318 if ($self->{history_pointer} >= 0) {
1727 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1728 } else { 2320 } else {
1729 $self->set_text ($self->{history_saveback}); 2321 $self->set_text ($self->{history_saveback});
1730 } 2322 }
1731 2323
1732 } else { 2324 } else {
1733 $self->SUPER::key_down ($ev); 2325 return $self->SUPER::invoke_key_down ($ev)
2326 }
2327
1734 } 2328 1
1735
1736} 2329}
1737 2330
1738############################################################################# 2331#############################################################################
1739 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
1740package CFClient::UI::Button; 2372package CFPlus::UI::Button;
1741 2373
1742our @ISA = CFClient::UI::Label::; 2374our @ISA = CFPlus::UI::Label::;
1743 2375
1744use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1745 2377
1746my @tex = 2378my @tex =
1747 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1748 qw(b1_button_active.png); 2380 qw(b1_button_active.png);
1749 2381
1750sub new { 2382sub new {
1751 my $class = shift; 2383 my $class = shift;
1752 2384
1753 $class->SUPER::new ( 2385 $class->SUPER::new (
1754 padding => 4, 2386 padding_x => 4,
2387 padding_y => 4,
1755 fg => [1, 1, 1], 2388 fg => [1, 1, 1],
1756 active_fg => [0, 0, 1], 2389 active_fg => [0, 0, 1],
1757 can_hover => 1, 2390 can_hover => 1,
1758 align => 0, 2391 align => 0,
1759 valign => 0, 2392 valign => 0,
1760 can_events => 1, 2393 can_events => 1,
1761 @_ 2394 @_
1762 ) 2395 )
1763} 2396}
1764 2397
1765sub activate { }
1766
1767sub button_up { 2398sub invoke_button_up {
1768 my ($self, $ev, $x, $y) = @_; 2399 my ($self, $ev, $x, $y) = @_;
1769 2400
1770 $self->emit ("activate") 2401 $self->emit ("activate")
1771 if $x >= 0 && $x < $self->{w} 2402 if $x >= 0 && $x < $self->{w}
1772 && $y >= 0 && $y < $self->{h}; 2403 && $y >= 0 && $y < $self->{h};
2404
2405 1
1773} 2406}
1774 2407
1775sub _draw { 2408sub _draw {
1776 my ($self) = @_; 2409 my ($self) = @_;
1777 2410
1778 local $self->{fg} = $self->{fg}; 2411 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1779
1780 if ($GRAB == $self) {
1781 $self->{fg} = $self->{active_fg};
1782 }
1783 2412
1784 glEnable GL_TEXTURE_2D; 2413 glEnable GL_TEXTURE_2D;
1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1786 glColor 0, 0, 0, 1; 2415 glColor 0, 0, 0, 1;
1787 2416
… …
1792 $self->SUPER::_draw; 2421 $self->SUPER::_draw;
1793} 2422}
1794 2423
1795############################################################################# 2424#############################################################################
1796 2425
1797package CFClient::UI::CheckBox; 2426package CFPlus::UI::CheckBox;
1798 2427
1799our @ISA = CFClient::UI::DrawBG::; 2428our @ISA = CFPlus::UI::DrawBG::;
1800 2429
1801my @tex = 2430my @tex =
1802 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1803 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2432 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1804 2433
1805use CFClient::OpenGL; 2434use CFPlus::OpenGL;
1806 2435
1807sub new { 2436sub new {
1808 my $class = shift; 2437 my $class = shift;
1809 2438
1810 $class->SUPER::new ( 2439 $class->SUPER::new (
1811 padding => 2, 2440 padding_x => 2,
2441 padding_y => 2,
1812 fg => [1, 1, 1], 2442 fg => [1, 1, 1],
1813 active_fg => [1, 1, 0], 2443 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2], 2444 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5], 2445 active_bg => [1, 1, 1, 0.5],
1816 state => 0, 2446 state => 0,
… …
1820} 2450}
1821 2451
1822sub size_request { 2452sub size_request {
1823 my ($self) = @_; 2453 my ($self) = @_;
1824 2454
1825 ($self->{padding} * 2 + 6) x 2 2455 (6) x 2
1826} 2456}
1827 2457
2458sub toggle {
2459 my ($self) = @_;
2460
2461 $self->{state} = !$self->{state};
2462 $self->emit (changed => $self->{state});
2463 $self->update;
2464}
2465
1828sub button_down { 2466sub invoke_button_down {
1829 my ($self, $ev, $x, $y) = @_; 2467 my ($self, $ev, $x, $y) = @_;
1830 2468
1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2469 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2470 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833 $self->{state} = !$self->{state}; 2471 $self->toggle;
1834 $self->_emit (changed => $self->{state}); 2472 } else {
2473 return 0
2474 }
2475
1835 } 2476 1
1836} 2477}
1837 2478
1838sub _draw { 2479sub _draw {
1839 my ($self) = @_; 2480 my ($self) = @_;
1840 2481
1841 $self->SUPER::_draw; 2482 $self->SUPER::_draw;
1842 2483
1843 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2484 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844 2485
1845 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;
1846 2489
1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2490 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848 2491
1849 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2492 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850 2493
… …
1853 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
1854} 2497}
1855 2498
1856############################################################################# 2499#############################################################################
1857 2500
1858package CFClient::UI::Image; 2501package CFPlus::UI::Image;
1859 2502
1860our @ISA = CFClient::UI::Base::; 2503our @ISA = CFPlus::UI::Base::;
1861 2504
1862use CFClient::OpenGL; 2505use CFPlus::OpenGL;
1863use Carp qw/confess/;
1864 2506
1865our %loaded_images; 2507our %texture_cache;
1866 2508
1867sub new { 2509sub new {
1868 my $class = shift; 2510 my $class = shift;
1869 2511
1870 my $self = $class->SUPER::new (can_events => 0, @_); 2512 my $self = $class->SUPER::new (
2513 can_events => 0,
2514 @_,
2515 );
1871 2516
1872 $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";
1873 2519
1874 $loaded_images{$self->{image}} ||= 2520 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1875 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;
1876 2522
1877 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2523 CFPlus::weaken $texture_cache{$self->{path}};
1878 2524
1879 Scalar::Util::weaken $loaded_images{$self->{image}}; 2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1880
1881 $self->{aspect} = $tex->{w} / $tex->{h};
1882 2526
1883 $self 2527 $self
1884} 2528}
1885 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
1886sub size_request { 2545sub size_request {
1887 my ($self) = @_; 2546 my ($self) = @_;
1888 2547
1889 ($self->{tex}->{w}, $self->{tex}->{h}) 2548 ($self->{tex}{w}, $self->{tex}{h})
1890} 2549}
1891 2550
1892sub _draw { 2551sub _draw {
1893 my ($self) = @_; 2552 my ($self) = @_;
1894 2553
… …
1904 } 2563 }
1905 2564
1906 glEnable GL_TEXTURE_2D; 2565 glEnable GL_TEXTURE_2D;
1907 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1908 2567
1909 $tex->draw_quad_alpha (0, 0, $w, $h); 2568 $tex->draw_quad (0, 0, $w, $h);
1910 2569
1911 glDisable GL_TEXTURE_2D; 2570 glDisable GL_TEXTURE_2D;
1912} 2571}
1913 2572
1914############################################################################# 2573#############################################################################
1915 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
1916package CFClient::UI::VGauge; 2611package CFPlus::UI::VGauge;
1917 2612
1918our @ISA = CFClient::UI::Base::; 2613our @ISA = CFPlus::UI::Base::;
1919 2614
1920use List::Util qw(min max); 2615use List::Util qw(min max);
1921 2616
1922use CFClient::OpenGL; 2617use CFPlus::OpenGL;
1923 2618
1924my %tex = ( 2619my %tex = (
1925 food => [ 2620 food => [
1926 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1927 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2622 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1928 ], 2623 ],
1929 grace => [ 2624 grace => [
1930 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2625 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1931 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/
1932 ], 2627 ],
1933 hp => [ 2628 hp => [
1934 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2629 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1935 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2630 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1936 ], 2631 ],
1937 mana => [ 2632 mana => [
1938 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2633 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1939 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/
1940 ], 2635 ],
1941); 2636);
1942 2637
1943# eg. VGauge->new (gauge => 'food'), default gauge: food 2638# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2003 my $ycut1 = max 0, min 1, $ycut; 2698 my $ycut1 = max 0, min 1, $ycut;
2004 my $ycut2 = max 0, min 1, $ycut - 1; 2699 my $ycut2 = max 0, min 1, $ycut - 1;
2005 2700
2006 my $h1 = $self->{h} * (1 - $ycut1); 2701 my $h1 = $self->{h} * (1 - $ycut1);
2007 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);
2008 2706
2009 glEnable GL_BLEND; 2707 glEnable GL_BLEND;
2010 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;
2011 glEnable GL_TEXTURE_2D; 2710 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2712
2014 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2713 glBindTexture GL_TEXTURE_2D, $t1->{name};
2015 glBegin GL_QUADS; 2714 glBegin GL_QUADS;
… …
2030 2729
2031 if ($t3) { 2730 if ($t3) {
2032 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2731 glBindTexture GL_TEXTURE_2D, $t3->{name};
2033 glBegin GL_QUADS; 2732 glBegin GL_QUADS;
2034 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2733 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2035 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2734 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2036 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2735 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2037 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2736 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2038 glEnd; 2737 glEnd;
2039 } 2738 }
2040 2739
2041 glDisable GL_BLEND; 2740 glDisable GL_BLEND;
2042 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2043} 2742}
2044 2743
2045############################################################################# 2744#############################################################################
2046 2745
2047package CFClient::UI::Gauge; 2746package CFPlus::UI::Gauge;
2048 2747
2049our @ISA = CFClient::UI::VBox::; 2748our @ISA = CFPlus::UI::VBox::;
2050 2749
2051sub new { 2750sub new {
2052 my ($class, %arg) = @_; 2751 my ($class, %arg) = @_;
2053 2752
2054 my $self = $class->SUPER::new ( 2753 my $self = $class->SUPER::new (
… …
2056 can_hover => 1, 2755 can_hover => 1,
2057 can_events => 1, 2756 can_events => 1,
2058 %arg, 2757 %arg,
2059 ); 2758 );
2060 2759
2061 $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");
2062 $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);
2063 $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");
2064 2763
2065 $self 2764 $self
2066} 2765}
2067 2766
2068sub set_fontsize { 2767sub set_fontsize {
… …
2089 $self->{value}->set_text ($val); 2788 $self->{value}->set_text ($val);
2090} 2789}
2091 2790
2092############################################################################# 2791#############################################################################
2093 2792
2094package CFClient::UI::Slider; 2793package CFPlus::UI::Slider;
2095 2794
2096use strict; 2795use strict;
2097 2796
2098use CFClient::OpenGL; 2797use CFPlus::OpenGL;
2099 2798
2100our @ISA = CFClient::UI::DrawBG::; 2799our @ISA = CFPlus::UI::DrawBG::;
2101 2800
2102my @tex = 2801my @tex =
2103 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2802 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2104 qw(s1_slider.png s1_slider_bg.png); 2803 qw(s1_slider.png s1_slider_bg.png);
2105 2804
2106sub new { 2805sub new {
2107 my $class = shift; 2806 my $class = shift;
2108 2807
… …
2115 fg => [1, 1, 1], 2814 fg => [1, 1, 1],
2116 active_fg => [0, 0, 0], 2815 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2], 2816 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5], 2817 active_bg => [1, 1, 1, 0.5],
2119 range => [0, 0, 100, 10, 0], 2818 range => [0, 0, 100, 10, 0],
2120 req_w => $::WIDTH / 80, 2819 min_w => $::WIDTH / 80,
2121 req_h => $::WIDTH / 80, 2820 min_h => $::WIDTH / 80,
2122 vertical => 0, 2821 vertical => 0,
2123 can_hover => 1, 2822 can_hover => 1,
2124 inner_pad => 0.02, 2823 inner_pad => 0.02,
2125 @_ 2824 @_
2126 ); 2825 );
… …
2132} 2831}
2133 2832
2134sub set_range { 2833sub set_range {
2135 my ($self, $range) = @_; 2834 my ($self, $range) = @_;
2136 2835
2137 $self->{range} = $range; 2836 ($range, $self->{range}) = ($self->{range}, $range);
2138 2837
2838 if ("@$range" ne "@{$self->{range}}") {
2139 $self->update; 2839 $self->update;
2840 $self->set_value ($self->{range}[0]);
2841 }
2140} 2842}
2141 2843
2142sub set_value { 2844sub set_value {
2143 my ($self, $value) = @_; 2845 my ($self, $value) = @_;
2144 2846
… …
2155 if $unit; 2857 if $unit;
2156 2858
2157 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2859 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2158 2860
2159 if ($value != $old_value) { 2861 if ($value != $old_value) {
2160 $self->_emit (changed => $value); 2862 $self->emit (changed => $value);
2161 $self->update; 2863 $self->update;
2162 } 2864 }
2163} 2865}
2164 2866
2165sub size_request { 2867sub size_request {
2166 my ($self) = @_; 2868 my ($self) = @_;
2167 2869
2168 my $w = $self->{req_w}; 2870 ($self->{req_w}, $self->{req_h})
2169 my $h = $self->{req_h};
2170
2171 $self->{vertical} ? ($h, $w) : ($w, $h)
2172} 2871}
2173 2872
2174sub button_down { 2873sub invoke_button_down {
2175 my ($self, $ev, $x, $y) = @_; 2874 my ($self, $ev, $x, $y) = @_;
2176 2875
2177 $self->SUPER::button_down ($ev, $x, $y); 2876 $self->SUPER::invoke_button_down ($ev, $x, $y);
2178 2877
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2878 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180 2879
2181 $self->mouse_motion ($ev, $x, $y); 2880 $self->invoke_mouse_motion ($ev, $x, $y)
2182} 2881}
2183 2882
2184sub mouse_motion { 2883sub invoke_mouse_motion {
2185 my ($self, $ev, $x, $y) = @_; 2884 my ($self, $ev, $x, $y) = @_;
2186 2885
2187 if ($GRAB == $self) { 2886 if ($GRAB == $self) {
2188 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2887 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2189 2888
2190 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2889 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191 2890
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2891 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193 2892
2194 $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
2195 } 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
2196} 2911}
2197 2912
2198sub update { 2913sub update {
2199 my ($self) = @_; 2914 my ($self) = @_;
2200 2915
2201 $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}) {
2202 $self->set_value ($self->{range}[0]); 2924 $self->set_value ($self->{range}[0]);
2203 2925
2204 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2926 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100; 2927 my $range = ($hi - $page - $lo) || 1e-100;
2206 2928
… …
2212 $value = ($value - $lo) / $range; 2934 $value = ($value - $lo) / $range;
2213 $value = $value * $self->{scale} + $self->{offset}; 2935 $value = $value * $self->{scale} + $self->{offset};
2214 2936
2215 $self->{knob_x} = $value - $knob_w * 0.5; 2937 $self->{knob_x} = $value - $knob_w * 0.5;
2216 $self->{knob_w} = $knob_w; 2938 $self->{knob_w} = $knob_w;
2217 }); 2939 }
2218
2219 $self->SUPER::update;
2220}
2221
2222sub _draw {
2223 my ($self) = @_;
2224 2940
2225 $self->SUPER::_draw (); 2941 $self->SUPER::_draw ();
2226 2942
2227 glScale $self->{w}, $self->{h}; 2943 glScale $self->{w}, $self->{h};
2228 2944
… …
2248 glDisable GL_TEXTURE_2D; 2964 glDisable GL_TEXTURE_2D;
2249} 2965}
2250 2966
2251############################################################################# 2967#############################################################################
2252 2968
2253package CFClient::UI::ValSlider; 2969package CFPlus::UI::ValSlider;
2254 2970
2255our @ISA = CFClient::UI::HBox::; 2971our @ISA = CFPlus::UI::HBox::;
2256 2972
2257sub new { 2973sub new {
2258 my ($class, %arg) = @_; 2974 my ($class, %arg) = @_;
2259 2975
2260 my $range = delete $arg{range}; 2976 my $range = delete $arg{range};
2261 2977
2262 my $self = $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2263 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2979 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2264 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2980 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2265 to_value => sub { shift }, 2981 to_value => sub { shift },
2266 from_value => sub { shift }, 2982 from_value => sub { shift },
2267 %arg, 2983 %arg,
2268 ); 2984 );
2269 2985
… …
2289sub set_range { shift->{slider}->set_range (@_) } 3005sub set_range { shift->{slider}->set_range (@_) }
2290sub set_value { shift->{slider}->set_value (@_) } 3006sub set_value { shift->{slider}->set_value (@_) }
2291 3007
2292############################################################################# 3008#############################################################################
2293 3009
2294package CFClient::UI::TextView; 3010package CFPlus::UI::TextScroller;
2295 3011
2296our @ISA = CFClient::UI::HBox::; 3012our @ISA = CFPlus::UI::HBox::;
2297 3013
2298use CFClient::OpenGL; 3014use CFPlus::OpenGL;
2299 3015
2300sub new { 3016sub new {
2301 my $class = shift; 3017 my $class = shift;
2302 3018
2303 my $self = $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
2304 fontsize => 1, 3020 fontsize => 1,
2305 can_events => 0, 3021 can_events => 1,
3022 indent => 0,
2306 #font => default_font 3023 #font => default_font
2307 @_, 3024 @_,
2308 3025
2309 layout => (new CFClient::Layout 1), 3026 layout => (new CFPlus::Layout),
2310 par => [], 3027 par => [],
3028 max_par => 0,
2311 height => 0, 3029 height => 0,
2312 children => [ 3030 children => [
2313 (new CFClient::UI::Empty expand => 1), 3031 (new CFPlus::UI::Empty expand => 1),
2314 (new CFClient::UI::Slider vertical => 1), 3032 (new CFPlus::UI::Slider vertical => 1),
2315 ], 3033 ],
2316 ); 3034 );
2317 3035
2318 $self->{children}[1]->connect (changed => sub { $self->update }); 3036 $self->{children}[1]->connect (changed => sub { $self->update });
2319 3037
… …
2325 3043
2326 $self->{fontsize} = $fontsize; 3044 $self->{fontsize} = $fontsize;
2327 $self->reflow; 3045 $self->reflow;
2328} 3046}
2329 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
2330sub size_allocate { 3057sub invoke_size_allocate {
2331 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h) = @_;
2332 3059
2333 $self->SUPER::size_allocate ($w, $h); 3060 my ($empty, $slider, @other) = @{ $self->{children} };
3061 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2334 3062
2335 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3063 $self->{layout}->set_font ($self->{font}) if $self->{font};
2336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3064 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337 $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});
2338 3067
2339 $self->reflow; 3068 $self->reflow;
2340}
2341 3069
2342sub text_size { 3070 local $self->{children} = [$empty, $slider];
3071 $self->SUPER::invoke_size_allocate ($w, $h)
3072}
3073
3074sub invoke_mouse_wheel {
2343 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) = @_;
2344 3086
2345 my $layout = $self->{layout}; 3087 my $layout = $self->{layout};
2346 3088
3089 $layout->set_font ($self->{font}) if $self->{font};
3090 $layout->set_foreground (@{$para->{fg}});
2347 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3091 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2348 $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});
2349 $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}}
2350 3100 );
3101
2351 $layout->size 3102 $layout
2352} 3103}
2353 3104
2354sub reflow { 3105sub reflow {
2355 my ($self) = @_; 3106 my ($self) = @_;
2356 3107
… …
2363 3114
2364 # todo: base offset on lines or so, not on pixels 3115 # todo: base offset on lines or so, not on pixels
2365 $self->{children}[1]->set_value ($offset); 3116 $self->{children}[1]->set_value ($offset);
2366} 3117}
2367 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
2368sub clear { 3134sub clear {
2369 my ($self) = @_; 3135 my ($self) = @_;
3136
3137 my (undef, undef, @other) = @{ $self->{children} };
3138 $self->remove ($_) for @other;
2370 3139
2371 $self->{par} = []; 3140 $self->{par} = [];
2372 $self->{height} = 0; 3141 $self->{height} = 0;
2373 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3142 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2374} 3143}
2375 3144
2376sub add_paragraph { 3145sub add_paragraph {
2377 my ($self, $color, $text, $indent) = @_; 3146 my $self = shift;
2378 3147
2379 for my $line (split /\n/, $text) { 3148 for my $para (@_) {
2380 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
2381 $self->{height} += $h; 3200 $self->{height} = $height;
2382 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3201 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2383 }
2384 3202
2385 $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 }
2386} 3209}
2387 3210
2388sub update { 3211sub update {
2389 my ($self) = @_; 3212 my ($self) = @_;
2390 3213
… …
2392 3215
2393 return unless $self->{h} > 0; 3216 return unless $self->{h} > 0;
2394 3217
2395 delete $self->{texture}; 3218 delete $self->{texture};
2396 3219
2397 $ROOT->on_post_alloc ($self, sub { 3220 $ROOT->on_post_alloc ($self => sub {
3221 $self->force_uptodate;
3222
2398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3223 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399 3224
2400 if (delete $self->{need_reflow}) {
2401 my $height = 0;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406
2407 for (@{$self->{par}}) {
2408 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2409 $layout->set_width ($W - $_->[3]);
2410 $layout->set_markup ($_->[4]);
2411 my ($w, $h) = $layout->size;
2412 $_->[0] = $w + $_->[3];
2413 $_->[1] = $h;
2414 }
2415
2416 $height += $_->[1];
2417 }
2418
2419 $self->{height} = $height;
2420
2421 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2422
2423 delete $self->{texture};
2424 }
2425
2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3225 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2427 glClearColor 0.5, 0.5, 0.5, 0; 3226 glClearColor 0, 0, 0, 0;
2428 glClear GL_COLOR_BUFFER_BIT; 3227 glClear GL_COLOR_BUFFER_BIT;
2429 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;
2430 my $top = int $self->{children}[1]{range}[0]; 3237 my $top = int $self->{children}[1]{range}[0];
2431 3238
2432 my $y0 = $top; 3239 my $y0 = $top;
2433 my $y1 = $top + $H; 3240 my $y1 = $top + $H;
2434 3241
2435 my $y = 0;
2436
2437 my $layout = $self->{layout};
2438
2439 $layout->set_font ($self->{font}) if $self->{font};
2440
2441 glEnable GL_BLEND;
2442 #TODO# not correct in windows where rgba is forced off
2443 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2444
2445 for my $par (@{$self->{par}}) { 3242 for my $para (@{$self->{par}}) {
2446 my $h = $par->[1]; 3243 my $h = $para->{h};
3244 my $y = $para->{y};
2447 3245
2448 if ($y0 < $y + $h && $y < $y1) { 3246 if ($y0 < $y + $h && $y < $y1) {
2449 $layout->set_foreground (@{ $par->[2] }); 3247 my $layout = $self->get_layout ($para);
2450 $layout->set_width ($W - $par->[3]);
2451 $layout->set_markup ($par->[4]);
2452 3248
2453 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3249 $layout->render ($para->{indent}, $y - $y0);
2454 3250
2455 glRasterPos $par->[3], $y - $y0; 3251 if (my @w = @{ $para->{widget} }) {
2456 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 }
2457 } 3263 }
2458 3264
2459 $y += $h; 3265 $paridx++;
3266 $top_paragraph ||= $paridx if $y >= $top;
2460 } 3267 }
2461 3268
2462 glDisable GL_BLEND; 3269 $self->{top_paragraph} = $top_paragraph;
2463 }; 3270 };
2464 }); 3271 });
2465} 3272}
2466 3273
3274sub reconfigure {
3275 my ($self) = @_;
3276
3277 $self->SUPER::reconfigure;
3278
3279 $_->{w} = 1e10 for @{ $self->{par} };
3280 $self->reflow;
3281}
3282
2467sub _draw { 3283sub _draw {
2468 my ($self) = @_; 3284 my ($self) = @_;
2469 3285
2470 glEnable GL_TEXTURE_2D; 3286 glEnable GL_TEXTURE_2D;
2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3287 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 1, 1, 1, 1; 3288 glColor 0, 0, 0, 1;
2473 $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});
2474 glDisable GL_TEXTURE_2D; 3290 glDisable GL_TEXTURE_2D;
2475 3291
2476 $self->{children}[1]->draw; 3292 $self->{children}[1]->draw;
2477
2478} 3293}
2479 3294
2480############################################################################# 3295#############################################################################
2481 3296
2482package CFClient::UI::Animator; 3297package CFPlus::UI::Animator;
2483 3298
2484use CFClient::OpenGL; 3299use CFPlus::OpenGL;
2485 3300
2486our @ISA = CFClient::UI::Bin::; 3301our @ISA = CFPlus::UI::Bin::;
2487 3302
2488sub moveto { 3303sub moveto {
2489 my ($self, $x, $y) = @_; 3304 my ($self, $x, $y) = @_;
2490 3305
2491 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3306 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2519 glPopMatrix; 3334 glPopMatrix;
2520} 3335}
2521 3336
2522############################################################################# 3337#############################################################################
2523 3338
2524package CFClient::UI::Flopper; 3339package CFPlus::UI::Flopper;
2525 3340
2526our @ISA = CFClient::UI::Button::; 3341our @ISA = CFPlus::UI::Button::;
2527 3342
2528sub new { 3343sub new {
2529 my $class = shift; 3344 my $class = shift;
2530 3345
2531 my $self = $class->SUPER::new ( 3346 my $self = $class->SUPER::new (
2532 state => 0, 3347 state => 0,
2533 connect_activate => \&toggle_flopper, 3348 on_activate => \&toggle_flopper,
2534 @_ 3349 @_
2535 ); 3350 );
2536 3351
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 3352 $self
2543} 3353}
2544 3354
2545sub toggle_flopper { 3355sub toggle_flopper {
2546 my ($self) = @_; 3356 my ($self) = @_;
2547 3357
2548 # TODO: use animation 3358 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 3359}
2560 3360
2561############################################################################# 3361#############################################################################
2562 3362
2563package CFClient::UI::Tooltip; 3363package CFPlus::UI::Tooltip;
2564 3364
2565our @ISA = CFClient::UI::Bin::; 3365our @ISA = CFPlus::UI::Bin::;
2566 3366
2567use CFClient::OpenGL; 3367use CFPlus::OpenGL;
2568 3368
2569sub new { 3369sub new {
2570 my $class = shift; 3370 my $class = shift;
2571 3371
2572 $class->SUPER::new ( 3372 $class->SUPER::new (
… …
2576} 3376}
2577 3377
2578sub set_tooltip_from { 3378sub set_tooltip_from {
2579 my ($self, $widget) = @_; 3379 my ($self, $widget) = @_;
2580 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
2581 $self->add (new CFClient::UI::Label 3396 $self->add (new CFPlus::UI::Label
2582 markup => $widget->{tooltip}, 3397 markup => $tooltip,
2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8, 3399 fontsize => 0.8,
2585 fg => [0, 0, 0, 1], 3400 style => 1, # FLAG_INVERSE
2586 ellipsise => 0, 3401 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP), 3402 font => ($widget->{tooltip_font} || $::FONT_PROP),
2588 ); 3403 );
2589} 3404}
2590 3405
… …
2594 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3409 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2595 3410
2596 ($w + 4, $h + 4) 3411 ($w + 4, $h + 4)
2597} 3412}
2598 3413
2599sub size_allocate { 3414sub invoke_size_allocate {
2600 my ($self, $w, $h) = @_; 3415 my ($self, $w, $h) = @_;
2601 3416
2602 $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 });
2603} 3440}
2604 3441
2605sub _draw { 3442sub _draw {
2606 my ($self) = @_; 3443 my ($self) = @_;
2607 3444
… …
2624 glVertex $w, $h; 3461 glVertex $w, $h;
2625 glVertex $w, 0; 3462 glVertex $w, 0;
2626 glEnd; 3463 glEnd;
2627 3464
2628 glTranslate 2 - 0.375, 2 - 0.375; 3465 glTranslate 2 - 0.375, 2 - 0.375;
3466
2629 $self->SUPER::_draw; 3467 $self->SUPER::_draw;
2630} 3468}
2631 3469
2632############################################################################# 3470#############################################################################
2633 3471
2634package CFClient::UI::Face; 3472package CFPlus::UI::Face;
2635 3473
2636our @ISA = CFClient::UI::Base::; 3474our @ISA = CFPlus::UI::DrawBG::;
2637 3475
2638use CFClient::OpenGL; 3476use CFPlus::OpenGL;
2639 3477
2640sub new { 3478sub new {
2641 my $class = shift; 3479 my $class = shift;
2642 3480
2643 my $self = $class->SUPER::new ( 3481 my $self = $class->SUPER::new (
3482 size_w => 32,
3483 size_h => 8,
2644 aspect => 1, 3484 aspect => 1,
2645 can_events => 0, 3485 can_events => 0,
2646 @_, 3486 @_,
2647 ); 3487 );
2648 3488
2649 if ($self->{anim} && $self->{animspeed}) { 3489 if ($self->{anim} && $self->{animspeed}) {
2650 Scalar::Util::weaken (my $widget = $self); 3490 CFPlus::weaken (my $widget = $self);
2651 3491
2652 $self->{timer} = Event->timer ( 3492 $self->{timer} = Event->timer (
2653 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2654 hard => 1, 3494 hard => 1,
2655 interval => $self->{animspeed}, 3495 interval => $self->{animspeed},
2656 cb => sub { 3496 cb => sub {
3497 return unless $::CONN;
3498
2657 ++$widget->{frame}; 3499 ++$widget->{frame};
3500 $self->update_face;
2658 $widget->update; 3501 $self->update;
2659 }, 3502 },
2660 ); 3503 );
3504
3505 $self->update_face;
2661 } 3506 }
2662 3507
2663 $self 3508 $self
2664} 3509}
2665 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
2666sub size_request { 3524sub size_request {
2667 (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)
2668} 3540}
2669 3541
2670sub update { 3542sub update {
2671 my ($self) = @_; 3543 my ($self) = @_;
2672 3544
… …
2678sub _draw { 3550sub _draw {
2679 my ($self) = @_; 3551 my ($self) = @_;
2680 3552
2681 return unless $::CONN; 3553 return unless $::CONN;
2682 3554
2683 my $face; 3555 $self->SUPER::_draw;
2684 3556
2685 if ($self->{frame}) {
2686 my $anim = $::CONN->{anim}[$self->{anim}]; 3557 my $faceid = $::CONN->{faceid}[$self->{face}]
2687 3558 or return;
2688 $face = $anim->[ $self->{frame} % @$anim ]
2689 if $anim && @$anim;
2690 }
2691 3559
2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3560 my $tex = $::CONN->{texture}[$faceid];
2693 3561
2694 if ($tex) { 3562 if ($tex) {
2695 glEnable GL_TEXTURE_2D; 3563 glEnable GL_TEXTURE_2D;
2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2697 glColor 1, 1, 1, 1; 3565 glColor 0, 0, 0, 1;
2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2699 glDisable GL_TEXTURE_2D; 3567 glDisable GL_TEXTURE_2D;
2700 } 3568 }
2701} 3569}
2702 3570
2703sub DESTROY { 3571sub destroy {
2704 my ($self) = @_; 3572 my ($self) = @_;
2705 3573
2706 $self->{timer}->cancel 3574 $self->{timer}->cancel
2707 if $self->{timer}; 3575 if $self->{timer};
2708 3576
2709 $self->SUPER::DESTROY; 3577 $self->SUPER::destroy;
2710} 3578}
2711 3579
2712############################################################################# 3580#############################################################################
2713 3581
2714package CFClient::UI::Inventory; 3582package CFPlus::UI::Buttonbar;
2715 3583
2716our @ISA = CFClient::UI::ScrolledWindow::; 3584our @ISA = CFPlus::UI::HBox::;
2717 3585
2718sub new { 3586# TODO: should actually wrap buttons and other goodies.
2719 my $class = shift;
2720
2721 my $self = $class->SUPER::new (
2722 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2723 @_,
2724 );
2725
2726 $self
2727}
2728
2729sub set_items {
2730 my ($self, $items) = @_;
2731
2732 $self->{scrolled}->clear;
2733 return unless $items;
2734
2735 my @items = sort {
2736 ($a->{type} <=> $b->{type})
2737 or ($a->{name} cmp $b->{name})
2738 } @$items;
2739
2740 $self->{real_items} = \@items;
2741
2742 my $row = 0;
2743 for my $item (@items) {
2744 CFClient::Item::update_widgets $item;
2745
2746 $self->{scrolled}->add (0, $row, $item->{face_widget});
2747 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2748 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2749
2750 $row++;
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760 3587
2761############################################################################# 3588#############################################################################
2762 3589
2763package CFClient::UI::Menu; 3590package CFPlus::UI::Menu;
2764 3591
2765our @ISA = CFClient::UI::FancyFrame::; 3592our @ISA = CFPlus::UI::Toplevel::;
2766 3593
2767use CFClient::OpenGL; 3594use CFPlus::OpenGL;
2768 3595
2769sub new { 3596sub new {
2770 my $class = shift; 3597 my $class = shift;
2771 3598
2772 my $self = $class->SUPER::new ( 3599 my $self = $class->SUPER::new (
2773 items => [], 3600 items => [],
2774 z => 100, 3601 z => 100,
2775 @_, 3602 @_,
2776 ); 3603 );
2777 3604
2778 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3605 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2779 3606
2780 for my $item (@{ $self->{items} }) { 3607 for my $item (@{ $self->{items} }) {
2781 my ($widget, $cb) = @$item; 3608 my ($widget, $cb, $tooltip) = @$item;
2782 3609
2783 # handle various types of items, only text for now 3610 # handle various types of items, only text for now
2784 if (!ref $widget) { 3611 if (!ref $widget) {
3612 if ($widget =~ /\t/) {
3613 my ($left, $right) = split /\t/, $widget, 2;
3614
2785 $widget = new CFClient::UI::Label 3615 $widget = new CFPlus::UI::HBox
2786 can_hover => 1, 3616 can_hover => 1,
2787 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,
2788 text => $widget; 3629 markup => $widget,
3630 tooltip => $tooltip;
3631 }
2789 } 3632 }
2790 3633
2791 $self->{item}{$widget} = $item; 3634 $self->{item}{$widget} = $item;
2792 3635
2793 $self->{vbox}->add ($widget); 3636 $self->{vbox}->add ($widget);
… …
2798 3641
2799# 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)
2800sub popup { 3643sub popup {
2801 my ($self, $ev) = @_; 3644 my ($self, $ev) = @_;
2802 3645
2803 $self->_emit ("popdown"); 3646 $self->emit ("popdown");
2804 3647
2805 # maybe save $GRAB? must be careful about events... 3648 # maybe save $GRAB? must be careful about events...
2806 $GRAB = $self; 3649 $GRAB = $self;
2807 $self->{button} = $ev->{button}; 3650 $self->{button} = $ev->{button};
2808 3651
2809 $self->show; 3652 $self->show;
2810 $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);
2811} 3654}
2812 3655
2813sub mouse_motion { 3656sub invoke_mouse_motion {
2814 my ($self, $ev, $x, $y) = @_; 3657 my ($self, $ev, $x, $y) = @_;
2815 3658
2816 # TODO: should use vbox->find_widget or so 3659 # TODO: should use vbox->find_widget or so
2817 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3660 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2818 $self->{hover} = $self->{item}{$HOVER}; 3661 $self->{hover} = $self->{item}{$HOVER};
2819}
2820 3662
3663 0
3664}
3665
2821sub button_up { 3666sub invoke_button_up {
2822 my ($self, $ev, $x, $y) = @_; 3667 my ($self, $ev, $x, $y) = @_;
2823 3668
2824 if ($ev->{button} == $self->{button}) { 3669 if ($ev->{button} == $self->{button}) {
2825 undef $GRAB; 3670 undef $GRAB;
2826 $self->hide; 3671 $self->hide;
2827 3672
2828 $self->_emit ("popdown"); 3673 $self->emit ("popdown");
2829 $self->{hover}[1]->() if $self->{hover}; 3674 $self->{hover}[1]->() if $self->{hover};
3675 } else {
3676 return 0
3677 }
3678
2830 } 3679 1
2831} 3680}
2832 3681
2833############################################################################# 3682#############################################################################
2834 3683
2835package CFClient::UI::Statusbox; 3684package CFPlus::UI::Multiplexer;
2836 3685
2837our @ISA = CFClient::UI::VBox::; 3686our @ISA = CFPlus::UI::Container::;
2838 3687
2839sub new { 3688sub new {
2840 my $class = shift; 3689 my $class = shift;
2841 3690
2842 $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 (
2843 fontsize => 0.8, 3870 fontsize => 0.8,
2844 @_, 3871 @_,
2845 ) 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
2846} 3879}
2847 3880
2848sub reorder { 3881sub reorder {
2849 my ($self) = @_; 3882 my ($self) = @_;
2850 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} };
2851 3889
2852 while (my ($k, $v) = each %{ $self->{item} }) { 3890 while (my ($k, $v) = each %{ $self->{item} }) {
2853 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3891 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2854 } 3892 }
2855 3893
… …
2858 my @items = sort { 3896 my @items = sort {
2859 $a->{pri} <=> $b->{pri} 3897 $a->{pri} <=> $b->{pri}
2860 or $b->{id} <=> $a->{id} 3898 or $b->{id} <=> $a->{id}
2861 } values %{ $self->{item} }; 3899 } values %{ $self->{item} };
2862 3900
3901 $self->{timer}->interval (1);
3902
2863 my $count = 10 + 1; 3903 my $count = 10 + 1;
2864 for my $item (@items) { 3904 for my $item (@items) {
2865 last unless --$count; 3905 last unless --$count;
2866 3906
2867 push @widgets, $item->{label} ||= do { 3907 my $label = $item->{label} ||= do {
2868 # TODO: doesn't handle markup well (read as: at all) 3908 # TODO: doesn't handle markup well (read as: at all)
2869 my $short = $item->{count} > 1 3909 my $short = $item->{count} > 1
2870 ? "<b>$item->{count} ×</b> $item->{text}" 3910 ? "<b>$item->{count} ×</b> $item->{text}"
2871 : $item->{text}; 3911 : $item->{text};
2872 3912
2873 for ($short) { 3913 for ($short) {
2874 s/^\s+//; 3914 s/^\s+//;
2875 s/\s+/ /g; 3915 s/\s+/ /g;
2876 } 3916 }
2877 3917
2878 new CFClient::UI::Label 3918 new CFPlus::UI::Label
2879 markup => $short, 3919 markup => $short,
2880 tooltip => $item->{tooltip}, 3920 tooltip => $item->{tooltip},
2881 tooltip_font => $::FONT_PROP, 3921 tooltip_font => $::FONT_PROP,
2882 tooltip_width => 0.67, 3922 tooltip_width => 0.67,
2883 fontsize => $item->{fontsize} || $self->{fontsize}, 3923 fontsize => $item->{fontsize} || $self->{fontsize},
2884 max_w => $::WIDTH * 0.44, 3924 max_w => $::WIDTH * 0.44,
2885 fg => $item->{fg}, 3925 fg => [@{ $item->{fg} }],
2886 can_events => 1, 3926 can_events => 1,
2887 can_hover => 1 3927 can_hover => 1
2888 }; 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;
2889 } 3941 }
2890 3942
2891 $self->clear; 3943 $self->clear;
2892 $self->SUPER::add (reverse @widgets); 3944 $self->SUPER::add (reverse @widgets);
2893} 3945}
… …
2898 $text =~ s/^\s+//; 3950 $text =~ s/^\s+//;
2899 $text =~ s/\s+$//; 3951 $text =~ s/\s+$//;
2900 3952
2901 return unless $text; 3953 return unless $text;
2902 3954
2903 my $timeout = time + ((delete $arg{timeout}) || 60); 3955 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2904 3956
2905 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3957 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2906 3958
2907 if (my $item = $self->{item}{$group}) { 3959 if (my $item = $self->{item}{$group}) {
2908 if ($item->{text} eq $text) { 3960 if ($item->{text} eq $text) {
2909 $item->{count}++; 3961 $item->{count}++;
2910 } else { 3962 } else {
2911 $item->{count} = 1; 3963 $item->{count} = 1;
2912 $item->{text} = $item->{tooltip} = $text; 3964 $item->{text} = $item->{tooltip} = $text;
2913 } 3965 }
2914 $item->{id} = ++$self->{id}; 3966 $item->{id} += 0.2;#d#
2915 $item->{timeout} = $timeout; 3967 $item->{timeout} = $timeout;
2916 delete $item->{label}; 3968 delete $item->{label};
2917 } else { 3969 } else {
2918 $self->{item}{$group} = { 3970 $self->{item}{$group} = {
2919 id => ++$self->{id}, 3971 id => ++$self->{id},
… …
2925 count => 1, 3977 count => 1,
2926 %arg, 3978 %arg,
2927 }; 3979 };
2928 } 3980 }
2929 3981
3982 $ROOT->on_refresh (reorder => sub {
2930 $self->reorder; 3983 $self->reorder;
3984 });
2931} 3985}
2932 3986
2933sub reconfigure { 3987sub reconfigure {
2934 my ($self) = @_; 3988 my ($self) = @_;
2935 3989
… …
2938 3992
2939 $self->reorder; 3993 $self->reorder;
2940 $self->SUPER::reconfigure; 3994 $self->SUPER::reconfigure;
2941} 3995}
2942 3996
3997sub destroy {
3998 my ($self) = @_;
3999
4000 $self->{timer}->cancel;
4001
4002 $self->SUPER::destroy;
4003}
4004
2943############################################################################# 4005#############################################################################
2944 4006
2945package CFClient::UI::Root; 4007package CFPlus::UI::Root;
2946 4008
2947our @ISA = CFClient::UI::Container::; 4009our @ISA = CFPlus::UI::Container::;
2948 4010
4011use List::Util qw(min max);
4012
2949use CFClient::OpenGL; 4013use CFPlus::OpenGL;
2950 4014
2951sub new { 4015sub new {
2952 my $class = shift; 4016 my $class = shift;
2953 4017
2954 $class->SUPER::new ( 4018 my $self = $class->SUPER::new (
4019 visible => 1,
2955 @_, 4020 @_,
2956 ) 4021 );
2957}
2958 4022
2959sub configure { 4023 CFPlus::weaken ($self->{root} = $self);
2960 my ($self, $x, $y, $w, $h) = @_;
2961 4024
2962 $self->{w} = $w; 4025 $self
2963 $self->{h} = $h;
2964}
2965
2966sub check_size {
2967 my ($self) = @_;
2968
2969 $self->size_allocate ($self->{w}, $self->{h})
2970 if $self->{w};
2971} 4026}
2972 4027
2973sub size_request { 4028sub size_request {
2974 my ($self) = @_; 4029 my ($self) = @_;
2975 4030
2976 ($self->{w}, $self->{h}) 4031 ($self->{w}, $self->{h})
2977} 4032}
2978 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
2979sub size_allocate { 4048sub invoke_size_allocate {
2980 my ($self, $w, $h) = @_; 4049 my ($self, $w, $h) = @_;
2981 4050
2982 for my $child ($self->children) { 4051 for my $child ($self->children) {
2983 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)};
2984 4053
2985 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 4054 $X = $child->{force_x} if exists $child->{force_x};
2986 if exists $child->{req_x}; 4055 $Y = $child->{force_y} if exists $child->{force_y};
2987 4056
2988 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 4057 $X = _to_pixel $X, $W, $self->{w};
2989 if exists $child->{req_y}; 4058 $Y = _to_pixel $Y, $H, $self->{h};
2990
2991 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2992 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2993 4059
2994 $child->configure ($X, $Y, $W, $H); 4060 $child->configure ($X, $Y, $W, $H);
2995 } 4061 }
4062
4063 1
2996} 4064}
2997 4065
2998sub coord2local { 4066sub coord2local {
2999 my ($self, $x, $y) = @_; 4067 my ($self, $x, $y) = @_;
3000 4068
… …
3008} 4076}
3009 4077
3010sub update { 4078sub update {
3011 my ($self) = @_; 4079 my ($self) = @_;
3012 4080
3013 $self->check_size;
3014 $::WANT_REFRESH++; 4081 $::WANT_REFRESH++;
3015} 4082}
3016 4083
3017sub add { 4084sub add {
3018 my ($self, @children) = @_; 4085 my ($self, @children) = @_;
3019 4086
3020 for (my @widgets = @children; my $w = pop @widgets; ) {
3021 push @widgets, $w->children;
3022 $w->{root} = $self;
3023 $w->{visible} = 1;
3024 }
3025
3026 for my $child (@children) {
3027 $child->{is_toplevel} = 1; 4087 $_->{is_toplevel} = 1
3028 4088 for @children;
3029 # integerise window positions
3030 $child->{x} = int $child->{x};
3031 $child->{y} = int $child->{y};
3032 }
3033 4089
3034 $self->SUPER::add (@children); 4090 $self->SUPER::add (@children);
3035} 4091}
3036 4092
3037sub remove { 4093sub remove {
3038 my ($self, @children) = @_; 4094 my ($self, @children) = @_;
3039 4095
3040 $self->SUPER::remove (@children); 4096 $self->SUPER::remove (@children);
4097
4098 delete $self->{is_toplevel}
4099 for @children;
3041 4100
3042 while (@children) { 4101 while (@children) {
3043 my $w = pop @children; 4102 my $w = pop @children;
3044 push @children, $w->children; 4103 push @children, $w->children;
3045 $w->set_invisible; 4104 $w->set_invisible;
… …
3064 while ($self->{refresh_hook}) { 4123 while ($self->{refresh_hook}) {
3065 $_->() 4124 $_->()
3066 for values %{delete $self->{refresh_hook}}; 4125 for values %{delete $self->{refresh_hook}};
3067 } 4126 }
3068 4127
3069 if ($self->{check_size}) { 4128 if ($self->{realloc}) {
3070 my @queue = ([], []); 4129 my %queue;
4130 my @queue;
4131 my $widget;
3071 4132
3072 for (;;) { 4133 outer:
3073 if ($self->{check_size}) { 4134 while () {
3074 # heuristic: check containers last 4135 if (my $realloc = delete $self->{realloc}) {
3075 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4136 for $widget (values %$realloc) {
3076 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 }
3077 } 4143 }
3078 4144
3079 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4145 while () {
4146 @queue or last outer;
3080 4147
3081 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4148 $widget = pop @{ $queue[-1] || [] }
3082 ? @$widget{qw(user_w user_h)} 4149 and last;
3083 : $widget->size_request;
3084
3085 if (delete $widget->{force_alloc}
3086 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3087 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3088 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}) {
3089 $widget->{req_w} = $w; 4169 $widget->{req_w} = $w;
3090 $widget->{req_h} = $h; 4170 $widget->{req_h} = $h;
3091 4171
3092 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4172 $self->{size_alloc}{$widget+0} = $widget;
3093 4173
3094 $widget->{parent}->check_size
3095 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 }
3096 } 4181 }
4182
4183 delete $self->{realloc}{$widget+0};
3097 } 4184 }
3098 } 4185 }
3099 4186
3100 while ($self->{size_alloc}) { 4187 while (my $size_alloc = delete $self->{size_alloc}) {
3101 for (values %{delete $self->{size_alloc}}) { 4188 my @queue = sort { $b->{visible} <=> $a->{visible} }
3102 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)};
3103 4195
3104 $w = 0 if $w < 0; 4196 $w = 0 if $w < 0;
3105 $h = 0 if $h < 0; 4197 $h = 0 if $h < 0;
3106 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
3107 $widget->{w} = $w; 4215 $widget->{w} = $w;
3108 $widget->{h} = $h; 4216 $widget->{h} = $h;
4217
3109 $widget->emit (size_allocate => $w, $h); 4218 $widget->emit (size_allocate => $w, $h);
4219 }
3110 } 4220 }
3111 } 4221 }
3112 4222
3113 while ($self->{post_alloc_hook}) { 4223 while ($self->{post_alloc_hook}) {
3114 $_->() 4224 $_->()
3115 for values %{delete $self->{post_alloc_hook}}; 4225 for values %{delete $self->{post_alloc_hook}};
3116 } 4226 }
4227
3117 4228
3118 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4229 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3119 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4230 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3120 glClear GL_COLOR_BUFFER_BIT; 4231 glClear GL_COLOR_BUFFER_BIT;
3121 4232
… …
3123 glLoadIdentity; 4234 glLoadIdentity;
3124 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4235 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3125 glMatrixMode GL_MODELVIEW; 4236 glMatrixMode GL_MODELVIEW;
3126 glLoadIdentity; 4237 glLoadIdentity;
3127 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
3128 $self->_draw; 4245 $self->_draw;
4246 }
3129} 4247}
3130 4248
3131############################################################################# 4249#############################################################################
3132 4250
3133package CFClient::UI; 4251package CFPlus::UI;
3134 4252
3135$ROOT = new CFClient::UI::Root; 4253$ROOT = new CFPlus::UI::Root;
3136$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4254$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3137 4255
31381 42561
3139 4257

Diff Legend

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