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.59 by root, Tue Apr 11 13:05:12 2006 UTC vs.
Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
6 7
7use SDL::OpenGL; 8use CFClient;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
14our $TOPLEVEL; 12our $TOPLEVEL;
15our $BUTTON_STATE; 13our $BUTTON_STATE;
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64 62
65 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
67 65
68 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
69 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
74 80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
79} 100}
80 101
81sub move { 102sub move {
82 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
83 $self->{x} = $x; 104 $self->{x} = $x;
… …
92sub size_request { 113sub size_request {
93 require Carp; 114 require Carp;
94 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
95} 116}
96 117
97sub size_allocate { 118sub _size_allocate {
98 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
99 125
100 $self->{w} = $w; 126 $self->{w} = $w;
101 $self->{h} = $h; 127 $self->{h} = $h;
102}
103 128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
104# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
105sub translate { 139sub translate {
106 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
107 141
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
109} 143}
110 144
111sub focus_in { 145sub focus_in {
112 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
113 150
114 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus; 152 $focus->update if $focus;
116 $FOCUS->update; 153 $FOCUS->update;
117} 154}
… …
125 $focus->update if $focus; #? 162 $focus->update if $focus; #?
126} 163}
127 164
128sub mouse_motion { } 165sub mouse_motion { }
129sub button_up { } 166sub button_up { }
130sub button_down { }
131sub key_down { } 167sub key_down { }
132sub key_up { } 168sub key_up { }
169
170sub button_down {
171 my ($self, $ev, $x, $y) = @_;
172
173 $self->focus_in;
174}
133 175
134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 176sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
139 181
140sub draw { 182sub draw {
141 my ($self) = @_; 183 my ($self) = @_;
142 184
185 return unless $self->{h} && $self->{w};
186
143 glPushMatrix; 187 glPushMatrix;
144 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
145 $self->_draw; 189 $self->_draw;
146 if ($self == $HOVER) { 190 glPopMatrix;
147 glColor 1, 1, 1, 0.4; 191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
148 glEnable GL_BLEND; 196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
149 glBegin GL_QUADS; 198 glBegin GL_QUADS;
150 glVertex 0 , 0; 199 glVertex $x , $y;
151 glVertex $self->{w}, 0; 200 glVertex $x + $self->{w}, $y;
152 glVertex $self->{w}, $self->{h}; 201 glVertex $x + $self->{w}, $y + $self->{h};
153 glVertex 0 , $self->{h}; 202 glVertex $x , $y + $self->{h};
154 glEnd; 203 glEnd;
155 glDisable GL_BLEND; 204 glDisable GL_BLEND;
156 } 205 }
157 glPopMatrix;
158} 206}
159 207
160sub _draw { 208sub _draw {
161 my ($self) = @_; 209 my ($self) = @_;
162 210
163 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
164}
165
166sub bbox {
167 my ($self) = @_;
168 my ($w, $h) = $self->size_request;
169 (
170 $self->{x},
171 $self->{y},
172 $self->{x} = $w,
173 $self->{y} = $h
174 )
175} 212}
176 213
177sub find_widget { 214sub find_widget {
178 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
179 216
… …
182 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
183 220
184 () 221 ()
185} 222}
186 223
187sub del_parent { $_[0]->{parent} = undef }
188
189sub set_parent { 224sub set_parent {
190 my ($self, $par) = @_; 225 my ($self, $par) = @_;
191 226
192 $self->{parent} = $par; 227 $self->{parent} = $par;
193 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
202 237
203 $self->{parent}->update 238 $self->{parent}->update
204 if $self->{parent}; 239 if $self->{parent};
205} 240}
206 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
207sub DESTROY { 255sub DESTROY {
208 my ($self) = @_; 256 my ($self) = @_;
209 257
210 #$self->deactivate; 258 #$self->deactivate;
211} 259}
212 260
213############################################################################# 261#############################################################################
214 262
215package Crossfire::Client::Widget::Container; 263package CFClient::UI::DrawBG;
216 264
217our @ISA = Crossfire::Client::Widget::; 265our @ISA = CFClient::UI::Base::;
266
267use strict;
268use SDL::OpenGL;
218 269
219sub new { 270sub new {
271 my $class = shift;
272
273 # range [value, low, high, page]
274
275 $class->SUPER::new (
276 bg => [0, 0, 0, 0.2],
277 active_bg => [1, 1, 1, 0.5],
278 @_
279 )
280}
281
282sub _draw {
283 my ($self) = @_;
284
285 my ($w, $h) = @$self{qw(w h)};
286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
291 glBegin GL_QUADS;
292 glVertex 0 , 0;
293 glVertex 0 , $h;
294 glVertex $w, $h;
295 glVertex $w, 0;
296 glEnd;
297
298 glDisable GL_BLEND;
299}
300
301#############################################################################
302
303package CFClient::UI::Empty;
304
305our @ISA = CFClient::UI::Base::;
306
307sub size_request {
308 (0, 0)
309}
310
311sub draw { }
312
313#############################################################################
314
315package CFClient::UI::Container;
316
317our @ISA = CFClient::UI::Base::;
318
319sub new {
220 my ($class, @widgets) = @_; 320 my ($class, %arg) = @_;
221 321
322 my $children = delete $arg{children} || [];
323
222 my $self = $class->SUPER::new (children => []); 324 my $self = $class->SUPER::new (children => [], %arg);
223 $self->add ($_) for @widgets; 325 $self->add ($_) for @$children;
224 326
225 $self 327 $self
226} 328}
227 329
228sub add { 330sub add {
229 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
230 332
231 $chld->{expand} = $expand;
232 $chld->set_parent ($self); 333 $chld->set_parent ($self);
233 334
234 @{$self->{children}} = 335 $self->{children} = [
235 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
236 @{$self->{children}}, $chld; 337 @{$self->{children}}, $chld
338 ];
237 339
238 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
239 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
240} 342}
241 343
242sub remove { 344sub remove {
243 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
244 346
245 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
246 348
247 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
248} 350}
249 351
250sub find_widget { 352sub find_widget {
251 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
252 354
… …
269 $_->draw for @{$self->{children}}; 371 $_->draw for @{$self->{children}};
270} 372}
271 373
272############################################################################# 374#############################################################################
273 375
274package Crossfire::Client::Widget::Bin; 376package CFClient::UI::Bin;
275 377
276our @ISA = Crossfire::Client::Widget::Container::; 378our @ISA = CFClient::UI::Container::;
379
380sub new {
381 my ($class, %arg) = @_;
382
383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
384
385 $class->SUPER::new (children => [$child], %arg)
386}
387
388sub add {
389 my ($self, $widget) = @_;
390
391 $self->{children} = [];
392
393 $self->SUPER::add ($widget);
394}
395
396sub remove {
397 my ($self, $widget) = @_;
398
399 $self->SUPER::remove ($widget);
400
401 $self->{children} = [new CFClient::UI::Empty]
402 unless @{$self->{children}};
403}
277 404
278sub child { $_[0]->{children}[0] } 405sub child { $_[0]->{children}[0] }
279 406
280sub size_request { 407sub size_request {
281 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 408 $_[0]{children}[0]->size_request
282} 409}
283 410
284sub size_allocate { 411sub size_allocate {
285 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
286 413
287 $self->SUPER::size_allocate ($w, $h); 414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
288 $self->{children}[0]->size_allocate ($w, $h) 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
289 if $self->{children}[0]
290} 417}
291 418
292############################################################################# 419#############################################################################
293 420
294package Crossfire::Client::Widget::Window; 421package CFClient::UI::Window;
295 422
296our @ISA = Crossfire::Client::Widget::Bin::; 423our @ISA = CFClient::UI::Bin::;
297 424
298use SDL::OpenGL; 425use SDL::OpenGL;
299 426
300sub new { 427sub new {
301 my ($class, $x, $y, $z, $w, $h) = @_; 428 my ($class, %arg) = @_;
302 429
303 my $self = $class->SUPER::new; 430 my $self = $class->SUPER::new (%arg);
304
305 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
306} 431}
307 432
308sub update { 433sub update {
309 my ($self) = @_; 434 my ($self) = @_;
310 435
436 # we want to do this delayed...
311 $self->render_chld; 437 $self->render_chld;
312 $self->SUPER::update; 438 $self->SUPER::update;
313} 439}
314 440
315sub render_chld { 441sub render_chld {
316 my ($self) = @_; 442 my ($self) = @_;
317 443
318 $self->{texture} = 444 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
319 Crossfire::Client::Texture->new_from_opengl ( 445 glClearColor 0, 0, 0, 1;
320 $self->{w}, $self->{h}, sub { $self->child->draw } 446 glClear GL_COLOR_BUFFER_BIT;
321 ); 447 $self->child->draw;
448 };
322} 449}
323 450
324sub size_allocate { 451sub size_allocate {
325 my ($self, $w, $h) = @_; 452 my ($self, $x, $y, $w, $h) = @_;
326 453
327 $self->{w} = $w; 454 $self->_size_allocate ($x, $y, $w, $h) or return;
328 $self->{h} = $h;
329 455
330 $self->child->size_allocate ($w, $h); 456 $self->child->size_allocate (0, 0, $w, $h);
331 457
332 $self->render_chld; 458 $self->render_chld;
333} 459}
334 460
335sub _draw { 461sub _draw {
… …
339 465
340 my $tex = $self->{texture} 466 my $tex = $self->{texture}
341 or return; 467 or return;
342 468
343 glEnable GL_BLEND; 469 glEnable GL_BLEND;
470 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
344 glEnable GL_TEXTURE_2D; 471 glEnable GL_TEXTURE_2D;
345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
346 473
347 $tex->draw_quad (0, 0, $w, $h); 474 $tex->draw_quad (0, 0, $w, $h);
348 475
… …
350 glDisable GL_TEXTURE_2D; 477 glDisable GL_TEXTURE_2D;
351} 478}
352 479
353############################################################################# 480#############################################################################
354 481
355package Crossfire::Client::Widget::Frame; 482package CFClient::UI::Frame;
356 483
357our @ISA = Crossfire::Client::Widget::Bin::; 484our @ISA = CFClient::UI::Bin::;
358 485
359use SDL::OpenGL; 486use SDL::OpenGL;
360 487
361sub size_request { 488sub size_request {
362 my ($self) = @_; 489 my ($self) = @_;
… …
367 494
368 map { $_ + 4 } $chld->size_request; 495 map { $_ + 4 } $chld->size_request;
369} 496}
370 497
371sub size_allocate { 498sub size_allocate {
372 my ($self, $w, $h) = @_; 499 my ($self, $x, $y, $w, $h) = @_;
373 500
374 $self->{w} = $w; 501 $self->_size_allocate ($x, $y, $w, $h) or return;
375 $self->{h} = $h;
376 502
377 $self->child->size_allocate ($w - 4, $h - 4); 503 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
378 $self->child->move (2, 2);
379} 504}
380 505
381sub _draw { 506sub _draw {
382 my ($self) = @_; 507 my ($self) = @_;
383 508
… …
396 $chld->draw; 521 $chld->draw;
397} 522}
398 523
399############################################################################# 524#############################################################################
400 525
401package Crossfire::Client::Widget::FancyFrame; 526package CFClient::UI::FancyFrame;
402 527
403our @ISA = Crossfire::Client::Widget::Bin::; 528our @ISA = CFClient::UI::Bin::;
404 529
405use SDL::OpenGL; 530use SDL::OpenGL;
406 531
407my @tex = 532my @tex =
408 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
409 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 534 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
410 535
536sub new {
537 my $class = shift;
538
539 # TODO: user_x, user_y, overwrite moveto?
540
541 $class->SUPER::new (
542 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8,
545 @_
546 )
547}
548
411sub size_request { 549sub size_request {
412 my ($self) = @_; 550 my ($self) = @_;
413 551
552 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
553
414 my ($w, $h) = $self->SUPER::size_request; 554 my ($w, $h) = $self->SUPER::size_request;
415 555
416 $h += $tex[1]->{height}; 556 (
417 $h += $tex[4]->{height}; 557 $w + $self->{border} * 2,
418 $w += $tex[2]->{width}; 558 $h + $self->{border} * 2,
419 $w += $tex[3]->{width}; 559 )
420
421 ($w, $h)
422} 560}
423 561
424sub size_allocate { 562sub size_allocate {
425 my ($self, $w, $h) = @_; 563 my ($self, $x, $y, $w, $h) = @_;
426 564
427 $self->SUPER::size_allocate ($w, $h); 565 $self->_size_allocate ($x, $y, $w, $h) or return;
428 566
429 $h -= $tex[1]->{height}; 567 $h -= List::Util::max 0, $self->{border} * 2;
430 $h -= $tex[4]->{height}; 568 $w -= List::Util::max 0, $self->{border} * 2;
431 $w -= $tex[2]->{width};
432 $w -= $tex[3]->{width};
433 569
434 $h = $h < 0 ? 0 : $h; 570 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
435 $w = $w < 0 ? 0 : $w; 571}
436 572
437 $self->child->size_allocate ($w, $h); 573sub button_down {
438 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 574 my ($self, $ev, $x, $y) = @_;
575
576 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
577 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
578
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
580 my ($bw, $bh) = ($self->{w}, $self->{h});
581
582 $self->{motion} = sub {
583 my ($ev, $x, $y) = @_;
584
585 ($x, $y) = ($ev->motion_x, $ev->motion_y);
586
587 $self->{user_w} = $bw + $x - $ox;
588 $self->{user_h} = $bh + $y - $oy;
589 $self->update;
590 };
591
592 } elsif ($x >= 0 && $x < $self->{w}
593 && $y >= 0 && $y < $self->{border}) {
594
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
596 my ($bx, $by) = ($self->{x}, $self->{y});
597
598 $self->{motion} = sub {
599 my ($ev, $x, $y) = @_;
600
601 ($x, $y) = ($ev->motion_x, $ev->motion_y);
602
603 $self->move ($bx + $x - $ox, $by + $y - $oy);
604 $self->update;
605 };
606 }
607}
608
609sub button_up {
610 my ($self, $ev, $x, $y) = @_;
611
612 delete $self->{motion};
613}
614
615sub mouse_motion {
616 my ($self, $ev, $x, $y) = @_;
617
618 $self->{motion}->($ev, $x, $y) if $self->{motion};
439} 619}
440 620
441sub _draw { 621sub _draw {
442 my ($self) = @_; 622 my ($self) = @_;
443 623
444 my ($w, $h) = ($self->{w}, $self->{h}); 624 my ($w, $h ) = ($self->{w}, $self->{h});
445 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
446 626
447 glEnable GL_BLEND; 627 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glEnable GL_TEXTURE_2D; 629 glEnable GL_TEXTURE_2D;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
451 631
452 my $top = $tex[1]; 632 glColor @{ $self->{border_bg} };
453 $top->draw_quad (0, 0, $w, $top->{height}); 633 $tex[1]->draw_quad (0, 0, $w, $self->{border});
454 634 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
455 my $left = $tex[3]; 635 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
456 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 636 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
457
458 my $right = $tex[2];
459 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
460
461 my $bottom = $tex[4];
462 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
463 637
464 my $bg = $tex[0]; 638 my $bg = $tex[0];
465 glBindTexture GL_TEXTURE_2D, $bg->{name};
466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
469 639
640 # TODO: repeat texture not scale
470 my $rep_x = $cw / $bg->{width}; 641 my $rep_x = $cw / $bg->{w};
471 my $rep_y = $ch / $bg->{height}; 642 my $rep_y = $ch / $bg->{h};
472 643
644 glColor @{ $self->{bg} };
645
646 $bg->{s} = $rep_x;
647 $bg->{t} = $rep_y;
648 $bg->{wrap_mode} = 1;
473 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 649 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
474 650
651 glDisable GL_TEXTURE_2D;
475 glDisable GL_BLEND; 652 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D;
477 653
478 $self->child->draw; 654 $self->child->draw;
479
480} 655}
481 656
482############################################################################# 657#############################################################################
483 658
484package Crossfire::Client::Widget::Table; 659package CFClient::UI::Table;
485 660
486our @ISA = Crossfire::Client::Widget::Bin::; 661our @ISA = CFClient::UI::Base::;
662
663use List::Util qw(max sum);
487 664
488use SDL::OpenGL; 665use SDL::OpenGL;
666
667sub new {
668 my $class = shift;
669
670 $class->SUPER::new (
671 col_expand => [],
672 @_
673 )
674}
489 675
490sub add { 676sub add {
491 my ($self, $x, $y, $chld) = @_; 677 my ($self, $x, $y, $chld) = @_;
492 my $old_chld = $self->{children}[$y][$x];
493 678
494 $self->{children}[$y][$x] = $chld; 679 $self->{children}[$y][$x] = $chld;
495 $chld->set_parent ($self); 680 $chld->set_parent ($self);
681
682 $self->{w} = $self->{h} = -1;
496 $self->update; 683 $self->update;
497} 684}
498 685
499sub max_row_height { 686sub get_wh {
500 my ($self, $row) = @_; 687 my ($self) = @_;
501 688
502 my $hs = 0; 689 my (@w, @h);
503 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 690
691 for my $y (0 .. $#{$self->{children}}) {
504 my $c = $self->{children}->[$row]->[$xi]; 692 my $row = $self->{children}[$y]
505 if ($c) { 693 or next;
694
695 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x]
697 or next;
506 my ($w, $h) = $c->size_request; 698 my ($w, $h) = $widget->size_request;
507 if ($hs < $h) { $hs = $h } 699
700 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h;
508 } 702 }
509 } 703 }
510 return $hs;
511}
512 704
513sub max_col_width { 705 (\@w, \@h)
706}
707
708sub size_request {
514 my ($self, $col) = @_; 709 my ($self) = @_;
515 710
711 my ($ws, $hs) = $self->get_wh;
712
713 (
714 (sum @$ws),
715 (sum @$hs),
716 )
717}
718
719sub size_allocate {
720 my ($self, $x, $y, $w, $h) = @_;
721
722 $self->_size_allocate ($x, $y, $w, $h) or return;
723
724 my ($ws, $hs) = $self->get_wh;
725
726 my $req_w = sum @$ws;
727 my $req_h = sum @$hs;
728
729 # TODO: nicer code && do row_expand
730 my @col_expand = @{$self->{col_expand}};
731 @col_expand = (1) x @$ws unless @col_expand;
732 my $col_expand = (sum @col_expand) || 1;
733
734 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737
738 my $y;
739
740 for my $r (0 .. $#{$self->{children}}) {
741 my $row = $self->{children}[$r]
742 or next;
743
516 my $ws = 0; 744 my $x = 0;
517 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 745 my $row_h = $hs->[$r];
518 my $c = ($self->{children}->[$yi] || [])->[$col]; 746
519 if ($c) { 747 for my $c (0 .. $#$row) {
520 my ($w, $h) = $c->size_request; 748 my $col_w = $ws->[$c];
521 if ($ws < $w) { $ws = $w } 749
750 if (my $widget = $row->[$c]) {
751 $widget->size_allocate ($x, $y, $col_w, $row_h);
752 }
753
754 $x += $col_w;
522 } 755 }
756
757 $y += $row_h;
523 } 758 }
524 return $ws; 759
525} 760}
761
762sub find_widget {
763 my ($self, $x, $y) = @_;
764
765 $x -= $self->{x};
766 $y -= $self->{y};
767
768 my $res;
769
770 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
771 $res = $_->find_widget ($x, $y)
772 and return $res;
773 }
774
775 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
776}
777
778sub _draw {
779 my ($self) = @_;
780
781 for (grep $_, @{$self->{children}}) {
782 $_->draw for grep $_, @$_;
783 }
784}
785
786#############################################################################
787
788package CFClient::UI::HBox;
789
790# TODO: wrap into common Box base class
791
792our @ISA = CFClient::UI::Container::;
526 793
527sub size_request { 794sub size_request {
528 my ($self) = @_; 795 my ($self) = @_;
529 796
797 my @alloc = map [$_->size_request], @{$self->{children}};
798
799 (
800 (List::Util::sum map $_->[0], @alloc),
801 (List::Util::max map $_->[1], @alloc),
802 )
803}
804
805sub size_allocate {
806 my ($self, $x, $y, $w, $h) = @_;
807
808 $self->_size_allocate ($x, $y, $w, $h);
809
530 my ($hs, $ws) = (0, 0); 810 ($h, $w) = ($w, $h);
531 811
532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 812 my $children = $self->{children};
533 $hs += $self->max_row_height ($yi);
534 }
535 813
536 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 814 my @h = map +($_->size_request)[0], @$children;
537 my $wm = 0; 815
538 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 816 my $req_h = List::Util::sum @h;
539 $wm += $self->max_col_width ($xi) 817
818 if ($req_h > $h) {
819 # ah well, not enough space
820 $_ *= $h / $req_h for @h;
821 } else {
822 my $exp = List::Util::sum map $_->{expand}, @$children;
823 $exp ||= 1;
824
825 for (0 .. $#$children) {
826 my $child = $children->[$_];
827
828 my $alloc_h = $h[$_];
829 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830 $h[$_] = $alloc_h;
540 } 831 }
541 if ($ws < $wm) { $ws = $wm }
542 } 832 }
543
544 return ($ws, $hs);
545}
546
547sub _draw {
548 my ($self) = @_;
549 833
550 my $y = 0; 834 my $y = 0;
551 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 835 for (0 .. $#$children) {
552 my $x = 0; 836 my $child = $children->[$_];
837 my $h = int $h[$_];
838 $child->size_allocate ($y, 0, $h, $w);
553 839
554 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 840 $y += $h;
555
556 my $c = $self->{children}->[$yi]->[$xi];
557 if ($c) {
558 $c->move ($x, $y, 0); #TODO: Move to size_request
559 $c->draw if $c;
560 }
561
562 $x += $self->max_col_width ($xi);
563 }
564
565 $y += $self->max_row_height ($yi);
566 } 841 }
567} 842}
568 843
569############################################################################# 844#############################################################################
570 845
571package Crossfire::Client::Widget::VBox; 846package CFClient::UI::VBox;
572 847
848# TODO: wrap into common Box base class
849
573our @ISA = Crossfire::Client::Widget::Container::; 850our @ISA = CFClient::UI::Container::;
574
575use SDL::OpenGL;
576 851
577sub size_request { 852sub size_request {
578 my ($self) = @_; 853 my ($self) = @_;
579 854
580 my @alloc = map [$_->size_request], @{$self->{children}}; 855 my @alloc = map [$_->size_request], @{$self->{children}};
… …
584 (List::Util::sum map $_->[1], @alloc), 859 (List::Util::sum map $_->[1], @alloc),
585 ) 860 )
586} 861}
587 862
588sub size_allocate { 863sub size_allocate {
589 my ($self, $w, $h) = @_; 864 my ($self, $x, $y, $w, $h) = @_;
590 865
591 $self->w ($w); 866 $self->_size_allocate ($x, $y, $w, $h);
592 $self->h ($h);
593 867
594 my $exp; 868 my $children = $self->{children};
595 my @oth; 869
596 # find expand widget 870 my @h = map +($_->size_request)[1], @$children;
597 for (@{$self->{children}}) { 871
598 if ($_->{expand}) { 872 my $req_h = List::Util::sum @h;
873
874 if ($req_h > $h) {
875 # ah well, not enough space
876 $_ *= $h / $req_h for @h;
877 } else {
878 my $exp = List::Util::sum map $_->{expand}, @$children;
599 $exp = $_; 879 $exp ||= 1;
600 last; 880
881 for (0 .. $#$children) {
882 my $child = $children->[$_];
883
884 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
601 } 885 }
602 push @oth, $_;
603 }
604
605 my ($ow, $oh);
606
607 # get sizes of other widgets
608 for (@oth) {
609 my ($w, $h) = $_->size_request;
610 $oh += $h;
611 if ($ow < $w) { $ow = $w }
612 } 886 }
613 887
614 my $y = 0; 888 my $y = 0;
615 for (@{$self->{children}}) { 889 for (0 .. $#$children) {
616 $_->move (0, $y); 890 my $child = $children->[$_];
617 891 my $h = int $h[$_];
618 if ($_ == $exp) {
619 $_->size_allocate ($w, $h - $oh);
620 $y += $h - $oh;
621 } else {
622 my ($cw, $h) = $_->size_request;
623 $_->size_allocate ($w, $h); 892 $child->size_allocate (0, $y, $w, $h);
893
624 $y += $h; 894 $y += $h;
625 }
626 } 895 }
627} 896}
628 897
629############################################################################# 898#############################################################################
630 899
631package Crossfire::Client::Widget::Label; 900package CFClient::UI::Label;
632 901
633our @ISA = Crossfire::Client::Widget::; 902our @ISA = CFClient::UI::Base::;
634 903
635use SDL::OpenGL; 904use SDL::OpenGL;
636 905
637sub new { 906sub new {
638 my ($class, $x, $y, $z, $height, $text) = @_; 907 my ($class, %arg) = @_;
639 908
640 $height ||= $::FONTSIZE;
641
642 # TODO: color, and make height, xyz etc. optional
643 my $self = $class->SUPER::new ( 909 my $self = $class->SUPER::new (
644 x => $x, 910 fg => [1, 1, 1],
645 y => $y, 911 fontsize => $::FONTSIZE,
646 z => $z, 912 text => "",
647 height => $height, 913 align => -1,
914 padding => 2,
648 layout => new Crossfire::Client::Layout, 915 layout => new CFClient::Layout,
916 %arg
649 ); 917 );
650 918
651 $self->set_text ($text); 919 $self->set_text ($self->{text});
652 920
653 $self 921 $self
922}
923
924sub escape_text {
925 local $_ = $_[1];
926
927 s/&/&amp;/g;
928 s/>/&gt;/g;
929 s/</&lt;/g;
930
931 $_[1]
654} 932}
655 933
656sub set_text { 934sub set_text {
657 my ($self, $text) = @_; 935 my ($self, $text) = @_;
658 936
659 $self->{text} = $text; 937 $self->{text} = $text;
660 $self->{layout}->set_markup ($text); 938 $self->{layout}->set_markup ($text);
661 939
662 delete $self->{texture}; 940 delete $self->{texture};
941# $self->{w} = $self->{h} = -1;
942 $self->update;
663} 943}
664 944
665sub get_text { 945sub get_text {
666 my ($self, $text) = @_; 946 my ($self, $text) = @_;
667 947
… …
670 950
671sub size_request { 951sub size_request {
672 my ($self) = @_; 952 my ($self) = @_;
673 953
674 $self->{layout}->set_width; 954 $self->{layout}->set_width;
955 $self->{layout}->set_height ($self->{fontsize});
675 $self->{layout}->size 956 my ($w, $h) = $self->{layout}->size;
676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 957
677# ( 958 (
678# $self->{texture}{width}, 959 $w + $self->{padding} * 2,
679# $self->{texture}{height}, 960 $h + $self->{padding} * 2,
680# ) 961 )
681# } else {
682# my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};
683#
684# ($w, $h)
685# }
686} 962}
687 963
688sub size_allocate { 964sub size_allocate {
689 my ($self, $w, $h) = @_; 965 my ($self, $x, $y, $w, $h) = @_;
690 966
691 $self->SUPER::size_allocate ($w, $h); 967 $self->_size_allocate ($x, $y, $w, $h) or return;
968
692 delete $self->{texture}; 969 delete $self->{texture};
970}
971
972sub update {
973 my ($self) = @_;
974
975 delete $self->{texture};
976 $self->SUPER::update;
693} 977}
694 978
695sub _draw { 979sub _draw {
696 my ($self) = @_; 980 my ($self) = @_;
697 981
698 my $tex = $self->{texture} ||= do { 982 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w}); 983 $self->{layout}->set_width ($self->{w});
984 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
700 new_from_layout Crossfire::Client::Texture $self->{layout}; 985 new_from_layout CFClient::Texture $self->{layout}
701 }; 986 };
987
988 glEnable GL_BLEND;
989 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
990 glEnable GL_TEXTURE_2D;
991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
992
993 glColor @{$self->{fg}};
994
995 my $x =
996 $self->{align} < 0 ? $self->{padding}
997 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
998 : ($self->{w} - $tex->{w}) * 0.5;
999
1000 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1001
1002 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND;
1004}
1005
1006#############################################################################
1007
1008package CFClient::UI::Entry;
1009
1010our @ISA = CFClient::UI::Label::;
1011
1012use SDL;
1013use SDL::OpenGL;
1014
1015sub new {
1016 my $class = shift;
1017
1018 $class->SUPER::new (
1019 fg => [1, 1, 1],
1020 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0],
1023 can_hover => 1,
1024 can_focus => 1,
1025 @_
1026 )
1027}
1028
1029sub _set_text {
1030 my ($self, $text) = @_;
1031
1032 my $old_text = $self->{text};
1033
1034 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1039
1040 $text =~ s/./*/g if $self->{hidden};
1041
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043
1044 $text = substr $text, 0, $self->{cursor};
1045 utf8::encode $text;
1046
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
1051}
1052
1053sub size_request {
1054 my ($self) = @_;
1055
1056 my ($w, $h) = $self->SUPER::size_request;
1057
1058 ($w + 1, $h) # add 1 for cursor
1059}
1060
1061sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_;
1063
1064 $self->SUPER::size_allocate ($x, $y, $w, $h);
1065
1066 $self->_set_text ($self->{text});
1067}
1068
1069sub set_text {
1070 my ($self, $text) = @_;
1071
1072 $self->{cursor} = length $text;
1073 $self->_set_text ($text);
1074 $self->update;
1075}
1076
1077sub key_down {
1078 my ($self, $ev) = @_;
1079
1080 my $mod = $ev->key_mod;
1081 my $sym = $ev->key_sym;
1082
1083 my $uni = $ev->key_unicode;
1084
1085 my $text = $self->get_text;
1086
1087 if ($sym == SDLK_BACKSPACE) {
1088 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1089 } elsif ($sym == SDLK_DELETE) {
1090 substr $text, $self->{cursor}, 1, "";
1091 } elsif ($sym == SDLK_LEFT) {
1092 --$self->{cursor} if $self->{cursor};
1093 } elsif ($sym == SDLK_RIGHT) {
1094 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) {
1096 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) {
1098 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) {
1100 $self->emit ('escape');
1101 } elsif ($uni) {
1102 substr $text, $self->{cursor}++, 0, chr $uni;
1103 }
1104
1105 $self->_set_text ($text);
1106 $self->update;
1107}
1108
1109sub focus_in {
1110 my ($self) = @_;
1111
1112 $self->{last_activity} = $::NOW;
1113
1114 $self->SUPER::focus_in;
1115}
1116
1117sub button_down {
1118 my ($self, $ev, $x, $y) = @_;
1119
1120 $self->SUPER::button_down ($ev, $x, $y);
1121
1122 my $idx = $self->{layout}->xy_to_index ($x, $y);
1123
1124 # byte-index to char-index
1125 my $text = $self->{text};
1126 utf8::encode $text;
1127 $self->{cursor} = length substr $text, 0, $idx;
1128
1129 $self->_set_text ($self->{text});
1130 $self->update;
1131}
1132
1133sub mouse_motion {
1134 my ($self, $ev, $x, $y) = @_;
1135# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1136}
1137
1138sub _draw {
1139 my ($self) = @_;
1140
1141 local $self->{fg} = $self->{fg};
1142
1143 if ($FOCUS == $self) {
1144 glColor @{$self->{active_bg}};
1145 $self->{fg} = $self->{active_fg};
1146 } else {
1147 glColor @{$self->{bg}};
1148 }
1149
1150 glEnable GL_BLEND;
1151 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1152 glBegin GL_QUADS;
1153 glVertex 0 , 0;
1154 glVertex 0 , $self->{h};
1155 glVertex $self->{w}, $self->{h};
1156 glVertex $self->{w}, 0;
1157 glEnd;
1158 glDisable GL_BLEND;
1159
1160 $self->SUPER::_draw;
1161
1162 #TODO: force update every cursor change :(
1163 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1164 glColor @{$self->{fg}};
1165 glBegin GL_LINES;
1166 glVertex $self->{cur_x}, $self->{cur_y};
1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1168 glEnd;
1169 }
1170}
1171
1172package CFClient::UI::LineEntry;
1173
1174our @ISA = CFClient::UI::Entry::;
1175
1176use SDL;
1177use SDL::OpenGL;
1178
1179sub key_down {
1180 my ($self, $ev) = @_;
1181
1182 my $sym = $ev->key_sym;
1183
1184 if ($sym == SDLK_RETURN) {
1185 $self->emit (activate => $self->get_text);
1186 $self->update;
1187
1188 } else {
1189 $self->SUPER::key_down ($ev);
1190 }
1191
1192}
1193
1194#############################################################################
1195
1196package CFClient::UI::Button;
1197
1198our @ISA = CFClient::UI::Label::;
1199
1200use SDL;
1201use SDL::OpenGL;
1202
1203my @tex =
1204 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1205 qw(b1_button_active.png);
1206
1207sub new {
1208 my $class = shift;
1209
1210 $class->SUPER::new (
1211 padding => 4,
1212 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0],
1215 can_hover => 1,
1216 @_
1217 )
1218}
1219
1220sub button_up {
1221 my ($self, $ev, $x, $y) = @_;
1222
1223 if ($x >= 0 && $x < $self->{w}
1224 && $y >= 0 && $y < $self->{h}) {
1225 $self->emit ("activate");
1226 }
1227}
1228
1229sub _draw {
1230 my ($self) = @_;
1231
1232 local $self->{fg} = $self->{fg};
1233 my $tex = $tex[0];
702 1234
703 glEnable GL_BLEND; 1235 glEnable GL_BLEND;
704 glEnable GL_TEXTURE_2D; 1236 glEnable GL_TEXTURE_2D;
705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1237 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238
1239 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg};
1241 }
1242
1243 glBindTexture GL_TEXTURE_2D, $tex->{name};
706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
707 1245
708 glColor 1, 0, 0, 1; # TODO color 1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
709 1247
1248 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND;
1250
1251 $self->SUPER::_draw;
1252}
1253
1254#############################################################################
1255
1256package CFClient::UI::CheckBox;
1257
1258our @ISA = CFClient::UI::DrawBG::;
1259
1260my @tex =
1261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1262 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263
1264use SDL;
1265use SDL::OpenGL;
1266
1267sub new {
1268 my $class = shift;
1269
1270 $class->SUPER::new (
1271 padding => 2,
1272 fg => [1, 1, 1],
1273 active_fg => [1, 1, 0],
1274 state => 0,
1275 can_hover => 1,
1276 @_
1277 )
1278}
1279
1280sub size_request {
1281 my ($self) = @_;
1282
1283 ($self->{padding} * 2 + 6) x 2
1284}
1285
1286sub size_allocate {
1287 my ($self, $x, $y, $w, $h) = @_;
1288
1289 $self->_size_allocate ($x, $y, $w, $h);
1290}
1291
1292sub button_down {
1293 my ($self, $ev, $x, $y) = @_;
1294
1295 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1297 $self->{state} = !$self->{state};
1298 $self->emit (changed => $self->{state});
1299 }
1300}
1301
1302sub _draw {
1303 my ($self) = @_;
1304
1305 $self->SUPER::_draw;
1306
1307 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1308
1309 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1310
1311 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1312
1313 glEnable GL_BLEND;
1314 glEnable GL_TEXTURE_2D;
1315 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1316
1317 my $tex = $self->{state} ? $tex[1] : $tex[0];
1318
710 $tex->draw_quad (0, 0); 1319 $tex->draw_quad (0, 0, $s, $s);
1320
1321 glDisable GL_TEXTURE_2D;
1322 glDisable GL_BLEND;
1323}
1324
1325#############################################################################
1326
1327package CFClient::UI::Slider;
1328
1329use strict;
1330
1331use SDL::OpenGL;
1332
1333our @ISA = CFClient::UI::DrawBG::;
1334
1335my @tex =
1336 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1337 qw(s1_slider.png s1_slider_bg.png);
1338
1339sub new {
1340 my $class = shift;
1341
1342 # range [value, low, high, page]
1343
1344 # TODO: 0-width page
1345 # TODO: req_w/h are wrong with vertical
1346 # TODO: calculations are off
1347 my $self = $class->SUPER::new (
1348 fg => [1, 1, 1],
1349 active_fg => [0, 0, 0],
1350 range => [0, 0, 100, 10],
1351 req_w => 40,
1352 req_h => 13,
1353 vertical => 0,
1354 can_hover => 1,
1355 inner_pad => 5,
1356 @_
1357 );
1358
1359 $self
1360}
1361
1362sub size_request {
1363 my ($self) = @_;
1364
1365 my $w = $self->{req_w};
1366 my $h = $self->{req_h};
1367
1368 $self->{vertical} ? ($h, $w) : ($w, $h)
1369}
1370
1371sub button_down {
1372 my ($self, $ev, $x, $y) = @_;
1373
1374 $self->SUPER::button_down ($ev, $x, $y);
1375 $self->mouse_motion ($ev, $x, $y);
1376}
1377
1378sub mouse_motion {
1379 my ($self, $ev, $x, $y) = @_;
1380
1381 if ($GRAB == $self) {
1382 my ($value, $lo, $hi, $page) = @{$self->{range}};
1383
1384 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1385
1386 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1387 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1388
1389 $x -= $inner_pad_px; # substract the padding
1390 $x = $x * ($hi - $lo) / $inner_w + $lo;
1391 $x = $lo if $x < $lo;
1392 $x = $hi - $page if $x > $hi - $page;
1393 $self->{range}[0] = $x;
1394
1395 $self->emit (changed => $x);
1396 $self->update;
1397 }
1398}
1399
1400# the inner_* stuff is for generating a padding for the slider handle,
1401# so that the handle doesn't leave the texture. This calculation isn't 100%
1402# correct propably, but it does the job for now
1403sub _calc_inner_pad_px {
1404 my ($self, $w) = @_;
1405 ($w / 100) * $self->{inner_pad} # % to pixels
1406}
1407
1408sub _draw {
1409 my ($self) = @_;
1410
1411 $self->SUPER::_draw ();
1412
1413 my ($w, $h) = @$self{qw(w h)};
1414
1415 if ($self->{vertical}) {
1416 # draw a vertical slider like a rotated horizontal slider
1417
1418 glRotate 90, 0, 0, 1;
1419 glTranslate 0, -$self->{w}, 0;
1420
1421 ($w, $h) = ($h, $w);
1422 }
1423
1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426
1427 my ($value, $lo, $hi, $page) = @{$self->{range}};
1428
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431
1432 $page = int $page * $inner_w / ($hi - $lo);
1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1434
1435 $w -= $page;
1436 $page &= ~1;
1437 glTranslate $page * 0.5, 0, 0;
1438 $page ||= 2;
1439
1440 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1441 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1442
1443 glEnable GL_BLEND;
1444 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1445 glEnable GL_TEXTURE_2D;
1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1447
1448 # draw background
1449 $tex[1]->draw_quad (0, 0, $w, $h);
1450
1451 # draw handle
1452 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
711 1453
712 glDisable GL_BLEND; 1454 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 1455 glDisable GL_TEXTURE_2D;
714} 1456}
715 1457
716############################################################################# 1458#############################################################################
717 1459
718package Crossfire::Client::Widget::Entry; 1460package CFClient::UI::TextView;
719 1461
720our @ISA = Crossfire::Client::Widget::Label::; 1462our @ISA = CFClient::UI::HBox::;
1463
1464use SDL::OpenGL;
1465
1466sub new {
1467 my $class = shift;
1468
1469 my $self = $class->SUPER::new (
1470 req_w => $::WIDTH / 6,
1471 req_h => $::HEIGHT / 6,
1472 fontsize => $::FONTSIZE,
1473 @_,
1474
1475 layout => (new CFClient::Layout),
1476 par => [],
1477 height => 0,
1478 children => [
1479 (new CFClient::UI::Empty expand => 1),
1480 (new CFClient::UI::Slider vertical => 1),
1481 ],
1482 );
1483
1484 $self
1485}
1486
1487sub text_height {
1488 my ($self, $text) = @_;
1489
1490 my $layout = $self->{layout};
1491
1492 $layout->set_height ($self->{fontsize});
1493 $layout->set_width ($self->{w});
1494 $layout->set_text ($text);
1495
1496 ($layout->size)[1]
1497}
1498
1499sub reflow {
1500 my ($self) = @_;
1501
1502 my $height = 0;
1503
1504 for (@{$self->{par}}) {
1505 $height += $_->[0] = $self->text_height ($_->[2]);
1506 }
1507
1508 $self->{height} = $height;
1509
1510 $self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1511}
1512
1513sub size_request {
1514 my ($self) = @_;
1515
1516 ($self->{req_w}, $self->{req_h})
1517}
1518
1519sub size_allocate {
1520 my ($self, $x, $y, $w, $h) = @_;
1521
1522 $self->SUPER::size_allocate ($x, $y, $w, $h);
1523
1524 $self->{layout}->set_height ($self->{fontsize});
1525 $self->{layout}->set_width ($self->{w});
1526
1527 $self->reflow;
1528 $self->update;
1529}
1530
1531sub add_paragraph {
1532 my ($self, $color, $text) = @_;
1533
1534 #TODO: intelligently "reformat" paragraph
1535
1536 my $height = $self->text_height ($text);
1537
1538 $self->{height} += $height;
1539
1540 push @{$self->{par}}, [$height, $color, $text];
1541
1542 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1543 $self->{children}[1]->update;
1544}
1545
1546sub update {
1547 my ($self) = @_;
1548
1549 $self->SUPER::update;
1550
1551 return unless $self->{h} > 0;
1552
1553 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1554 glClearColor 0, 0, 0, 1;
1555 glClear GL_COLOR_BUFFER_BIT;
1556
1557 my $y0 = $self->{height} - $self->{h};
1558 my $y1 = $self->{height};
1559
1560 glEnable GL_BLEND;
1561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1562 glEnable GL_TEXTURE_2D;
1563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564
1565 my $y = 0;
1566
1567 my $layout = $self->{layout};
1568
1569 for my $par (@{$self->{par}}) {
1570 my $h = $par->[0];
1571
1572 if ($y0 < $y + $h && $y < $y1) {
1573 $layout->set_text ($par->[2]);
1574
1575 glColor @{ $par->[1] };
1576 my ($W, $H) = $layout->size;
1577 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1578 }
1579
1580 $y += $h;
1581 }
1582
1583 glDisable GL_TEXTURE_2D;
1584 glDisable GL_BLEND;
1585 };
1586}
1587
1588sub _draw {
1589 my ($self) = @_;
1590
1591 if ($self->{texture}) {
1592 glEnable GL_TEXTURE_2D;
1593 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1595 glDisable GL_TEXTURE_2D;
1596 }
1597
1598}
1599
1600#############################################################################
1601
1602package CFClient::UI::MapWidget;
1603
1604use strict;
1605
1606use List::Util qw(min max);
721 1607
722use SDL; 1608use SDL;
723use SDL::OpenGL; 1609use SDL::OpenGL;
724 1610
725sub key_down { 1611our @ISA = CFClient::UI::Base::;
726 my ($self, $ev) = @_;
727 1612
728 my $mod = $ev->key_mod; 1613sub new {
729 my $sym = $ev->key_sym; 1614 my $class = shift;
730 1615
731 my $uni = $ev->key_unicode; 1616 $class->SUPER::new (
732 1617 z => -1,
733 my $text = $self->get_text; 1618 can_focus => 1,
734 1619 list => (glGenLists 1),
735 if ($sym == SDLK_BACKSPACE) { 1620 @_
736 substr $text, -1, 1, '';
737 } elsif ($uni) {
738 $text .= chr $uni;
739 } 1621 )
740
741 $self->set_text ($text);
742} 1622}
743
744sub button_down {
745 my ($self, $ev) = @_;
746
747 $self->focus_in;
748}
749
750sub mouse_motion {
751 my ($self, $ev, $x, $y) = @_;
752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
753}
754
755sub _draw {
756 my ($self) = @_;
757
758 if ($FOCUS == $self) {
759 glColor 1, 1, 1;
760 } else {
761 glColor 0.7, 0.7, 0.7;
762 }
763
764 glBegin GL_QUADS;
765 glVertex 0 , 0;
766 glVertex 0 , $self->{h} - 1;
767 glVertex $self->{w} - 1, $self->{h} - 1;
768 glVertex $self->{w} - 1, 0;
769 glEnd;
770
771 $self->SUPER::_draw;
772}
773
774#############################################################################
775
776package Crossfire::Client::Widget::MapWidget;
777
778use strict;
779
780use List::Util qw(min max);
781
782use SDL;
783use SDL::OpenGL;
784use SDL::OpenGL::Constants;
785
786our @ISA = Crossfire::Client::Widget::;
787 1623
788sub key_down { 1624sub key_down {
789 print "MAPKEYDOWN\n"; 1625 print "MAPKEYDOWN\n";
790} 1626}
791 1627
792sub key_up { 1628sub key_up {
793} 1629}
794 1630
795sub size_request { 1631sub size_request {
796 ( 1632 (
797 1 + int $::WIDTH / 32, 1633 1 + 32 * int $::WIDTH / 32,
798 1 + int $::HEIGHT / 32, 1634 1 + 32 * int $::HEIGHT / 32,
799 ) 1635 )
800} 1636}
801 1637
1638sub update {
1639 my ($self) = @_;
1640
1641 $self->{need_update} = 1;
1642 $self->SUPER::update;
1643}
1644
802sub _draw { 1645sub draw {
803 my ($self) = @_; 1646 my ($self) = @_;
804 1647
805 my $mx = $::CONN->{mapx}; 1648 $self->{need_update}++;#d#
806 my $my = $::CONN->{mapy}; 1649 if (delete $self->{need_update}) {
1650 glNewList $self->{list}, GL_COMPILE;
807 1651
808 my $map = $::CONN->{map};
809
810 my ($xofs, $yofs);
811
812 my $sw = 1 + int $::WIDTH / 32; 1652 my $sw = int $::WIDTH / 32;
813 my $sh = 1 + int $::HEIGHT / 32; 1653 my $sh = int $::HEIGHT / 32;
814 1654
815 if ($::CONN->{mapw} > $sw) { 1655 if ($::MAP) {
816 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1656 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
817 } else {
818 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
819 }
820 1657
821 if ($::CONN->{maph} > $sh) { 1658 if ($::CFG->{fow_enable}) {
822 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1659 if ($::CFG->{fow_smooth}) { # smooth fog of war
823 } else { 1660 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
824 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1661 glConvolutionFilter2D
825 } 1662 GL_CONVOLUTION_2D,
826 1663 GL_ALPHA,
827 glEnable GL_TEXTURE_2D; 1664 3, 3,
828 glEnable GL_BLEND; 1665 GL_ALPHA, GL_FLOAT,
829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1666 pack "f*",
830 1667 0.1, 0.1, 0.1,
831 my $sw4 = ($sw + 3) & ~3; 1668 0.1, 0.2, 0.1,
832 my $darkness = "\x00" x ($sw4 * $sh); 1669 0.1, 0.1, 0.1,
833 1670 ;
834 for my $x (0 .. $sw - 1) { 1671 glEnable GL_CONVOLUTION_2D;
835 my $row = $map->[$x + $xofs];
836 for my $y (0 .. $sh - 1) {
837
838 my $cell = $row->[$y + $yofs]
839 or next;
840
841 my $dark = $cell->[0];
842 if ($dark < 0) {
843 substr $darkness, $y * $sw4 + $x, 1, chr 224;
844 } else {
845 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
846 }
847
848 for my $num (grep $_, @$cell[1,2,3]) {
849 my $tex = $::CONN->{face}[$num]{texture} || next;
850 1672 }
851 my $w = $tex->{width};
852 my $h = $tex->{height};
853 1673
854 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1674 my $tex = new CFClient::Texture
1675 w => $w,
1676 h => $h,
1677 data => $data,
1678 internalformat => GL_ALPHA,
1679 format => GL_ALPHA;
1680
1681 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1682
1683 glEnable GL_BLEND;
1684 glEnable GL_TEXTURE_2D;
1685 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1686
1687 glColor +($::CFG->{fow_intensity}) x 3, 1;
1688 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1689
1690 glDisable GL_TEXTURE_2D;
1691 glDisable GL_BLEND;
855 } 1692 }
856 } 1693 }
857 }
858 1694
859# if (1) { # higher quality darkness 1695 glEndList;
860# $lighting =~ s/(.)/$1$1$1/gs;
861# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
862#
863# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
864#
865# $lighting = $pb->get_pixels;
866# $lighting =~ s/(.)../$1/gs;
867# } 1696 }
868 1697
869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1698 glCallList $self->{list};
870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
871 1699
872 $darkness = new Crossfire::Client::Texture 1700 if ($FOCUS != $self) {
873 width => $sw4, 1701 glColor 64/255, 64/255, 64/255;
874 height => $sh, 1702 glLogicOp GL_AND;
875 data => $darkness, 1703 glEnable GL_COLOR_LOGIC_OP;
876 internalformat => GL_ALPHA, 1704 glBegin GL_QUADS;
877 format => GL_ALPHA; 1705 glVertex 0, 0;
878 1706 glVertex 0, $::HEIGHT;
879 glColor 0.45, 0.45, 0.45, 1; 1707 glVertex $::WIDTH, $::HEIGHT;
880 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1708 glVertex $::WIDTH, 0;
881 1709 glEnd;
882 glDisable GL_TEXTURE_2D; 1710 glDisable GL_COLOR_LOGIC_OP;
883 glDisable GL_BLEND; 1711 }
884} 1712}
885 1713
886my %DIR = ( 1714my %DIR = (
887 SDLK_KP8, [1, "north"], 1715 SDLK_KP8, [1, "north"],
888 SDLK_KP9, [2, "northeast"], 1716 SDLK_KP9, [2, "northeast"],
… …
904 1732
905 my $mod = $ev->key_mod; 1733 my $mod = $ev->key_mod;
906 my $sym = $ev->key_sym; 1734 my $sym = $ev->key_sym;
907 1735
908 if ($sym == SDLK_KP5) { 1736 if ($sym == SDLK_KP5) {
909 $::CONN->send ("command stay fire"); 1737 $::CONN->user_send ("command stay fire");
1738 } elsif ($sym == SDLK_a) {
1739 $::CONN->user_send ("command apply");
1740 } elsif ($sym == SDLK_QUOTE) {
1741 $self->emit ('activate_console');
1742 } elsif ($sym == SDLK_SLASH) {
1743 $self->emit ('activate_console' => '/');
910 } elsif (exists $DIR{$sym}) { 1744 } elsif (exists $DIR{$sym}) {
911 if ($mod & KMOD_SHIFT) { 1745 if ($mod & KMOD_SHIFT) {
912 $self->{shft}++; 1746 $self->{shft}++;
913 $::CONN->send ("command fire $DIR{$sym}[0]"); 1747 $::CONN->user_send ("command fire $DIR{$sym}[0]");
914 } elsif ($mod & KMOD_CTRL) { 1748 } elsif ($mod & KMOD_CTRL) {
915 $self->{ctrl}++; 1749 $self->{ctrl}++;
916 $::CONN->send ("command run $DIR{$sym}[0]"); 1750 $::CONN->user_send ("command run $DIR{$sym}[0]");
917 } else { 1751 } else {
918 $::CONN->send ("command $DIR{$sym}[1]"); 1752 $::CONN->user_send ("command $DIR{$sym}[1]");
919 } 1753 }
920 } 1754 }
921} 1755}
922 1756
923sub key_up { 1757sub key_up {
… …
925 1759
926 my $mod = $ev->key_mod; 1760 my $mod = $ev->key_mod;
927 my $sym = $ev->key_sym; 1761 my $sym = $ev->key_sym;
928 1762
929 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1763 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
930 $::CONN->send ("command fire_stop"); 1764 $::CONN->user_send ("command fire_stop");
931 } 1765 }
932 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1766 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
933 $::CONN->send ("command run_stop"); 1767 $::CONN->user_send ("command run_stop");
934 } 1768 }
935} 1769}
936 1770
937############################################################################# 1771#############################################################################
938 1772
939package Crossfire::Client::Widget::Animator; 1773package CFClient::UI::Animator;
940 1774
941use SDL::OpenGL; 1775use SDL::OpenGL;
942 1776
943our @ISA = Crossfire::Client::Widget::Bin::; 1777our @ISA = CFClient::UI::Bin::;
944 1778
945sub moveto { 1779sub moveto {
946 my ($self, $x, $y) = @_; 1780 my ($self, $x, $y) = @_;
947 1781
948 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1782 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
976 glPopMatrix; 1810 glPopMatrix;
977} 1811}
978 1812
979############################################################################# 1813#############################################################################
980 1814
981package Crossfire::Client::Widget::Toplevel; 1815package CFClient::UI::Flopper;
982 1816
1817our @ISA = CFClient::UI::Button::;
1818
1819sub new {
1820 my $class = shift;
1821
1822 my $self = $class->SUPER::new (
1823 state => 0,
1824 connect_activate => \&toggle_flopper,
1825 @_
1826 );
1827
1828 if ($self->{state}) {
1829 $self->{state} = 0;
1830 $self->toggle_flopper;
1831 }
1832
1833 $self
1834}
1835
1836sub toggle_flopper {
1837 my ($self) = @_;
1838
1839 # TODO: use animation
1840 if ($self->{state} = !$self->{state}) {
1841 $CFClient::UI::TOPLEVEL->add ($self->{other});
1842 $self->{other}->move (
1843 ($::WIDTH - $self->{other}{w}) * 0.5,
1844 ($::HEIGHT - $self->{other}{h}) * 0.5,
1845 );
1846 } else {
1847 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1848 }
1849}
1850
1851#############################################################################
1852
1853package CFClient::UI::Toplevel;
1854
983our @ISA = Crossfire::Client::Widget::Container::; 1855our @ISA = CFClient::UI::Container::;
984 1856
985sub size_request { 1857sub size_request {
986 ($::WIDTH, $::HEIGHT) 1858 ($::WIDTH, $::HEIGHT)
987} 1859}
988 1860
989sub size_allocate { 1861sub size_allocate {
990 my ($self, $w, $h) = @_; 1862 my ($self, $x, $y, $w, $h) = @_;
991 1863
992 $self->SUPER::size_allocate ($w, $h); 1864 $self->_size_allocate ($x, $y, $w, $h);
993 1865
994 $_->size_allocate ($_->size_request) 1866 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
995 for @{$self->{children}}; 1867 for @{$self->{children}};
996} 1868}
997 1869
998sub translate { 1870sub translate {
999 my ($self, $x, $y) = @_; 1871 my ($self, $x, $y) = @_;
… …
1002} 1874}
1003 1875
1004sub update { 1876sub update {
1005 my ($self) = @_; 1877 my ($self) = @_;
1006 1878
1007 $self->size_allocate ($self->size_request); 1879 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1008 ::refresh (); 1880 ::refresh ();
1009} 1881}
1010 1882
1011sub add { 1883sub add {
1012 my ($self, $widget) = @_; 1884 my ($self, $widget) = @_;
1013 1885
1014 $self->SUPER::add ($widget); 1886 $self->SUPER::add ($widget);
1015 1887
1016 $widget->size_allocate ($widget->size_request); 1888 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1017} 1889}
1018 1890
1019sub draw { 1891sub draw {
1020 my ($self) = @_; 1892 my ($self) = @_;
1021 1893
1022 $self->_draw; 1894 $self->_draw;
1023} 1895}
1024 1896
1025############################################################################# 1897#############################################################################
1026 1898
1027package Crossfire::Client::Widget; 1899package CFClient::UI;
1028 1900
1029$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 1901$TOPLEVEL = new CFClient::UI::Toplevel;
1030 1902
10311 19031
1032 1904

Diff Legend

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