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

Diff Legend

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