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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 2007 UTC

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

Diff Legend

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