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.202 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.429 by root, Tue Aug 21 00:59:34 2007 UTC

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

Diff Legend

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