ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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