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

Diff Legend

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