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.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.431 by root, Tue Aug 21 02:41:52 2007 UTC

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

Diff Legend

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