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.35 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.60 by root, Tue Apr 11 13:14:36 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11#our @ACTIVE_WIDGETS; 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
12 16
13# class methods for events 17# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
16sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
17sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
18 74
19sub new { 75sub new {
20 my $class = shift; 76 my $class = shift;
21 77
22 bless { @_ }, $class 78 bless { @_ }, $class
23} 79}
24
25#sub activate {
26# push @ACTIVE_WIDGETS, $_[0];
27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
29
30#sub deactivate {
31# @ACTIVE_WIDGETS =
32# sort { $a->{z} <=> $b->{z} }
33# grep { $_ && $_ != $_[0] }
34# @ACTIVE_WIDGETS;
35#}
36 80
37sub move { 81sub move {
38 my ($self, $x, $y, $z) = @_; 82 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 83 $self->{x} = $x;
40 $self->{y} = $y; 84 $self->{y} = $y;
… …
44sub needs_redraw { 88sub needs_redraw {
45 0 89 0
46} 90}
47 91
48sub size_request { 92sub size_request {
93 require Carp;
49 die "size_request is abtract"; 94 Carp::confess "size_request is abtract";
95}
96
97sub size_allocate {
98 my ($self, $w, $h) = @_;
99
100 $self->{w} = $w;
101 $self->{h} = $h;
102}
103
104# translate global koordinates to local coordinate system
105sub translate {
106 my ($self, $x, $y) = @_;
107
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
50} 109}
51 110
52sub focus_in { 111sub focus_in {
53 my ($widget) = @_; 112 my ($self) = @_;
54 $FOCUS = $widget; 113
114 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus;
116 $FOCUS->update;
55} 117}
56 118
57sub focus_out { 119sub focus_out {
58 my ($widget) = @_; 120 my ($self) = @_;
59}
60 121
61sub key_down { 122 return unless $FOCUS == $self;
62 my ($widget, $sdlev) = @_;
63}
64 123
65sub key_up { 124 my $focus = $FOCUS; undef $FOCUS;
66 my ($widget, $sdlev) = @_; 125 $focus->update if $focus; #?
67} 126}
68 127
128sub mouse_motion { }
129sub button_up { }
69sub button_down { 130sub button_down { }
70 my ($widget, $sdlev) = @_; 131sub key_down { }
71} 132sub key_up { }
72 133
73sub button_up { 134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
74 my ($widget, $sdlev) = @_; 135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
75}
76
77sub w { $_[0]->{w} }
78sub h { $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82 139
83sub draw { 140sub draw {
84 my ($self) = @_; 141 my ($self) = @_;
85 142
86 glPushMatrix; 143 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 144 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 145 $self->_draw;
146 if ($self == $HOVER) {
147 glColor 1, 1, 1, 0.4;
148 glEnable GL_BLEND;
149 glBegin GL_QUADS;
150 glVertex 0 , 0;
151 glVertex $self->{w}, 0;
152 glVertex $self->{w}, $self->{h};
153 glVertex 0 , $self->{h};
154 glEnd;
155 glDisable GL_BLEND;
156 }
89 glPopMatrix; 157 glPopMatrix;
90} 158}
91 159
92sub _draw { 160sub _draw {
93 my ($widget) = @_; 161 my ($self) = @_;
162
163 warn "no draw defined for $self\n";
94} 164}
95 165
96sub bbox { 166sub bbox {
97 my ($self) = @_; 167 my ($self) = @_;
98 my ($w, $h) = $self->size_request; 168 my ($w, $h) = $self->size_request;
… …
102 $self->{x} = $w, 172 $self->{x} = $w,
103 $self->{y} = $h 173 $self->{y} = $h
104 ) 174 )
105} 175}
106 176
177sub find_widget {
178 my ($self, $x, $y) = @_;
179
180 return $self
181 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
182 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
183
184 ()
185}
186
107sub del_parent { $_[0]->{parent} = undef } 187sub del_parent { $_[0]->{parent} = undef }
108 188
109sub set_parent { 189sub set_parent {
110 my ($self, $par) = @_; 190 my ($self, $par) = @_;
111 191
… …
128 my ($self) = @_; 208 my ($self) = @_;
129 209
130 #$self->deactivate; 210 #$self->deactivate;
131} 211}
132 212
133package Crossfire::Client::Widget::Bin; 213#############################################################################
134 214
215package CFClient::Widget::Container;
216
135our @ISA = Crossfire::Client::Widget::; 217our @ISA = CFClient::Widget::;
136 218
137sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update } 219sub new {
220 my ($class, @widgets) = @_;
138 221
139sub get { $_[0]->{child} } 222 my $self = $class->SUPER::new (children => []);
223 $self->add ($_) for @widgets;
224
225 $self
226}
227
228sub add {
229 my ($self, $chld, $expand) = @_;
230
231 $chld->{expand} = $expand;
232 $chld->set_parent ($self);
233
234 @{$self->{children}} =
235 sort { $a->{z} <=> $b->{z} }
236 @{$self->{children}}, $chld;
237
238 $self->size_allocate ($self->{w}, $self->{h})
239 if $self->{w}; #TODO: check for "realised state"
240}
140 241
141sub remove { 242sub remove {
142 my ($self, $chld) = @_; 243 my ($self, $widget) = @_;
143 delete $self->{child} 244
144 if $self->{child} == $chld; 245 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
246
247 $self->size_allocate ($self->{w}, $self->{h});
145} 248}
249
250sub find_widget {
251 my ($self, $x, $y) = @_;
252
253 $x -= $self->{x};
254 $y -= $self->{y};
255
256 my $res;
257
258 for (reverse @{ $self->{children} }) {
259 $res = $_->find_widget ($x, $y)
260 and return $res;
261 }
262
263 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
264}
265
266sub _draw {
267 my ($self) = @_;
268
269 $_->draw for @{$self->{children}};
270}
271
272#############################################################################
273
274package CFClient::Widget::Bin;
275
276our @ISA = CFClient::Widget::Container::;
277
278sub child { $_[0]->{children}[0] }
146 279
147sub size_request { 280sub size_request {
148 $_[0]->{child}->size_request if $_[0]->{child} 281 $_[0]{children}[0]->size_request if $_[0]{children}[0];
282}
283
284sub size_allocate {
285 my ($self, $w, $h) = @_;
286
287 $self->SUPER::size_allocate ($w, $h);
288 $self->{children}[0]->size_allocate ($w, $h)
289 if $self->{children}[0]
290}
291
292#############################################################################
293
294package CFClient::Widget::Window;
295
296our @ISA = CFClient::Widget::Bin::;
297
298use SDL::OpenGL;
299
300sub new {
301 my ($class, $x, $y, $z, $w, $h) = @_;
302
303 my $self = $class->SUPER::new;
304
305 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
306}
307
308sub update {
309 my ($self) = @_;
310
311 $self->render_chld;
312 $self->SUPER::update;
313}
314
315sub render_chld {
316 my ($self) = @_;
317
318 $self->{texture} =
319 CFClient::Texture->new_from_opengl (
320 $self->{w}, $self->{h}, sub { $self->child->draw }
321 );
322}
323
324sub size_allocate {
325 my ($self, $w, $h) = @_;
326
327 $self->{w} = $w;
328 $self->{h} = $h;
329
330 $self->child->size_allocate ($w, $h);
331
332 $self->render_chld;
149} 333}
150 334
151sub _draw { 335sub _draw {
152 my ($self) = @_; 336 my ($self) = @_;
153 337
154 $self->{child}->draw; 338 my ($w, $h) = ($self->w, $self->h);
155}
156
157package Crossfire::Client::Widget::Toplevel;
158
159our @ISA = Crossfire::Client::Widget::;
160
161use SDL::OpenGL;
162
163sub add {
164 my ($self, $chld) = @_;
165
166 push @{$self->{childs}}, $chld;
167 @{$self->{childs}} =
168 sort { $a->{z} <=> $b->{z} }
169 @{$self->{childs}};
170
171 $chld->set_parent ($self);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180}
181
182sub update {
183 my ($self) = @_;
184 ::refresh ();
185}
186
187sub _draw {
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
195our @ISA = Crossfire::Client::Widget::Bin::;
196
197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 $self->SUPER::add ($chld);
202 $chld->set_parent ($self);
203 $self->update; #TODO: Move this to the size_request event propably?
204}
205
206sub remove {
207 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld
209 $self->update;
210}
211
212sub update {
213 my ($self) = @_;
214 $self->render_chld;
215}
216
217sub render_chld {
218 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221
222 $self->{texture} =
223 Crossfire::Client::Texture->new_from_opengl (
224 $w, $h, sub { $chld->draw }
225 );
226 $self->{texture}->upload;
227}
228
229sub size_request {
230 my ($self) = @_;
231 my $chld = $self->get
232 or return (0, 0);
233 $chld->size_request
234}
235
236sub _draw {
237 my ($self) = @_;
238
239 my ($w, $h) = $self->size_request;#TODO# use width/height of texture
240 339
241 my $tex = $self->{texture} 340 my $tex = $self->{texture}
242 or return; 341 or return;
243 342
244 glEnable GL_BLEND; 343 glEnable GL_BLEND;
245 glEnable GL_TEXTURE_2D; 344 glEnable GL_TEXTURE_2D;
246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
247 glBindTexture GL_TEXTURE_2D, $tex->{name};
248 346
249 glBegin GL_QUADS; 347 $tex->draw_quad (0, 0, $w, $h);
250 glTexCoord 0, 0; glVertex 0, 0;
251 glTexCoord 0, 1; glVertex 0, $h;
252 glTexCoord 1, 1; glVertex $w, $h;
253 glTexCoord 1, 0; glVertex $w, 0;
254 glEnd;
255 348
256 glDisable GL_BLEND; 349 glDisable GL_BLEND;
257 glDisable GL_TEXTURE_2D; 350 glDisable GL_TEXTURE_2D;
258} 351}
259 352
353#############################################################################
354
260package Crossfire::Client::Widget::Frame; 355package CFClient::Widget::Frame;
261 356
262our @ISA = Crossfire::Client::Widget::Bin::; 357our @ISA = CFClient::Widget::Bin::;
263 358
264use SDL::OpenGL; 359use SDL::OpenGL;
265 360
266sub size_request { 361sub size_request {
267 my ($self) = @_; 362 my ($self) = @_;
268 my $chld = $self->get 363 my $chld = $self->child
269 or return (0, 0); 364 or return (0, 0);
270 365
271 $chld->move (2, 2); 366 $chld->move (2, 2);
272 367
273 map { $_ + 4 } $chld->size_request; 368 map { $_ + 4 } $chld->size_request;
274} 369}
275 370
371sub size_allocate {
372 my ($self, $w, $h) = @_;
373
374 $self->{w} = $w;
375 $self->{h} = $h;
376
377 $self->child->size_allocate ($w - 4, $h - 4);
378 $self->child->move (2, 2);
379}
380
276sub _draw { 381sub _draw {
277 my ($self) = @_; 382 my ($self) = @_;
278 383
279 my $chld = $self->get; 384 my $chld = $self->child;
280 385
281 my ($w, $h) = $chld->size_request; 386 my ($w, $h) = $chld->size_request;
282 387
283 glBegin GL_QUADS; 388 glBegin GL_QUADS;
284 glColor 0, 0, 0; 389 glColor 0, 0, 0;
285 glTexCoord 0, 0; glVertex 0 , 0; 390 glVertex 0 , 0;
286 glTexCoord 0, 1; glVertex 0 , $h + 4; 391 glVertex 0 , $h + 4;
287 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 392 glVertex $w + 4 , $h + 4;
288 glTexCoord 1, 0; glVertex $w + 4 , 0; 393 glVertex $w + 4 , 0;
289 glEnd; 394 glEnd;
290 395
291 $chld->draw; 396 $chld->draw;
292} 397}
293 398
399#############################################################################
400
294package Crossfire::Client::Widget::FancyFrame; 401package CFClient::Widget::FancyFrame;
295 402
296our @ISA = Crossfire::Client::Widget::Frame::; 403our @ISA = CFClient::Widget::Bin::;
297 404
298use SDL::OpenGL; 405use SDL::OpenGL;
299 406
407my @tex =
408 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);
410
411sub size_request {
412 my ($self) = @_;
413
414 my ($w, $h) = $self->SUPER::size_request;
415
416 $h += $tex[1]->{height};
417 $h += $tex[4]->{height};
418 $w += $tex[2]->{width};
419 $w += $tex[3]->{width};
420
421 ($w, $h)
422}
423
424sub size_allocate {
425 my ($self, $w, $h) = @_;
426
427 $self->SUPER::size_allocate ($w, $h);
428
429 $h -= $tex[1]->{height};
430 $h -= $tex[4]->{height};
431 $w -= $tex[2]->{width};
432 $w -= $tex[3]->{width};
433
434 $h = $h < 0 ? 0 : $h;
435 $w = $w < 0 ? 0 : $w;
436
437 $self->child->size_allocate ($w, $h);
438 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
439}
440
441sub _draw {
442 my ($self) = @_;
443
444 my ($w, $h) = ($self->{w}, $self->{h});
445 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
446
447 glEnable GL_BLEND;
448 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;
451
452 my $top = $tex[1];
453 $top->draw_quad (0, 0, $w, $top->{height});
454
455 my $left = $tex[3];
456 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
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
464 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
470 my $rep_x = $cw / $bg->{width};
471 my $rep_y = $ch / $bg->{height};
472
473 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
474
475 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D;
477
478 $self->child->draw;
479
480}
481
482#############################################################################
483
484package CFClient::Widget::Table;
485
486our @ISA = CFClient::Widget::Bin::;
487
488use SDL::OpenGL;
489
490sub add {
491 my ($self, $x, $y, $chld) = @_;
492 my $old_chld = $self->{children}[$y][$x];
493
494 $self->{children}[$y][$x] = $chld;
495 $chld->set_parent ($self);
496 $self->update;
497}
498
499sub max_row_height {
500 my ($self, $row) = @_;
501
502 my $hs = 0;
503 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
504 my $c = $self->{children}->[$row]->[$xi];
505 if ($c) {
506 my ($w, $h) = $c->size_request;
507 if ($hs < $h) { $hs = $h }
508 }
509 }
510 return $hs;
511}
512
513sub max_col_width {
514 my ($self, $col) = @_;
515
516 my $ws = 0;
517 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
518 my $c = ($self->{children}->[$yi] || [])->[$col];
519 if ($c) {
520 my ($w, $h) = $c->size_request;
521 if ($ws < $w) { $ws = $w }
522 }
523 }
524 return $ws;
525}
526
527sub size_request {
528 my ($self) = @_;
529
530 my ($hs, $ws) = (0, 0);
531
532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
533 $hs += $self->max_row_height ($yi);
534 }
535
536 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
537 my $wm = 0;
538 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
539 $wm += $self->max_col_width ($xi)
540 }
541 if ($ws < $wm) { $ws = $wm }
542 }
543
544 return ($ws, $hs);
545}
546
547sub _draw {
548 my ($self) = @_;
549
550 my $y = 0;
551 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
552 my $x = 0;
553
554 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
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 }
567}
568
569#############################################################################
570
571package CFClient::Widget::VBox;
572
573our @ISA = CFClient::Widget::Container::;
574
575use SDL::OpenGL;
576
577sub size_request {
578 my ($self) = @_;
579
580 my @alloc = map [$_->size_request], @{$self->{children}};
581
582 (
583 (List::Util::max map $_->[0], @alloc),
584 (List::Util::sum map $_->[1], @alloc),
585 )
586}
587
588sub size_allocate {
589 my ($self, $w, $h) = @_;
590
591 $self->w ($w);
592 $self->h ($h);
593
594 my $exp;
595 my @oth;
596 # find expand widget
597 for (@{$self->{children}}) {
598 if ($_->{expand}) {
599 $exp = $_;
600 last;
601 }
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 }
613
614 my $y = 0;
615 for (@{$self->{children}}) {
616 $_->move (0, $y);
617
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);
624 $y += $h;
625 }
626 }
627}
628
629#############################################################################
630
631package CFClient::Widget::Label;
632
633our @ISA = CFClient::Widget::;
634
635use SDL::OpenGL;
636
300sub new { 637sub new {
301 my ($self, $theme) = @_; 638 my ($class, $x, $y, $z, $height, $text) = @_;
639
640 $height ||= $::FONTSIZE;
641
642 # TODO: color, and make height, xyz etc. optional
302 $self = $self->SUPER::new; 643 my $self = $class->SUPER::new (
303 644 x => $x,
304 $self->{txts} = [ 645 y => $y,
305 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 646 z => $z,
306 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 647 height => $height,
648 layout => new CFClient::Layout,
307 ]; 649 );
650
651 $self->set_text ($text);
652
308 $self 653 $self
654}
309 655
656sub set_text {
657 my ($self, $text) = @_;
658
659 $self->{text} = $text;
660 $self->{layout}->set_markup ($text);
661
662 delete $self->{texture};
663}
664
665sub get_text {
666 my ($self, $text) = @_;
667
668 $self->{text}
310} 669}
311 670
312sub size_request { 671sub size_request {
313 my ($self) = @_; 672 my ($self) = @_;
314 my ($w, $h) = $self->get->size_request;
315 673
316 $h += $self->{txts}->[1]->{height}; 674 $self->{layout}->set_width;
317 $h += $self->{txts}->[4]->{height}; 675 $self->{layout}->size
318 $w += $self->{txts}->[2]->{width}; 676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
319 $w += $self->{txts}->[3]->{width}; 677# (
320 678# $self->{texture}{width},
321 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 679# $self->{texture}{height},
322 680# )
681# } else {
682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
683#
323 ($w, $h) 684# ($w, $h)
685# }
686}
687
688sub size_allocate {
689 my ($self, $w, $h) = @_;
690
691 $self->SUPER::size_allocate ($w, $h);
692 delete $self->{texture};
324} 693}
325 694
326sub _draw { 695sub _draw {
327 my ($self) = @_; 696 my ($self) = @_;
328 697
329 my ($w, $h) = $self->size_request; 698 my $tex = $self->{texture} ||= do {
330 my ($cw, $ch) = $self->get->size_request; 699 $self->{layout}->set_width ($self->{w});
700 new_from_layout CFClient::Texture $self->{layout};
701 };
331 702
332 glEnable GL_BLEND; 703 glEnable GL_BLEND;
333 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
334 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
336 707
708 glColor 1, 0, 0, 1; # TODO color
337 709
338 my $top = $self->{txts}->[1]; 710 $tex->draw_quad (0, 0);
339 glBindTexture GL_TEXTURE_2D, $top->{name};
340
341 glColor 1, 1, 1, 0.8;
342
343 glBegin GL_QUADS;
344 glTexCoord 0, 0; glVertex 0 , 0;
345 glTexCoord 0, 1; glVertex 0 , $top->{height};
346 glTexCoord 1, 1; glVertex $w , $top->{height};
347 glTexCoord 1, 0; glVertex $w , 0;
348 glEnd;
349
350 my $left = $self->{txts}->[3];
351 glBindTexture GL_TEXTURE_2D, $left->{name};
352
353 glColor 1, 1, 1, 0.8;
354
355 glBegin GL_QUADS;
356 glTexCoord 0, 0; glVertex 0 , $top->{height};
357 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
358 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
359 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
360 glEnd;
361
362 my $right = $self->{txts}->[2];
363 glBindTexture GL_TEXTURE_2D, $right->{name};
364
365 glColor 1, 1, 1, 0.8;
366
367 glBegin GL_QUADS;
368 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
369 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
370 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
371 glTexCoord 1, 0; glVertex $w , $top->{height};
372 glEnd;
373
374 my $bottom = $self->{txts}->[4];
375 glBindTexture GL_TEXTURE_2D, $bottom->{name};
376
377 glColor 1, 1, 1, 0.8;
378
379 glBegin GL_QUADS;
380 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
381 glTexCoord 0, 1; glVertex 0 , $h;
382 glTexCoord 1, 1; glVertex $w , $h;
383 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
384 glEnd;
385
386 my $bg = $self->{txts}->[0];
387 glBindTexture GL_TEXTURE_2D, $bg->{name};
388 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
389 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
390
391 glColor 1, 1, 1, 0.8;
392
393 my $rep_x = $cw / $bg->{width};
394 my $rep_y = $ch / $bg->{height};
395
396 glBegin GL_QUADS;
397 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
398 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
399 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
400 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
401 glEnd;
402
403 $self->get->draw;
404 711
405 glDisable GL_BLEND; 712 glDisable GL_BLEND;
406 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
407} 714}
408 715
409package Crossfire::Client::Widget::Table; 716#############################################################################
410 717
411our @ISA = Crossfire::Client::Widget::Bin::;
412
413use SDL::OpenGL;
414
415sub add {
416 my ($self, $x, $y, $chld) = @_;
417 my $old_chld = $self->{childs}[$y][$x];
418
419 $self->{childs}[$y][$x] = $chld;
420 $chld->set_parent ($self);
421 $self->update;
422}
423
424sub max_row_height {
425 my ($self, $row) = @_;
426
427 my $hs = 0;
428 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) {
429 my $c = $self->{childs}->[$row]->[$xi];
430 if ($c) {
431 my ($w, $h) = $c->size_request;
432 if ($hs < $h) { $hs = $h }
433 }
434 }
435 return $hs;
436}
437
438sub max_col_width {
439 my ($self, $col) = @_;
440
441 my $ws = 0;
442 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) {
443 my $c = ($self->{childs}->[$yi] || [])->[$col];
444 if ($c) {
445 my ($w, $h) = $c->size_request;
446 if ($ws < $w) { $ws = $w }
447 }
448 }
449 return $ws;
450}
451
452sub size_request {
453 my ($self) = @_;
454
455 my ($hs, $ws) = (0, 0);
456
457 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
458 $hs += $self->max_row_height ($yi);
459 }
460
461 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
462 my $wm = 0;
463 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
464 $wm += $self->max_col_width ($xi)
465 }
466 if ($ws < $wm) { $ws = $wm }
467 }
468
469 return ($ws, $hs);
470}
471
472sub _draw {
473 my ($self) = @_;
474
475 my $y = 0;
476 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
477 my $x = 0;
478
479 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
480
481 my $c = $self->{childs}->[$yi]->[$xi];
482 if ($c) {
483 $c->move ($x, $y, 0); #TODO: Move to size_request
484 $c->draw if $c;
485 }
486
487 $x += $self->max_col_width ($xi);
488 }
489
490 $y += $self->max_row_height ($yi);
491 }
492}
493
494package Crossfire::Client::Widget::VBox;
495
496our @ISA = Crossfire::Client::Widget::Bin::;
497
498use SDL::OpenGL;
499
500sub add {
501 my ($self, $chld) = @_;
502 push @{$self->{childs}}, $chld;
503 $chld->set_parent ($self);
504 $self->update;
505}
506
507sub size_request {
508 my ($self) = @_;
509
510 my ($hs, $ws) = (0, 0);
511 for (@{$self->{childs} || []}) {
512 my ($w, $h) = $_->size_request;
513 $hs += $h;
514 if ($ws < $w) { $ws = $w }
515 }
516
517 return ($ws, $hs);
518}
519
520sub _draw {
521 my ($self) = @_;
522
523 my ($x, $y);
524 for (@{$self->{childs} || []}) {
525 $_->move (0, $y, 0); #TODO: move to size_request
526 $_->draw;
527 my ($w, $h) = $_->size_request;
528 $y += $h;
529 }
530}
531
532package Crossfire::Client::Widget::Label;
533
534our @ISA = Crossfire::Client::Widget::;
535
536use SDL::OpenGL;
537
538sub new {
539 my ($class, $x, $y, $z, $height, $text) = @_;
540
541 # TODO: color, and make height, xyz etc. optional
542 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
543
544 $self->set_text ($text);
545
546 $self
547}
548
549sub set_text {
550 my ($self, $text) = @_;
551
552 $self->{text} = $text;
553 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
554
555 $self->update;
556}
557
558sub get_text {
559 my ($self, $text) = @_;
560
561 $self->{text}
562}
563
564sub size_request {
565 my ($self) = @_;
566
567 (
568 $self->{texture}{width},
569 $self->{texture}{height},
570 )
571}
572
573sub _draw {
574 my ($self) = @_;
575
576 my $tex = $self->{texture};
577
578 glEnable GL_BLEND;
579 glEnable GL_TEXTURE_2D;
580 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
582 glBindTexture GL_TEXTURE_2D, $tex->{name};
583
584 glColor 1, 1, 1, 0.6; # TODO color
585
586 glBegin GL_QUADS;
587 glTexCoord 0, 0; glVertex 0 , 0;
588 glTexCoord 0, 1; glVertex 0 , $tex->{height};
589 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
590 glTexCoord 1, 0; glVertex $tex->{width}, 0;
591 glEnd;
592
593 glDisable GL_BLEND;
594 glDisable GL_TEXTURE_2D;
595}
596
597package Crossfire::Client::Widget::TextEntry; 718package CFClient::Widget::Entry;
598 719
599our @ISA = Crossfire::Client::Widget::Label::; 720our @ISA = CFClient::Widget::Label::;
600 721
601use SDL; 722use SDL;
602use SDL::OpenGL; 723use SDL::OpenGL;
603 724
604sub key_down { 725sub key_down {
605 my ($self, $ev) = @_; 726 my ($self, $ev) = @_;
606 727
607 my $mod = $ev->key_mod; 728 my $mod = $ev->key_mod;
608 my $sym = $ev->key_sym; 729 my $sym = $ev->key_sym;
609 730
610 $ev->set_unicode (1);
611 my $uni = $ev->key_unicode; 731 my $uni = $ev->key_unicode;
612 732
613 my $text = $self->get_text; 733 my $text = $self->get_text;
614 734
615 if ($sym == SDLK_BACKSPACE) { 735 if ($sym == SDLK_BACKSPACE) {
616 substr $text, -1, 1, ''; 736 substr $text, -1, 1, '';
617
618 } elsif ($uni) { 737 } elsif ($uni) {
619 $text .= chr $uni; 738 $text .= chr $uni;
620 } 739 }
740
621 $self->set_text ($text); 741 $self->set_text ($text);
622} 742}
623 743
744sub button_down {
745 my ($self, $ev) = @_;
624 746
625# XXX: TextView isn't neccessary with pango multiline text rendering 747 $self->focus_in;
626package Crossfire::Client::Widget::TextView; 748}
627 749
628use strict; 750sub mouse_motion {
629
630our @ISA = qw/Crossfire::Client::Widget/;
631
632use SDL::OpenGL;
633use SDL::OpenGL::Constants;
634
635sub new {
636 my ($class, $text, $h) = @_; 751 my ($self, $ev, $x, $y) = @_;
637 my $self = $class->SUPER::new (); 752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
638
639 $self->{txt_height} = $h;
640 @{$self->{lines}} = split /\r?\n/, $text;
641
642 for (split /\r?\n/, $text) {
643 $self->add_line ($_);
644 }
645 $self
646} 753}
647 754
648#sub render_lines { 755sub _draw {
649# my ($self) = @_; 756 my ($self) = @_;
650# 757
651# $self->{txt_lines} = []; 758 if ($FOCUS == $self) {
652# 759 glColor 1, 1, 1;
653# for (@{$self->{lines}}) { 760 } else {
654# push @{$self->{txt_lines}}, 761 glColor 0.7, 0.7, 0.7;
655# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
656# } 762 }
657#}
658
659sub add_line {
660 my ($self, $line) = @_;
661 push @{$self->{lines}}, $line;
662
663 push @{$self->{txt_lines}},
664 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
665}
666
667sub size_request {
668 my ($self) = @_;
669
670 my $w = 0;
671 my $h = 0;
672
673 for (@{$self->{txt_lines}}) {
674 if ($w < $_->{width}) { $w = $_->{width} }
675 $h += $_->{height};
676 }
677
678 return ($w, $h);
679}
680
681sub draw_line {
682 my ($self, $tex, $y) = @_;
683
684 glBindTexture GL_TEXTURE_2D, $tex->{name};
685
686 glColor 1, 0, 1;
687 763
688 glBegin GL_QUADS; 764 glBegin GL_QUADS;
689 glTexCoord 0, 0; glVertex 0 , $y; 765 glVertex 0 , 0;
690 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height}; 766 glVertex 0 , $self->{h} - 1;
691 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height}; 767 glVertex $self->{w} - 1, $self->{h} - 1;
692 glTexCoord 1, 0; glVertex $tex->{width}, $y; 768 glVertex $self->{w} - 1, 0;
693 glEnd; 769 glEnd;
694}
695 770
696sub _draw { 771 $self->SUPER::_draw;
697 my ($self) = @_;
698
699 glEnable GL_BLEND;
700 glEnable GL_TEXTURE_2D;
701 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
702
703 my $l = 0;
704 for (@{$self->{txt_lines}}) {
705 $self->draw_line ($_, $l);
706 $l += $_->{height};
707 }
708
709 glDisable GL_BLEND;
710 glDisable GL_TEXTURE_2D;
711} 772}
712 773
774#############################################################################
775
713package Crossfire::Client::Widget::MapWidget; 776package CFClient::Widget::MapWidget;
714 777
715use strict; 778use strict;
716 779
717use List::Util qw(min max); 780use List::Util qw(min max);
718 781
719use SDL; 782use SDL;
720use SDL::OpenGL; 783use SDL::OpenGL;
721use SDL::OpenGL::Constants; 784use SDL::OpenGL::Constants;
722 785
723our @ISA = Crossfire::Client::Widget::; 786our @ISA = CFClient::Widget::;
724 787
725sub key_down { 788sub key_down {
726 print "MAPKEYDOWN\n"; 789 print "MAPKEYDOWN\n";
727} 790}
728 791
729sub key_up { 792sub key_up {
793}
794
795sub size_request {
796 (
797 1 + int $::WIDTH / 32,
798 1 + int $::HEIGHT / 32,
799 )
730} 800}
731 801
732sub _draw { 802sub _draw {
733 my ($self) = @_; 803 my ($self) = @_;
734 804
… …
757 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
758 glEnable GL_BLEND; 828 glEnable GL_BLEND;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 830
761 my $sw4 = ($sw + 3) & ~3; 831 my $sw4 = ($sw + 3) & ~3;
762 my $lighting = "\x00" x ($sw4 * $sh); 832 my $darkness = "\x00" x ($sw4 * $sh);
763 833
764 for my $x (0 .. $sw - 1) { 834 for my $x (0 .. $sw - 1) {
835 my $row = $map->[$x + $xofs];
765 for my $y (0 .. $sh - 1) { 836 for my $y (0 .. $sh - 1) {
766 837
767 my $cell = $map->[$x + $xofs][$y + $yofs] 838 my $cell = $row->[$y + $yofs]
768 or next; 839 or next;
769 840
770 my $darkness = $cell->[0] * (1 / 255); 841 my $dark = $cell->[0];
771 if ($darkness < 0) { 842 if ($dark < 0) {
772 $darkness = 0.15; 843 substr $darkness, $y * $sw4 + $x, 1, chr 224;
844 } else {
845 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
773 } 846 }
774 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
775 847
776 for my $num (grep $_, @$cell[1,2,3]) { 848 for my $num (grep $_, @$cell[1,2,3]) {
777 my $tex = $::CONN->{face}[$num]{texture} || next; 849 my $tex = $::CONN->{face}[$num]{texture} || next;
778 850
779 glBindTexture GL_TEXTURE_2D, $tex->{name};
780
781 my $w = $tex->{width}; 851 my $w = $tex->{width};
782 my $h = $tex->{height}; 852 my $h = $tex->{height};
783 853
784 my $px = ($x + 1) * 32 - $w; 854 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
785 my $py = ($y + 1) * 32 - $h;
786
787 glBegin GL_QUADS;
788 glTexCoord 0, 0; glVertex $px , $py;
789 glTexCoord 0, 1; glVertex $px , $py + $h;
790 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
791 glTexCoord 1, 0; glVertex $px + $w, $py;
792 glEnd;
793 } 855 }
794 } 856 }
795 } 857 }
796 858
797# if (1) { # higher quality darkness 859# if (1) { # higher quality darkness
… …
802# 864#
803# $lighting = $pb->get_pixels; 865# $lighting = $pb->get_pixels;
804# $lighting =~ s/(.)../$1/gs; 866# $lighting =~ s/(.)../$1/gs;
805# } 867# }
806 868
807 $lighting = new Crossfire::Client::Texture 869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
871
872 $darkness = new CFClient::Texture
808 width => $sw4, 873 width => $sw4,
809 height => $sh, 874 height => $sh,
810 data => $lighting, 875 data => $darkness,
811 internalformat => GL_ALPHA4, 876 internalformat => GL_ALPHA,
812 format => GL_ALPHA; 877 format => GL_ALPHA;
813 878
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 879 glColor 0.45, 0.45, 0.45, 1;
815 glColor 0, 0, 0, 0.75; 880 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
817 glBindTexture GL_TEXTURE_2D, $lighting->{name};
818 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
819 glBegin GL_QUADS;
820 glTexCoord 0, 0; glVertex 0 , 0;
821 glTexCoord 0, 1; glVertex 0 , $sh * 32;
822 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
823 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
824 glEnd;
825 881
826 glDisable GL_TEXTURE_2D; 882 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND; 883 glDisable GL_BLEND;
828} 884}
829 885
… …
876 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 932 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
877 $::CONN->send ("command run_stop"); 933 $::CONN->send ("command run_stop");
878 } 934 }
879} 935}
880 936
937#############################################################################
938
881package Crossfire::Client::Widget::Animator; 939package CFClient::Widget::Animator;
882 940
883use SDL::OpenGL; 941use SDL::OpenGL;
884 942
885our @ISA = Crossfire::Client::Widget::Bin::; 943our @ISA = CFClient::Widget::Bin::;
886 944
887sub moveto { 945sub moveto {
888 my ($self, $x, $y) = @_; 946 my ($self, $x, $y) = @_;
889 947
890 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 948 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
891 $self->{speed} = 0.01; 949 $self->{speed} = 0.001;
892 $self->{time} = 1; 950 $self->{time} = 1;
893 951
894 ::animation_start $self; 952 ::animation_start $self;
895} 953}
896 954
… …
911 969
912sub _draw { 970sub _draw {
913 my ($self) = @_; 971 my ($self) = @_;
914 972
915 glPushMatrix; 973 glPushMatrix;
916 glRotate $self->{time} * 10000, 0, 1, 0; 974 glRotate $self->{time} * 1000, 0, 1, 0;
917 $self->{child}->draw; 975 $self->{children}[0]->draw;
918 glPopMatrix; 976 glPopMatrix;
919} 977}
920 978
9211; 979#############################################################################
922 980
981package CFClient::Widget::Toplevel;
982
983our @ISA = CFClient::Widget::Container::;
984
985sub size_request {
986 ($::WIDTH, $::HEIGHT)
987}
988
989sub size_allocate {
990 my ($self, $w, $h) = @_;
991
992 $self->SUPER::size_allocate ($w, $h);
993
994 $_->size_allocate ($_->size_request)
995 for @{$self->{children}};
996}
997
998sub translate {
999 my ($self, $x, $y) = @_;
1000
1001 ($x, $y)
1002}
1003
1004sub update {
1005 my ($self) = @_;
1006
1007 $self->size_allocate ($self->size_request);
1008 ::refresh ();
1009}
1010
1011sub add {
1012 my ($self, $widget) = @_;
1013
1014 $self->SUPER::add ($widget);
1015
1016 $widget->size_allocate ($widget->size_request);
1017}
1018
1019sub draw {
1020 my ($self) = @_;
1021
1022 $self->_draw;
1023}
1024
1025#############################################################################
1026
1027package CFClient::Widget;
1028
1029$TOPLEVEL = new CFClient::Widget::Toplevel;
1030
10311
1032

Diff Legend

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