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

Diff Legend

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