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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.462 by root, Thu Mar 20 22:28:33 2008 UTC

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

Diff Legend

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