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

Diff Legend

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