isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Remove unused deprecated/clutter-keysyms.h

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/921
This commit is contained in:
Adam Jackson 2019-11-05 11:36:56 -05:00 committed by Georges Basile Stavracas Neto
parent d3afe4308a
commit c039764d52
4 changed files with 0 additions and 2350 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/clutter/clutter-deprecated.h
View File

@ -11,7 +11,6 @@
#include "deprecated/clutter-box.h" #include "deprecated/clutter-box.h"
#include "deprecated/clutter-container.h" #include "deprecated/clutter-container.h"
#include "deprecated/clutter-group.h" #include "deprecated/clutter-group.h"
#include "deprecated/clutter-keysyms.h"
#include "deprecated/clutter-rectangle.h" #include "deprecated/clutter-rectangle.h"
#include "deprecated/clutter-stage-manager.h" #include "deprecated/clutter-stage-manager.h"
#include "deprecated/clutter-stage.h" #include "deprecated/clutter-stage.h"

37
clutter/clutter/clutter-keysyms-update.pl
View File

@ -58,10 +58,6 @@ die "Could not open file keysymdef.h: $!\n"
die "Could not open file clutter-keysyms.h: $!\n" die "Could not open file clutter-keysyms.h: $!\n"
unless open(OUT_KEYSYMS, ">:utf8", "clutter-keysyms.h"); unless open(OUT_KEYSYMS, ">:utf8", "clutter-keysyms.h");
# Output: clutter/clutter/deprecated/clutter-keysyms.h
die "Could not open file clutter-keysyms-compat.h: $!\n"
unless open(OUT_KEYSYMS_COMPAT, ">:utf8", "deprecated/clutter-keysyms.h");
my $LICENSE_HEADER= <<EOF; my $LICENSE_HEADER= <<EOF;
/* Clutter /* Clutter
* *
@ -85,7 +81,6 @@ my $LICENSE_HEADER= <<EOF;
EOF EOF
print OUT_KEYSYMS $LICENSE_HEADER; print OUT_KEYSYMS $LICENSE_HEADER;
print OUT_KEYSYMS_COMPAT $LICENSE_HEADER;
print OUT_KEYSYMS<<EOF; print OUT_KEYSYMS<<EOF;
@ -104,23 +99,6 @@ print OUT_KEYSYMS<<EOF;
EOF EOF
print OUT_KEYSYMS_COMPAT<<EOF;
/*
* Compatibility version of clutter-keysyms.h.
*
* Since Clutter 1.4, the key symbol defines have been changed to have
* a KEY_ prefix. This is a compatibility header that is included when
* deprecated symbols are enabled. Consider porting to the new names
* instead.
*/
#ifndef __CLUTTER_KEYSYMS_DEPRECATED_H__
#define __CLUTTER_KEYSYMS_DEPRECATED_H__
#ifndef CLUTTER_DISABLE_DEPRECATED
EOF
while (<IN_KEYSYMDEF>) while (<IN_KEYSYMDEF>)
{ {
next if ( ! /^#define / ); next if ( ! /^#define / );
@ -137,13 +115,8 @@ while (<IN_KEYSYMDEF>)
my $element = $keysymelements[1]; my $element = $keysymelements[1];
my $binding = $element; my $binding = $element;
$binding =~ s/^XK_/CLUTTER_KEY_/g; $binding =~ s/^XK_/CLUTTER_KEY_/g;
my $compat_binding = $element;
$compat_binding =~ s/^XK_/CLUTTER_/g;
my $deprecation = "CLUTTER_DEPRECATED_MACRO_FOR(\"Deprecated key symbol. Use $binding instead.\")";
printf OUT_KEYSYMS "#define %s 0x%03x\n", $binding, hex($keysymelements[2]); printf OUT_KEYSYMS "#define %s 0x%03x\n", $binding, hex($keysymelements[2]);
printf OUT_KEYSYMS_COMPAT "#define %s 0x%03x %s\n", $compat_binding, hex($keysymelements[2]), $deprecation;
} }
close IN_KEYSYMDEF; close IN_KEYSYMDEF;
@ -187,11 +160,8 @@ while (<IN_XF86KEYSYM>)
my $element = $keysymelements[1]; my $element = $keysymelements[1];
my $binding = $element; my $binding = $element;
$binding =~ s/^XF86XK_/CLUTTER_KEY_/g; $binding =~ s/^XF86XK_/CLUTTER_KEY_/g;
my $compat_binding = $element;
$compat_binding =~ s/^XF86XK_/CLUTTER_/g;
printf OUT_KEYSYMS "#define %s 0x%03x\n", $binding, hex($keysymelements[2]); printf OUT_KEYSYMS "#define %s 0x%03x\n", $binding, hex($keysymelements[2]);
printf OUT_KEYSYMS_COMPAT "#define %s 0x%03x\n", $compat_binding, hex($keysymelements[2]);
} }
close IN_XF86KEYSYM; close IN_XF86KEYSYM;
@ -202,13 +172,6 @@ print OUT_KEYSYMS<<EOF;
#endif /* __CLUTTER_KEYSYMS_H__ */ #endif /* __CLUTTER_KEYSYMS_H__ */
EOF EOF
print OUT_KEYSYMS_COMPAT<<EOF;
#endif /* CLUTTER_DISABLE_DEPRECATED */
#endif /* __CLUTTER_KEYSYMS_DEPRECATED_H__ */
EOF
foreach my $f (qw/ keysymdef.h XF86keysym.h /) { foreach my $f (qw/ keysymdef.h XF86keysym.h /) {
unlink $f or die "Unable to delete $f: $!"; unlink $f or die "Unable to delete $f: $!";
} }

2311
clutter/clutter/deprecated/clutter-keysyms.h
View File

File diff suppressed because it is too large Load Diff

1
clutter/clutter/meson.build
View File

@ -225,7 +225,6 @@ clutter_deprecated_headers = [
'deprecated/clutter-box.h', 'deprecated/clutter-box.h',
'deprecated/clutter-container.h', 'deprecated/clutter-container.h',
'deprecated/clutter-group.h', 'deprecated/clutter-group.h',
'deprecated/clutter-keysyms.h',
'deprecated/clutter-rectangle.h', 'deprecated/clutter-rectangle.h',
'deprecated/clutter-stage-manager.h', 'deprecated/clutter-stage-manager.h',
'deprecated/clutter-stage.h', 'deprecated/clutter-stage.h',